Created new class for server

quaa · quaa · commit c7ec422b2cfc · 2010-11-20T19:26:40.000-06:00
diff --git a/src/Server.java b/src/Server.java
@@ -0,0 +1,49 @@
+import java.io.File;
+import java.io.ObjectInputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+
+public class Server {
+	private int PORT_NUMBER;
+	
+	public Server(int port) {
+		PORT_NUMBER = port;
+	}
+	
+	public void startServer() throws Exception {
+		System.out.println("Starting File Sync Server!");
+		
+		ServerSocket servsock = new ServerSocket(PORT_NUMBER);
+		
+		while (true) {
+			Socket sock = servsock.accept();
+
+			ObjectInputStream ois = new ObjectInputStream(sock.getInputStream());
+			String baseDir = (String) ois.readObject();
+			
+			File fBaseDir = new File(baseDir);
+			
+			if(fBaseDir.exists() && fBaseDir.isDirectory()){
+				System.out.println(baseDir + " is a directory and exists!");
+/*				System.out.print("Sending file '" + fileName + "' to: " + sock.getInetAddress() + "...");
+				ObjectOutputStream oos = new ObjectOutputStream(sock.getOutputStream());
+				oos.writeObject("1");
+				byte[] mybytearray = new byte[(int) f.length()];
+				BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f));
+				bis.read(mybytearray, 0, mybytearray.length);
+				OutputStream os = sock.getOutputStream();
+				os.write(mybytearray, 0, mybytearray.length);
+				os.flush();
+				System.out.println(" DONE!");
+*/			}else{
+				System.out.println(baseDir + " Exists?: " + fBaseDir.exists() + " IsDirectory?: " + fBaseDir.isDirectory());
+/*				System.out.println(sock.getInetAddress() + " requested " + fileName + ", but it does not exist!");
+				ObjectOutputStream oos = new ObjectOutputStream(sock.getOutputStream());
+				oos.writeObject("0");
+				oos.flush();
+*/			}
+			sock.close();
+		}
+	}
+}
diff --git a/src/javaFileSync.java b/src/javaFileSync.java
@@ -30,39 +30,8 @@ public static void main(String[] args) {
 	}
 
 	public static void server() throws Exception {
-		System.out.println("Starting File Sync Server!");
-		
-		ServerSocket servsock = new ServerSocket(PORT_NUMBER);
-		
-		while (true) {
-			Socket sock = servsock.accept();
-
-			ObjectInputStream ois = new ObjectInputStream(sock.getInputStream());
-			String baseDir = (String) ois.readObject();
-			
-			File fBaseDir = new File(baseDir);
-			
-			if(fBaseDir.exists() && fBaseDir.isDirectory()){
-				System.out.println(baseDir + " is a directory and exists!");
-/*				System.out.print("Sending file '" + fileName + "' to: " + sock.getInetAddress() + "...");
-				ObjectOutputStream oos = new ObjectOutputStream(sock.getOutputStream());
-				oos.writeObject("1");
-				byte[] mybytearray = new byte[(int) f.length()];
-				BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f));
-				bis.read(mybytearray, 0, mybytearray.length);
-				OutputStream os = sock.getOutputStream();
-				os.write(mybytearray, 0, mybytearray.length);
-				os.flush();
-				System.out.println(" DONE!");
-*/			}else{
-				System.out.println(baseDir + " Exists?: " + fBaseDir.exists() + " IsDirectory?: " + fBaseDir.isDirectory());
-/*				System.out.println(sock.getInetAddress() + " requested " + fileName + ", but it does not exist!");
-				ObjectOutputStream oos = new ObjectOutputStream(sock.getOutputStream());
-				oos.writeObject("0");
-				oos.flush();
-*/			}
-			sock.close();
-		}
+		Server s = new Server(PORT_NUMBER);
+		s.startServer();
 	}
 	
 	public static void client(String dirName, String serverIP) throws Exception {
