From 86049da0ea312385f824b401aa21c3e491a92736 Mon Sep 17 00:00:00 2001
From: Adrien BRAULT <monsti@gmail.com>
Date: Sat, 4 Jun 2011 21:41:57 +0200
Subject: [PATCH] ROLALLA

---
 .../jastermind/client/ui/GamePanel.java         |  7 +------
 .../jastermind/server/ServerLauncher.java       | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/com/adrienbrault/jastermind/client/ui/GamePanel.java b/src/com/adrienbrault/jastermind/client/ui/GamePanel.java
index 947c6e5..b039659 100644
--- a/src/com/adrienbrault/jastermind/client/ui/GamePanel.java
+++ b/src/com/adrienbrault/jastermind/client/ui/GamePanel.java
@@ -34,12 +34,7 @@ public void create() {
     }
 
     public void remove() {
-        if (this.boardPanel != null) {
-            this.remove(this.boardPanel);
-        }
-        if (this.codePegChoicePanel != null) {
-            this.remove(this.codePegChoicePanel);
-        }
+        this.removeAll();
 
         this.boardPanel = null;
         this.codePegChoicePanel = null;
diff --git a/src/com/adrienbrault/jastermind/server/ServerLauncher.java b/src/com/adrienbrault/jastermind/server/ServerLauncher.java
index f2d3e23..d6ae52f 100644
--- a/src/com/adrienbrault/jastermind/server/ServerLauncher.java
+++ b/src/com/adrienbrault/jastermind/server/ServerLauncher.java
@@ -1,5 +1,6 @@
 package com.adrienbrault.jastermind.server;
 
+import javax.swing.*;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -12,9 +13,23 @@
  */
 public class ServerLauncher {
 
-    final public static int SERVER_PORT = 2201;
+    final public static int SERVER_PORT = 2202;
 
     public static void main(String[] args) throws IOException {
+        JFrame window = new JFrame();
+        JPanel contentPanel = new JPanel();
+        window.setContentPane(contentPanel);
+
+        JLabel label = new JLabel("Server running.");
+        contentPanel.add(label);
+
+        window.setTitle("JasterMindServer.");
+        window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        window.pack();
+        window.setResizable(false);
+
+        window.setVisible(true);
+
         ServerSocket serverSocket = new ServerSocket(SERVER_PORT, 5);
 
         handleRequests(serverSocket);