Client: rename Soc => soc, phrase => line

3 files changed, 22 insertions, 22 deletions

diff --git a/src/Client/ChatClient.java b/src/Client/ChatClient.java
index 150be9e..458c19d 100644
--- a/src/Client/ChatClient.java
+++ b/src/Client/ChatClient.java
@@ -12,23 +12,23 @@ public class ChatClient
 	{

 		int port = ChatServer.portNum;

 		String host = null;

-		Socket Soc;

+		Socket soc;

 		try

 		{

-			Soc = new Socket(host, port);

+			soc = new Socket(host, port);

 		} catch (IOException e)

 		{

 			System.err.println("Failed connecting to server: " + host + ":" + port + " (" + e + ")");

 			return;

 		}

 

-		ChatClientReader reader = new ChatClientReader(Soc);

-		ChatClientWriter writer = new ChatClientWriter(Soc);

+		ChatClientReader reader = new ChatClientReader(soc);

+		ChatClientWriter writer = new ChatClientWriter(soc);

 		

 		reader.start();

 		writer.start();

 		

-		//Soc.close();

+		//soc.close();

 	}

 

 }

diff --git a/src/Client/ChatClientReader.java b/src/Client/ChatClientReader.java
index 8a495a5..b7b4ea1 100644
--- a/src/Client/ChatClientReader.java
+++ b/src/Client/ChatClientReader.java
@@ -7,11 +7,11 @@ public class ChatClientReader extends Thread
 {

 	public static Scanner reader = new Scanner(System.in);

 	

-	private Socket Soc;

+	private Socket soc;

 	

-	public ChatClientReader (Socket Soc)

+	public ChatClientReader (Socket soc)

 	{

-		this.Soc = Soc;

+		this.soc = soc;

 	}

 	

 	public void run()

@@ -19,17 +19,17 @@ public class ChatClientReader extends Thread
 		try

 		{

 	

-			String phrase;

+			String line;

 	

-			InputStreamReader inputTemp = new InputStreamReader(this.Soc.getInputStream());

+			InputStreamReader inputTemp = new InputStreamReader(this.soc.getInputStream());

 			BufferedReader input = new BufferedReader(inputTemp);

 			

 			do {

-				phrase = input.readLine(); // FIXME: more then 1 line

-				phrase = "[" + phrase + "]";

+				line = input.readLine(); // FIXME: more then 1 line

+				line = "[" + line + "]";

 				System.out.println("");

-				System.out.println(phrase);

-			} while (phrase != null);

+				System.out.println(line);

+			} while (line != null);

 			

 

 		} catch (IOException e)	{

@@ -39,4 +39,4 @@ public class ChatClientReader extends Thread
 

 	}

 

-}
\ No newline at end of file
+}

diff --git a/src/Client/ChatClientWriter.java b/src/Client/ChatClientWriter.java
index 3405fd1..cf4ec09 100644
--- a/src/Client/ChatClientWriter.java
+++ b/src/Client/ChatClientWriter.java
@@ -5,13 +5,13 @@ import java.util.*;
 

 public class ChatClientWriter extends Thread

 {

-	private Socket Soc;

+	private Socket soc;

 

 	public static Scanner reader = new Scanner(System.in);

 

-	public ChatClientWriter(Socket Soc)

+	public ChatClientWriter(Socket soc)

 	{

-		this.Soc = Soc;

+		this.soc = soc;

 	}

 

 	public void run()

@@ -19,16 +19,16 @@ public class ChatClientWriter extends Thread
 		try

 		{

 			OutputStreamWriter outTemp;

-			String phrase;

+			String line;

 

-			outTemp = new OutputStreamWriter(this.Soc.getOutputStream());

+			outTemp = new OutputStreamWriter(this.soc.getOutputStream());

 			BufferedWriter output = new BufferedWriter(outTemp);

 		

 			while (true)

 			{

 				System.out.print("Write here:> ");

-				phrase = reader.nextLine();

-				output.write(phrase, 0, phrase.length());

+				line = reader.nextLine();

+				output.write(line, 0, line.length());

 				output.newLine();

 				output.flush();

 			}