[Cruce-commit] SF.net SVN: cruce:[109] Java/trunk/src/prc/bubulina/cruce

[<ali...@us...>]

Revision: 109
          http://cruce.svn.sourceforge.net/cruce/?rev=109&view=rev
Author:   alinposho
Date:     2010-04-09 09:33:41 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
Am suprascris metoda equals() in clasa Card.

Modified Paths:
--------------
    Java/trunk/src/prc/bubulina/cruce/remote/Card.java
    Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java

Modified: Java/trunk/src/prc/bubulina/cruce/remote/Card.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/remote/Card.java	2010-04-09 09:18:48 UTC (rev 108)
+++ Java/trunk/src/prc/bubulina/cruce/remote/Card.java	2010-04-09 09:33:41 UTC (rev 109)
@@ -50,4 +50,18 @@
 		Color c = Color.values()[new Random().nextInt(4)];
 		return new Card(i, c);
 	}
+	
+	@Override
+	public boolean equals(Object object)
+	{
+		if(!(object instanceof Card))
+		{
+			return false;
+		}
+		
+		Card card = (Card)object;
+		
+		return color.equals(card.getColor()) && value == card.getValue();		
+	}
+	
 }

Modified: Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java
===================================================================
--- Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java	2010-04-09 09:18:48 UTC (rev 108)
+++ Java/trunk/src/prc/bubulina/cruce/server/ServerImplementation.java	2010-04-09 09:33:41 UTC (rev 109)
@@ -18,25 +18,18 @@
 	 */
 	private static final long serialVersionUID = 6398777327639353025L;
 	
-	private static ServerImplementation instance;
-
-	private ServerImplementation() throws RemoteException {
-		super();
-	}
-
-	public synchronized static ServerImplementation getInstance() throws RemoteException {
-		if (instance == null)
-			instance = new ServerImplementation();
-		return instance;
-	}
-
 	private List<Team> teams = new LinkedList<Team>();
 	private List<ClientInterface> clients = new LinkedList<ClientInterface>();
 	private StartGameLogic startGameLogic;
 	private GameLogic gameLogic;
 	private RoundLogic roundLogic;
 	private PlayerMap playerMap = new PlayerMap();
+	
 
+	public ServerImplementation() throws RemoteException {
+		super();
+	}
+
 	public synchronized boolean sendCards(List<Card> cards, ServerSidePlayer player) {
 		ClientInterface client = playerMap.getClient(player.getInfo());
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.