Removed old code

src/client/view/ChatPanel.java

@@ -1,87 +0,0 @@
-package client.view;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridLayout;
-import java.util.ArrayList;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import server.network.NetworkMessage;
-public class ChatPanel extends JPanel{
-	//Only for gui testing:
-	Color color = Color.red;
-	String name = "Janco";
-	
-	private ChatPanelMessage messagepanel;
-	private ChatPanelInput inputpanel;
-	
-	public ChatPanel(){
-		setBackground(Color.WHITE);
-		JLabel label = new JLabel(name);
-		label.setForeground(color);
-		setLayout(new BorderLayout());
-		add(label, BorderLayout.NORTH);
-		add(messagepanel = new ChatPanelMessage(), BorderLayout.CENTER);
-		add(inputpanel = new ChatPanelInput(), BorderLayout.SOUTH);		
-	}
-	
-	public class ChatPanelInput extends JPanel{
-		JTextField input;
-		JButton send;
-		
-		public ChatPanelInput(){
-			input = new JTextField();
-			send = new JButton("Verzenden");
-			setLayout(new GridLayout(1, 2));
-			add(input);
-			add(send);
-			setOpaque(false);
-		}
-	}
-	
-	public class ChatPanelMessage extends JPanel{
-		private ArrayList<NetworkMessage> messages;
-		public ChatPanelMessage(){
-			setPreferredSize(new Dimension(1000, 1000));
-			this.add(new JLabel("Berichten:"));
-			messages = new ArrayList<NetworkMessage>();
-		}
-		
-		@Override
-		public void paintComponent(Graphics g)
-		{
-			super.paintComponent(g);
-			Graphics2D g2d = (Graphics2D) g;
-			int y = 20;
-			for(NetworkMessage m:messages){
-				g2d.setColor(m.getC());
-				if(m.getUsername().equals(getName())){
-					g2d.drawString(m.getUsername() + ": " + m.getMessage(), 10, y +=18);
-				}else{
-					g2d.drawString(m.getUsername() + ": " + m.getMessage(), getWidth()-100, y +=18);
-				}
-			}
-		}
-	}
-	
-	public void addMessage(NetworkMessage m){
-		messagepanel.messages.add(m);
-		repaint();
-	}
-	
-	public JButton getSendButton(){
-		return inputpanel.send;
-	}
-	
-	public JTextField getInputField(){
-		return inputpanel.input;
-	}
-}
-

src/client/view/Main.java

@@ -1,9 +0,0 @@
-package client.view;
-
-public class Main {
-
-	public static void main(String[] args) {
-		new Window();
-	}
-
-}

src/client/view/MainPanel.java

@@ -1,26 +0,0 @@
-package client.view;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-
-import javax.swing.JPanel;
-
-public class MainPanel extends JPanel {
-
-	public MainPanel()
-	{
-		setLayout(new BorderLayout());
-		ChatPanel chat = new ChatPanel();
-		this.add(chat);
-		new NetworkConnection(chat);
-	}
-	
-	@Override
-	public void paintComponent(Graphics g)
-	{
-		super.paintComponent(g);
-		Graphics2D g2d = (Graphics2D) g;
-	}
-}

src/client/view/NetworkConnection.java

@@ -1,81 +0,0 @@
-package client.view;
-
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.Socket;
-
-import server.network.NetworkMessage;
-
-public class NetworkConnection {
-	private ChatPanel chatpanel;
-	private Socket serversocket;
-	private Thread runningthread;
-	ObjectOutputStream output;
-	
-	public NetworkConnection(ChatPanel chatpanel){
-		this.chatpanel = chatpanel;
-		connect();
-	}
-	
-	public void connect(){
-		try {
-			serversocket = new Socket("jancokock.me", 5499);
-			output = new ObjectOutputStream(serversocket.getOutputStream());
-			runningthread = new Thread(new Runnable() {
-				@Override
-				public void run() {
-					ObjectInputStream input;
-					try {
-						input = new ObjectInputStream(serversocket.getInputStream());
-						while(true){
-							try {
-								NetworkMessage m = (NetworkMessage)input.readObject();
-								chatpanel.addMessage(m);
-							} catch (ClassNotFoundException e) {
-								e.printStackTrace();
-							}
-						}
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-			});
-			chatpanel.getSendButton().addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					sendMessage(chatpanel.getInputField().getText());
-					chatpanel.getInputField().setText("");
-				}
-			});
-			runningthread.start();
-		} catch (IOException e1) {
-			System.out.println("Er kon geen connectie naar de server gemaakt worden.");
-			e1.printStackTrace();
-		}
-	}
-	public void disconnect(){
-		if(serversocket.isConnected()){
-			try {
-				serversocket.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		runningthread.stop();
-	}
-	
-	public void sendMessage(String message){
-		try {
-			NetworkMessage nwmessage = new NetworkMessage(message,  Color.red, "Janco" );
-			chatpanel.addMessage(nwmessage);
-			output.writeObject(nwmessage);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		
-	}
-}

src/client/view/Window.java

@@ -1,23 +0,0 @@
-package client.view;
-
-import java.awt.Panel;
-
-import javax.swing.JFrame;
-
-public class Window extends JFrame {
-	
-	public Window()
-	{
-		super("JK Chat");
-		setDefaultCloseOperation(3);
-		setSize(400, 600);
-		setVisible(true);
-		
-		MainPanel p = new MainPanel();
-		
-		setContentPane(p);
-		revalidate();
-		
-
-	}
-}

src/clientest/Client.java

@@ -1,53 +0,0 @@
-package clientest;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.Socket;
-import java.util.Scanner;
-
-import server.network.NetworkMessage;
-
-public class Client {
-	public Client(){
-		try {
-			Socket client = new Socket("jancokock.me", 5499);
-			Thread test = new Thread(new Runnable() {
-				@Override
-				public void run() {
-					ObjectInputStream input;
-					try {
-						input = new ObjectInputStream(client.getInputStream());
-						while(true){
-							try {
-								NetworkMessage m = (NetworkMessage)input.readObject();
-								System.out.println(m.getUsername() + ":  " +m.getMessage());
-							} catch (ClassNotFoundException e) {
-								e.printStackTrace();
-							}
-						}
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-			});
-			test.start();
-			ObjectOutputStream out = new ObjectOutputStream(client.getOutputStream());
-			while(true){
-				Scanner input = new Scanner(System.in);
-				System.out.println("typ je bericht:");
-				String s = input.nextLine();
-				NetworkMessage nwmessage = new NetworkMessage(s, Color.red, "poepchinees");
-				try {
-					out.writeObject(nwmessage);
-					out.flush();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-}

src/clientest/Main.java

@@ -1,9 +0,0 @@
-package clientest;
-
-public class Main {
-
-	public static void main(String[] args) {
-		new Client();
-	}
-
-}

src/server/Log.java

@@ -1,7 +0,0 @@
-package server;
-
-public class Log {
-	public static void writeLog(String logmessage){
-		
-	}
-}

src/server/Main.java

@@ -1,7 +0,0 @@
-package server;
-
-public class Main {
-	public static void main(String[] args){
-		new Server(5499);
-	}
-}

src/server/Message.java

@@ -1,30 +0,0 @@
-package server;
-
-public class Message {
-	private String message;
-	private User user;
-	@SuppressWarnings("unused")
-	private long time;
-	
-	public Message(String message, User user){
-		this.message = filterMessage(message);
-		this.user = user;
-		//TODO No time-zone conversation yet
-		time = System.currentTimeMillis();
-	}
-	
-	private String filterMessage(String message){
-		//TODO Filter om scheldworden etc. eruit te halen
-		return message;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-	
-	
-}

src/server/Server.java

@@ -1,55 +0,0 @@
-package server;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.ArrayList;
-
-public class Server {
-	private ArrayList<User> users;
-	private ArrayList<Message> messages;
-	
-	public Server(int port)
-	{
-		users = new ArrayList<User>();
-		messages = new ArrayList<Message>();
-		
-		Thread clientconnect = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					ServerSocket server = new ServerSocket(port);
-					while(true){
-						System.out.println("Waiting for clients...");
-						try {
-							Socket client = server.accept();
-							//TODO: Check in banned list and read username and color from reply message
-							users.add(new User("test", Color.red, client, Server.this));
-							System.out.println("New client connected: " + client.getRemoteSocketAddress());
-							System.out.println("Total users connected: " + users.size());
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-				} catch (IOException e) {
-					System.out.println("Something went wrong, abort.");
-					e.printStackTrace();
-				}
-			}
-		});	
-		clientconnect.start();
-	}
-	
-	public synchronized void addMessage(Message message){
-		messages.add(message);
-		for(User u:users){
-			if(message.getUser() != u)
-				u.sendMessage(message);
-		}
-	}
-	
-	public void deleteUser(User user){
-		users.remove(user);
-	}
-}

src/server/User.java

@@ -1,88 +0,0 @@
-package server;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.Socket;
-
-import server.network.NetworkMessage;
-
-public class User {
-	String username;
-	Color color;
-	private Socket client;
-
-	private ObjectInputStream in;
-	private ObjectOutputStream out;
-	
-	public User(String username, Color color, Socket client, Server server){
-		this.username = username;
-		this.color = color;
-		this.client = client;
-		
-		try {
-			out = new ObjectOutputStream(client.getOutputStream());
-			in = new ObjectInputStream(client.getInputStream());
-		} catch (IOException e1) {
-			e1.printStackTrace();
-		}
-		
-		Thread receivethread = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				while(true){
-					try {
-						try {
-							Object objectinput = in.readObject();
-							if(objectinput instanceof NetworkMessage){
-								NetworkMessage input = (NetworkMessage)objectinput;
-								setUsername(input.getUsername());
-								setColor(input.getC());
-								server.addMessage(new Message(input.getMessage(), User.this));
-							}
-						} catch (ClassNotFoundException e) {
-							e.printStackTrace();
-						}
-					} catch (IOException e) {
-						System.out.println("User disconnected: " + username + "from: " + client.getLocalSocketAddress());
-						server.deleteUser(User.this);
-						try {
-							client.close();
-						} catch (IOException e1) {
-							e1.printStackTrace();
-						}
-						return;						
-					}
-				}					
-			}
-		});
-		receivethread.start();
-	}
-	
-	public void sendMessage(Message message){
-		NetworkMessage nwmessage = new NetworkMessage(message.getMessage(), message.getUser().getColor(), message.getUser().getUsername());
-		try {
-			out.writeObject(nwmessage);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public Color getColor() {
-		return color;
-	}
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-	
-	
-}

src/server/network/NetworkMessage.java

@@ -1,47 +0,0 @@
-package server.network;
-
-import java.awt.Color;
-import java.io.Serializable;
-
-public class NetworkMessage implements Serializable{
-	
-	private static final long serialVersionUID = 1792127171435352901L;
-	
-	private String message;
-	private Color c;
-	private String username;
-	private long timestamp;
-	
-	public NetworkMessage(String message, Color c, String username) {
-		this.message = message;
-		this.c = c;
-		this.username = username;
-		
-		timestamp = System.currentTimeMillis() / 1000L;
-	}
-	
-	public String getMessage() {
-		return message;
-	}
-	public void setMessage(String message) {
-		this.message = message;
-	}
-	public Color getC() {
-		return c;
-	}
-	public void setC(Color c) {
-		this.c = c;
-	}
-	public String getUsername() {
-		return username;
-	}
-	public void setUsername(String username) {
-		this.username = username;
-	}
-	public long getTimestamp() {
-		return timestamp;
-	}
-	public void setTimestamp(long timestamp) {
-		this.timestamp = timestamp;
-	}
-}

src/server/network/NetworkNotification.java

@@ -1,29 +0,0 @@
-package server.network;
-
-import java.io.Serializable;
-
-public class NetworkNotification implements Serializable{
-	
-	private static final long serialVersionUID = 5150538747015164192L;
-	
-	private String message;
-	private long timestamp;
-	
-	public NetworkNotification(String message) {
-		this.message = message;
-		timestamp = System.currentTimeMillis() / 1000L;
-	}
-	
-	public String getMessage() {
-		return message;
-	}
-	public void setMessage(String message) {
-		this.message = message;
-	}
-	public long getTimestamp() {
-		return timestamp;
-	}
-	public void setTimestamp(long timestamp) {
-		this.timestamp = timestamp;
-	}
-}