From 5ecf07739ea142fb073728aa0ddffe0d4833eef0 Mon Sep 17 00:00:00 2001 From: karthik-rp Date: Sun, 3 May 2015 10:58:38 +0530 Subject: [PATCH] Renamed Packages and Classes Renaming of Packages and Classes to adhere Java Naming Conventions --- src/Client/smalltalkClient.java | 16 ++++++++-------- src/Common/messageReceiver.java | 4 ++-- src/Common/messageSender.java | 8 ++++---- src/Server/ClientThread.java | 8 ++++---- src/Server/SmallChatServer.java | 7 ++++--- src/Server/account.java | 2 +- src/Server/accountHandler.java | 2 +- src/Server/smalltalkServer.java | 6 +++--- 8 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/Client/smalltalkClient.java b/src/Client/smalltalkClient.java index 3387663..bb7db19 100644 --- a/src/Client/smalltalkClient.java +++ b/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{ diff --git a/src/Common/messageReceiver.java b/src/Common/messageReceiver.java index da15a9a..85f17ef 100644 --- a/src/Common/messageReceiver.java +++ b/src/Common/messageReceiver.java @@ -1,5 +1,5 @@ -package common; +package Common; -public class MessageReceiver { +public class messageReceiver { } diff --git a/src/Common/messageSender.java b/src/Common/messageSender.java index 0cec788..0995749 100644 --- a/src/Common/messageSender.java +++ b/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) { } diff --git a/src/Server/ClientThread.java b/src/Server/ClientThread.java index 3b714a6..7df0aad 100644 --- a/src/Server/ClientThread.java +++ b/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(); diff --git a/src/Server/SmallChatServer.java b/src/Server/SmallChatServer.java index 6a04e00..e621d5c 100644 --- a/src/Server/SmallChatServer.java +++ b/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(); diff --git a/src/Server/account.java b/src/Server/account.java index 6e68c09..1c19ad8 100644 --- a/src/Server/account.java +++ b/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; diff --git a/src/Server/accountHandler.java b/src/Server/accountHandler.java index a444516..153f00b 100644 --- a/src/Server/accountHandler.java +++ b/src/Server/accountHandler.java @@ -1,4 +1,4 @@ -package server; +package Server; import java.security.NoSuchAlgorithmException; diff --git a/src/Server/smalltalkServer.java b/src/Server/smalltalkServer.java index ffb88d3..61a0ff2 100644 --- a/src/Server/smalltalkServer.java +++ b/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();