5 files changed, 50 insertions, 22 deletions
diff --git a/src/main/java/models/CONSTS.java b/src/main/java/models/CONSTS.java
index 3e66a69..62fcfbd 100644
--- a/src/main/java/models/CONSTS.java
+++ b/src/main/java/models/CONSTS.java
@@ -1,6 +1,7 @@
 package models;
 
 public class CONSTS {
-	public static final String rmiUrl="rmi://localhost:5555/rmi";
+	public static final int port=5555;
+	public static final String rmiUrl="rmi://localhost:"+port+"/rmi";
 
 }
diff --git a/src/main/java/pokemon/Client.java b/src/main/java/pokemon/Client.java
index b141530..a90f108 100644
--- a/src/main/java/pokemon/Client.java
+++ b/src/main/java/pokemon/Client.java
@@ -14,10 +14,6 @@ public class Client {
 	public static void main(String[] args) {
 		
 		MainFrame frame=new MainFrame();
-		LoginPanel p=new LoginPanel();
-		frame.add(p,BorderLayout.CENTER);
-		frame.setVisible(true);
-		//SwingUtilities.updateComponentTreeUI(frame);
 		
 	}
 
diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java
index ea47998..52e9e77 100644
--- a/src/main/java/pokemon/Server.java
+++ b/src/main/java/pokemon/Server.java
@@ -1,24 +1,43 @@
 package pokemon;
 
 import java.rmi.Naming;
+import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import models.CONSTS;
 
-public class Server {
+public class Server implements Runnable {
 
 	public static void main(String[] args) {
+		Server server=new Server();
+		new Thread(server).start();
+	}
+	public Server() {
+		IService s;
 		try {
-			IService s=new Service();
-			System.out.println("created registry at 5555");
-			LocateRegistry.createRegistry(5555);
+			s = new Service();
+			System.out.println("created registry at "+CONSTS.port);
+			LocateRegistry.createRegistry(CONSTS.port);
 			Naming.rebind(CONSTS.rmiUrl, s);
-			
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		
+	}
 
+	@Override
+	public void run() {
+		
+		try {
+			while(true) {
+			Thread.sleep(500);
+			System.out.println("serverTest");
+			}
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
 	}
 
 }
diff --git a/src/main/java/ui/LoginPanel.java b/src/main/java/ui/LoginPanel.java
index b190cc5..336d538 100644
--- a/src/main/java/ui/LoginPanel.java
+++ b/src/main/java/ui/LoginPanel.java
@@ -59,7 +59,6 @@ public class LoginPanel extends JPanel {
 				topFrame.getContentPane().removeAll();
 				topFrame.add(new GamePanel(),BorderLayout.CENTER);
 				SwingUtilities.updateComponentTreeUI(topFrame);
-				topFrame.testOut();
 			}
 		});
 		btnLogIn.setBounds(174, 181, 81, 23);
diff --git a/src/main/java/ui/MainFrame.java b/src/main/java/ui/MainFrame.java
index 53e0a3f..0eac906 100644
--- a/src/main/java/ui/MainFrame.java
+++ b/src/main/java/ui/MainFrame.java
@@ -13,33 +13,46 @@ import javax.swing.JTextArea;
 import java.awt.Font;
 import java.awt.BorderLayout;
 
-public class MainFrame extends JFrame {
+public class MainFrame extends JFrame implements Runnable {
 
 	/**
 	 * Launch the application.
 	 */
 	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
+
 					MainFrame frame = new MainFrame();
 					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
 	}
 
 	/**
 	 * Create the frame.
 	 */
+	public LoginPanel loginPanel=null;
+	public ChooseOpponentPanel chooseOpponentPanel=null;
+	GamePanel gamePanel=null;
 	public MainFrame() {
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		setBounds(100, 100, 727, 429);
+		loginPanel=new LoginPanel();
+		chooseOpponentPanel=new ChooseOpponentPanel();
+		gamePanel=new GamePanel();
 		getContentPane().setLayout(new BorderLayout(0, 0));
+		add(loginPanel,BorderLayout.CENTER);
+		setVisible(true);
+		new Thread(this).start();
 	}
-	public void testOut() {
-		System.out.println("RADI");
+	@Override
+	public void run() {
+		while(true) {
+			try {
+				Thread.sleep(500);
+				System.out.println("testClient");
+			} catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
 	}
+
 }