3 files changed, 24 insertions, 18 deletions
diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java
index 3da6629..2e51a69 100644
--- a/src/main/java/pokemon/Server.java
+++ b/src/main/java/pokemon/Server.java
@@ -136,15 +136,23 @@ public class Server implements Runnable {
 				sc.write(buff);
 			}
 			else {
-				message="ACCEPTED"+":"+res.id;
-				players.put(sc,res.id);
-				ByteBuffer buff = ByteBuffer.wrap(message.getBytes());
-				sc.write(buff);
-				sendAvailablePlayers();
+				if(!res.admin) {
+					message="ACCEPTED"+":"+res.id;
+					players.put(sc,res.id);
+					ByteBuffer buff = ByteBuffer.wrap(message.getBytes());
+					sc.write(buff);
+					sendAvailablePlayers();
+				}
+				else {
+					message="BADLOGINADMIN";
+					ByteBuffer buff = ByteBuffer.wrap(message.getBytes());
+					sc.write(buff);
+					
+				}
 				
 			}
 			
-		}
+		}else
 		if(msg[0].equals("REQUESTUSERS")) {
 			System.out.println("In");
 			UserListWrapper wp=new UserListWrapper();
diff --git a/src/main/java/ui/ChooseOpponentPanel.java b/src/main/java/ui/ChooseOpponentPanel.java
index 4ecd823..196477f 100644
--- a/src/main/java/ui/ChooseOpponentPanel.java
+++ b/src/main/java/ui/ChooseOpponentPanel.java
@@ -43,16 +43,5 @@ public class ChooseOpponentPanel extends JPanel {
 		add(comboBox);
 
 	}
-	
-	public void getUsers() {
-		MainFrame topFrame=(MainFrame) SwingUtilities.getAncestorOfClass(MainFrame.class, ChooseOpponentPanel.this);
-		try {
-			SocketChannel client=topFrame.getClient();
-			ByteBuffer buff = ByteBuffer.wrap("REQUESTUSERS".getBytes());
-			client.write(buff);
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-	}
 
 }
diff --git a/src/main/java/ui/MainFrame.java b/src/main/java/ui/MainFrame.java
index 62fb754..2aac225 100644
--- a/src/main/java/ui/MainFrame.java
+++ b/src/main/java/ui/MainFrame.java
@@ -102,15 +102,19 @@ public class MainFrame extends JFrame implements Runnable {
 					this.getContentPane().removeAll();
 					this.getContentPane().add(chooseOpponentPanel,BorderLayout.CENTER);
 					SwingUtilities.updateComponentTreeUI(this);
-					chooseOpponentPanel.getUsers();
 					
 					
 				}else if(response[0].trim().equals("BADLOGIN")){
 					System.out.println("Bad Login");
 					this.loginPanel.warningTextArea.setText("Pogresan Login");
+				}else if(response[0].trim().equals("BADLOGINADMIN")){
+					System.out.println("Bad Login");
+					this.loginPanel.warningTextArea.setText("Admin nema pristup aplikaciji");
 				}else {
+					//XML OBJECTS
 					XMLDecoder decoder = null;
 					decoder = new XMLDecoder(new ByteArrayInputStream(sb.toString().getBytes()));
+					try {
 					UserListWrapper wp=(UserListWrapper) decoder.readObject();
 					decoder.close();
 					chooseOpponentPanel.comboBox.removeAllItems();
@@ -120,6 +124,11 @@ public class MainFrame extends JFrame implements Runnable {
 							chooseOpponentPanel.comboBox.addItem(new ComboBoxUser(user));
 						
 					}
+					
+				} catch (Exception e) {
+					System.out.println("Nije refresh");
+				}
+					
 				}