3 files changed, 22 insertions, 18 deletions

diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java
index 12d3d15..1b958d1 100644
--- a/src/main/java/pokemon/Server.java
+++ b/src/main/java/pokemon/Server.java
@@ -146,24 +146,12 @@ public class Server implements Runnable {
 			}
 			
 		} catch (Exception e) {
-			Long closedId=players.get(sc);
-			leftGame(sc);
-			players.remove(sc);
-			System.out.println("Client dissconnected: "+closedId );
-			System.out.println("Remaining clients: "+players.size() );
-			sc.close();
-			sendAvailablePlayers();
+			closeConnection(sc);
 			return;
 		}
 		if(read==-1)
 		{
-			Long closedId=players.get(sc);
-			leftGame(sc);
-			players.remove(sc);
-			System.out.println("Client dissconnected: "+closedId );
-			System.out.println("Remaining clients: "+players.size() );
-			sc.close();
-			sendAvailablePlayers();
+			closeConnection(sc);
 			return;
 		}
 		System.out.println(sb.toString());
@@ -409,5 +397,20 @@ public class Server implements Runnable {
 		}
 		
 	}
+	public void closeConnection(SocketChannel sc) {
+		Long closedId=players.get(sc);
+		try {
+			leftGame(sc);
+			players.remove(sc);
+			System.out.println("Client dissconnected: "+closedId );
+			System.out.println("Remaining clients: "+players.size() );
+			sc.close();
+			sendAvailablePlayers();
+		} catch (Exception e) {
+		}
+		
+		return;
+		
+	}
 
 }
diff --git a/src/main/java/ui/LoginPanel.java b/src/main/java/ui/LoginPanel.java
index adc6f78..d579f5a 100644
--- a/src/main/java/ui/LoginPanel.java
+++ b/src/main/java/ui/LoginPanel.java
@@ -1,6 +1,7 @@
 package ui;
 
 import javax.swing.JPanel;
+import javax.swing.JPasswordField;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
@@ -22,7 +23,7 @@ import java.awt.event.ActionEvent;
 
 public class LoginPanel extends JPanel {
 	public JTextField textFieldUsername;
-	public JTextField textFieldPassword;
+	public JPasswordField textFieldPassword;
 	public JButton btnLogIn;
 	JTextArea warningTextArea;
 
@@ -45,7 +46,7 @@ public class LoginPanel extends JPanel {
 		lblPassword.setBounds(132, 109, 59, 14);
 		add(lblPassword);
 		
-		textFieldPassword = new JTextField();
+		textFieldPassword = new JPasswordField();
 		textFieldPassword.setColumns(10);
 		textFieldPassword.setBounds(205, 106, 100, 20);
 		add(textFieldPassword);
@@ -83,7 +84,7 @@ public class LoginPanel extends JPanel {
 	public void Login() {
 		System.out.println("SEND LOGIN");
 		String username=textFieldUsername.getText();
-		String password=textFieldPassword.getText();
+		String password=new String(textFieldPassword.getPassword());
 		if(!(username.trim().length()>0 && password.trim().length()>0))
 		{
 			warningTextArea.setText("Morate uneti login informacije");
diff --git a/src/main/java/ui/MainFrame.java b/src/main/java/ui/MainFrame.java
index 282ddde..073f66b 100644
--- a/src/main/java/ui/MainFrame.java
+++ b/src/main/java/ui/MainFrame.java
@@ -115,7 +115,7 @@ public class MainFrame extends JFrame implements Runnable {
 					System.out.println("Bad Login");
 					this.loginPanel.warningTextArea.setText("Pogresan Login");
 				}else if(response[0].trim().equals("BADLOGINADMIN")){
-					System.out.println("Bad Login");
+					System.out.println("Bad Login Admin");
 					this.loginPanel.warningTextArea.setText("Admin nema pristup aplikaciji");
 				}else if(response[0].trim().equals("GAMEREQUEST")){
 					System.out.println("Game Request");