[Cruce-commit] SF.net SVN: cruce:[126] Java/trunk/src/prc/bubulina/cruce
Status: Beta
Brought to you by:
caiusb
Menu
▾
▴
[Cruce-commit] SF.net SVN: cruce:[126] Java/trunk/src/prc/bubulina/cruce
|
From: <hor...@us...> - 2010-04-23 17:27:13
|
Revision: 126
http://cruce.svn.sourceforge.net/cruce/?rev=126&view=rev
Author: horiaradu
Date: 2010-04-23 17:27:07 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Modified Paths:
--------------
Java/trunk/src/prc/bubulina/cruce/client/Client.java
Java/trunk/src/prc/bubulina/cruce/client/Game.java
Java/trunk/src/prc/bubulina/cruce/client/TextUI.java
Java/trunk/src/prc/bubulina/cruce/remote/Card.java
Java/trunk/src/prc/bubulina/cruce/remote/Player.java
Java/trunk/src/prc/bubulina/cruce/remote/Score.java
Java/trunk/src/prc/bubulina/cruce/remote/ServerInterface.java
Java/trunk/src/prc/bubulina/cruce/server/RoundLogic.java
Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java
Java/trunk/src/prc/bubulina/cruce/server/ServerSidePlayer.java
Java/trunk/src/prc/bubulina/cruce/server/Team.java
Modified: Java/trunk/src/prc/bubulina/cruce/client/Client.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/client/Client.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/client/Client.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -15,8 +15,7 @@
import prc.bubulina.cruce.remote.Score;
import prc.bubulina.cruce.remote.ServerInterface;
-public class Client extends UnicastRemoteObject implements ClientInterface,
- Serializable {
+public class Client extends UnicastRemoteObject implements ClientInterface, Serializable {
/**
*
@@ -37,8 +36,7 @@
* the name of the used game server
* @throws RemoteException
*/
- public Client(Game game, String gameServerAddress, String gameServerName)
- throws RemoteException {
+ public Client(Game game, String gameServerAddress, String gameServerName) throws RemoteException {
super();
String url = "rmi://" + gameServerAddress + "/" + gameServerName;
@@ -82,8 +80,11 @@
boolean accepted = false;
while (!accepted) {
Card card = game.hit();
+ System.out.println(card);
try {
+ System.out.println("AAA");
accepted = server.acceptCard(player, card);
+ System.out.println("BBB");
} catch (RemoteException e) {
e.printStackTrace();
}
Modified: Java/trunk/src/prc/bubulina/cruce/client/Game.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/client/Game.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/client/Game.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -56,7 +56,7 @@
*/
public Card hit() {
Card card = ui.playCard();
- return null;
+ return card;
}
/**
@@ -99,7 +99,7 @@
}
public void inform(String information) {
- ui.sendMessage(information);
+ ui.sendMessage(information);
}
public void setRoundScore(int score) {
@@ -107,6 +107,6 @@
}
public void setGameScore(int score) {
- ui.sendMessage("Scorul jocului este" + score);
+ ui.sendMessage("Scorul jocului este" + score);
}
}
Modified: Java/trunk/src/prc/bubulina/cruce/client/TextUI.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/client/TextUI.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/client/TextUI.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -62,14 +62,13 @@
showAvailableCards();
try {
System.in.skip(System.in.available());
- System.out
- .println("Da-ti cartea jucata (1-" + cards.size() + "): ");
- cardNo = System.in.read();
+ System.out.println("Da-ti cartea jucata (1-" + cards.size() + "): ");
+ cardNo = System.in.read() - '0';
System.in.skip(System.in.available());
} catch (IOException e) {
e.printStackTrace();
}
- return cards.get(cardNo-1);
+ return cards.get(cardNo - 1);
}
@Override
Modified: Java/trunk/src/prc/bubulina/cruce/remote/Card.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/remote/Card.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/remote/Card.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -3,24 +3,21 @@
import java.io.Serializable;
import java.util.Random;
-public class Card implements Serializable{
-
+public class Card implements Serializable {
+
/**
- * Needed serialization for RMI parameter
+ * Needed serialization for RMI parameter
*/
private static final long serialVersionUID = 243254958971908105L;
-
+
private int value;
private Color color;
private static Color tromf;
public Card(int value, Color color) {
this.color = color;
- if (value != 0 && value != 2 && value != 3 && value != 4 && value != 10
- && value != 11) {
- throw new IllegalArgumentException(
- "Card value is not within the set: "
- + "{0 , 2, 3, 4, 10, 11}!\n");
+ if (value != 0 && value != 2 && value != 3 && value != 4 && value != 10 && value != 11) {
+ throw new IllegalArgumentException("Card value is not within the set: " + "{0 , 2, 3, 4, 10, 11}!\n");
}
this.value = value;
}
@@ -50,18 +47,20 @@
Color c = Color.values()[new Random().nextInt(4)];
return new Card(i, c);
}
-
+
@Override
- public boolean equals(Object object)
- {
- if(!(object instanceof Card))
- {
+ public boolean equals(Object object) {
+ if (!(object instanceof Card)) {
return false;
}
-
- Card card = (Card)object;
-
- return color.equals(card.getColor()) && value == card.getValue();
+
+ Card card = (Card) object;
+
+ return color.equals(card.getColor()) && value == card.getValue();
}
+ public String toString() {
+ return color + " " + value;
+ }
+
}
Modified: Java/trunk/src/prc/bubulina/cruce/remote/Player.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/remote/Player.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/remote/Player.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -3,12 +3,12 @@
import java.io.Serializable;
public class Player implements Serializable {
-
+
/**
* Needed for serialization serialization
*/
private static final long serialVersionUID = -2446467001127293964L;
-
+
private String name;
private int id;
private String teamName;
@@ -25,22 +25,22 @@
public int getID() {
return id;
}
-
+
public void setTeamName(String teamName) {
this.teamName = teamName;
}
-
+
public String getTeamName() {
return teamName;
}
-
+
public boolean equals(Object o) {
if (o instanceof Player)
- if (((Player)o).name.equals(name) && ((Player)o).id == id)
+ if (((Player) o).name.equals(name) && ((Player) o).id == id)
return true;
return false;
}
-
+
public int hashCode() {
return id;
}
Modified: Java/trunk/src/prc/bubulina/cruce/remote/Score.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/remote/Score.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/remote/Score.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -7,10 +7,10 @@
* This class will be a container for a name value pair "player-score"
*
*/
-public class Score implements Serializable{
-
+public class Score implements Serializable {
+
/**
- * Needed for serialization(auto generated)
+ * Needed for serialization(auto generated)
*/
private static final long serialVersionUID = 1214550626496444804L;
private Map<Player, Integer> score;
Modified: Java/trunk/src/prc/bubulina/cruce/remote/ServerInterface.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/remote/ServerInterface.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/remote/ServerInterface.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -14,8 +14,7 @@
*@param client
* @throws RemoteException
*/
- public Player joinGame(String name, ClientInterface client)
- throws RemoteException;
+ public Player joinGame(String name, ClientInterface client) throws RemoteException;
/**
* This will inform the server that a player is willing to start the game
@@ -41,8 +40,7 @@
/**
* This method is used to sent a card and an anunt to the server for
- * validation and storage
- * Clintul tre sa apeleze asta pana ii da true!
+ * validation and storage Clintul tre sa apeleze asta pana ii da true!
*
* @param sender
* The client who sent the card
@@ -53,8 +51,7 @@
* rules of the game
* @throws RemoteException
*/
- public boolean acceptCard(Player sender, Card card, int anunt)
- throws RemoteException;
+ public boolean acceptCard(Player sender, Card card, int anunt) throws RemoteException;
/**
*
Modified: Java/trunk/src/prc/bubulina/cruce/server/RoundLogic.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/server/RoundLogic.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/server/RoundLogic.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -146,6 +146,7 @@
}
public boolean acceptCard(ServerSidePlayer player, Card card) {
+ System.out.println(player.getInfo().getName() + ": " + card);
Card[] c = (Card[]) cardsDown.values().toArray();
if (player.checkHit(card, c) == true) {
cardsDown.put(playerOrder.getOrder(player), card);
@@ -166,8 +167,7 @@
Card[] c = (Card[]) cardsDown.values().toArray();
if (player.checkHit(card, c) == true) {
cardsDown.put(playerOrder.getOrder(player), card);
- hitInfoMessage = player.getInfo().getName() + " a dat " + c
- + " anuntand " + anunt;
+ hitInfoMessage = player.getInfo().getName() + " a dat " + c + " anuntand " + anunt;
this.getTeam(player).addAnunt(anunt);
if (handNr == 0)
Card.setTromf(card.getColor());
Modified: Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -11,8 +11,7 @@
import prc.bubulina.cruce.remote.Score;
import prc.bubulina.cruce.remote.ServerInterface;
-public class ServerImplementation extends UnicastRemoteObject implements
- ServerInterface {
+public class ServerImplementation extends UnicastRemoteObject implements ServerInterface {
/**
* Needed for serialization
@@ -35,14 +34,12 @@
gameLogic = new GameLogic();
}
- public synchronized Player joinGame(String name, ClientInterface client)
- throws RemoteException {
+ public synchronized Player joinGame(String name, ClientInterface client) throws RemoteException {
System.out.println(name + " joined the game");
client.inform("welcome to the game");
ServerSidePlayer ssplayer = startGameLogic.setupPlayer(name);
client.inform("you are in team " + ssplayer.getInfo().getTeamName());
- this.informAll(ssplayer.getInfo().getName() + " from "
- + ssplayer.getInfo().getTeamName() + " joined the game");
+ this.informAll(ssplayer.getInfo().getName() + " from " + ssplayer.getInfo().getTeamName() + " joined the game");
clients.add(client);
playerMap.put(ssplayer, client);
if (ssplayer != null)
@@ -63,8 +60,7 @@
}
}
- public synchronized boolean sendCards(List<Card> cards,
- ServerSidePlayer player) {
+ public synchronized boolean sendCards(List<Card> cards, ServerSidePlayer player) {
ClientInterface client = playerMap.getClient(player.getInfo());
try {
@@ -114,16 +110,14 @@
}
}
- public synchronized boolean acceptCard(Player sender, Card card)
- throws RemoteException {
- return roundLogic.acceptCard(playerMap.getServerSidePlayer(sender),
- card);
+ public synchronized boolean acceptCard(Player sender, Card card) throws RemoteException {
+ System.out.println("X");
+ return roundLogic.acceptCard(playerMap.getServerSidePlayer(sender), card);
}
- public synchronized boolean acceptCard(Player sender, Card card, int anunt)
- throws RemoteException {
- return roundLogic.acceptCard(playerMap.getServerSidePlayer(sender),
- card, anunt);
+ public synchronized boolean acceptCard(Player sender, Card card, int anunt) throws RemoteException {
+ System.out.println("Y");
+ return roundLogic.acceptCard(playerMap.getServerSidePlayer(sender), card, anunt);
}
public synchronized Score getOverallScore() throws RemoteException {
Modified: Java/trunk/src/prc/bubulina/cruce/server/ServerSidePlayer.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/server/ServerSidePlayer.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/server/ServerSidePlayer.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -31,8 +31,7 @@
else {
int searchValue = 7 - card.getValue();
for (Card c : cards)
- if (c.getValue() == searchValue
- && c.getColor().equals(card.getColor()))
+ if (c.getValue() == searchValue && c.getColor().equals(card.getColor()))
return true;
return false;
}
Modified: Java/trunk/src/prc/bubulina/cruce/server/Team.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/server/Team.java 2010-04-23 09:51:21 UTC (rev 125)
+++ Java/trunk/src/prc/bubulina/cruce/server/Team.java 2010-04-23 17:27:07 UTC (rev 126)
@@ -40,8 +40,7 @@
public void addAnunt(int value) {
if (value != 40 && value != 20) {
- throw new IllegalArgumentException(
- "The value filed is not one of 20 or 40!\n");
+ throw new IllegalArgumentException("The value filed is not one of 20 or 40!\n");
}
anunturi += value;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
