Dodat dependency za jstl. Omogucen logout. Prikaz liste pokemona korisnika. Omoguceno da korisnim moze da izabere pokemona.

2 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/pokemon/IService.java b/src/main/java/pokemon/IService.java
index c99271c..172c392 100644
--- a/src/main/java/pokemon/IService.java
+++ b/src/main/java/pokemon/IService.java
@@ -14,5 +14,7 @@ public interface IService extends Remote {
 	public long addMonster(Monster monster)throws RemoteException;
 	public boolean addAbility(Ability ability)throws RemoteException;
 	public ArrayList<Monster> getMonsters()throws RemoteException;
+	public Monster getUserMonster(String username) throws RemoteException;
+	public void addMonsterToUser(long id,long monsterId)throws RemoteException;
 
 }
diff --git a/src/main/java/pokemon/Service.java b/src/main/java/pokemon/Service.java
index 0931a0f..579a0c4 100644
--- a/src/main/java/pokemon/Service.java
+++ b/src/main/java/pokemon/Service.java
@@ -44,6 +44,19 @@ public class Service extends UnicastRemoteObject implements IService  {
 		Database db=Database.getInstance();
 		return db.getMonsters();
 	}
+
+	@Override
+	public Monster getUserMonster(String username) throws RemoteException {
+		Database db=Database.getInstance();
+		return db.getUserMonster(username);
+	}
+
+	@Override
+	public void addMonsterToUser(long id, long monsterId) throws RemoteException {
+		Database db=Database.getInstance();
+		db.addMonsterToUser(id, monsterId);
+		
+	}
 	
 
 }