Renamed Packages and Classes

src/Client/smalltalkClient.java

@@ -1,14 +1,12 @@
-package client;
+package Client;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.Socket;
 
-import server.ClientThread;
 
-
- public class SmalltalkClient implements Runnable{
+ public class SmallTalkClient implements Runnable{
 
 	static int clientPort;
 	static int serverPort = 4242; //Random port number
@@ -17,7 +15,7 @@ public class SmalltalkClient implements Runnable{
 	private Thread thread = null;
 	private DataInputStream  console = null;
 	private DataOutputStream streamOut = null;
-	private ClientThread client = null;
+	private Server.ClientThread client = null;
 
 
 	public static void main(String[] args) {
@@ -29,7 +27,7 @@ public static void main(String[] args) {
 		 * 	- Logging in
 		 * 	- Creating new account
 		 */
-		SmalltalkClient client = new SmalltalkClient();
+		SmallTalkClient client = new SmallTalkClient();
 
 	}
 
@@ -41,7 +39,7 @@ public static void openLoginWindow() {
 	 * Constructor for starting server
 	 * Opens the socket at hostName and starts the server
 	 */
-	public SmalltalkClient(){
+	public SmallTalkClient(){
 		System.out.println("Establishing connection...");
 		try{
 			socket = new Socket(hostName, serverPort);
@@ -60,7 +58,7 @@ public void start() throws IOException{
 		console = new DataInputStream(System.in);
 		streamOut = new DataOutputStream(socket.getOutputStream());
 		if (thread == null){
-			client = new ClientThread(this, socket);
+			client = new Server.ClientThread(this, socket);
 			thread = new Thread(this);                   
 			thread.start();
 		}
@@ -69,6 +67,7 @@ public void start() throws IOException{
 	/*
 	 * Method that stops the thread and server 
 	 */
+	@SuppressWarnings("deprecation")
 	public void stop() throws IOException{  
 		if(thread != null){
 			thread.stop();  
@@ -91,6 +90,7 @@ public void stop() throws IOException{
 	 * (non-Javadoc)
 	 * @see java.lang.Runnable#run()
 	 */
+	@SuppressWarnings("deprecation")
 	public void run() {
 		while(thread != null){
 			try{

src/Common/messageReceiver.java

@@ -1,5 +1,5 @@
-package common;
+package Common;
 
-public class MessageReceiver {
+public class messageReceiver {
 
 }

src/Common/messageSender.java

@@ -1,10 +1,10 @@
-package common;
+package Common;
 
-import server.Account;
+import Server.Account;
 
-public class MessageSender {
+public class messageSender {
 
-	public MessageSender(Account[] accounts) {
+	public messageSender(Account[] accounts) {
 
 	}
 

src/Server/ClientThread.java

@@ -1,20 +1,20 @@
-package server;
+package Server;
 
 import java.io.DataInputStream;
 import java.net.Socket;
 
-import client.SmalltalkClient;
+import Client.SmallTalkClient;
 
 
 public class ClientThread extends Thread{
 	private Socket socket = null;
-	private SmalltalkClient client = null;
+	private SmallTalkClient client = null;
 	private DataInputStream streamIn = null;
 
 	/*
 	 * Constructor for ClientThread
 	 */
-	public ClientThread(SmalltalkClient client, Socket socket){
+	public ClientThread(SmallTalkClient client, Socket socket){
 		this.client = client;
 		this.socket = socket;
 		open();

src/Server/SmallChatServer.java

@@ -1,4 +1,4 @@
-package server;
+package Server;
 
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -7,7 +7,7 @@ public class SmallChatServer implements Runnable{
 
 	private ServerSocket server = null;
 	private Thread thread = null;
-	private SmalltalkServer client = null;
+	private SmallTalkServer client = null;
 
 	/*
 	 * Constructor for SmallChatServer
@@ -37,6 +37,7 @@ private void start(){
 	/*
 	 * Method that stops the thread
 	 */
+	@SuppressWarnings("deprecation")
 	public void stop(){  
 		if (thread != null){
 		   thread.stop(); 
@@ -65,7 +66,7 @@ public void run() {
 	 */
 	public void addThread(Socket socket){
 		System.out.println("Accepting client...");
-		client = new SmalltalkServer(this, socket);
+		client = new SmallTalkServer(this, socket);
 		try{
 			client.open();
 			client.start();

src/Server/account.java

@@ -15,7 +15,7 @@
  * For existing account information see accounts file.
  */
 
-package server;
+package Server;
 
 import java.io.BufferedWriter;
 import java.io.File;

src/Server/accountHandler.java

@@ -1,4 +1,4 @@
-package server;
+package Server;
 
 import java.security.NoSuchAlgorithmException;
 

src/Server/smalltalkServer.java

@@ -1,4 +1,4 @@
-package server;
+package Server;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
@@ -7,7 +7,7 @@
 import java.net.DatagramPacket;
 import java.net.Socket;
 
-public class SmalltalkServer extends Thread {
+public class SmallTalkServer extends Thread {
 
 	DatagramPacket pkt;
 	private Socket socket = null;
@@ -20,7 +20,7 @@ public class SmalltalkServer extends Thread {
 	 * Constructor for smalltalkServer
 	 * Creates server
 	 */
-	public SmalltalkServer(SmallChatServer server, Socket socket) {
+	public SmallTalkServer(SmallChatServer server, Socket socket) {
 		this.server = server;
 		this.socket = socket;
 		ID = socket.getPort();