package org.usfirst.frc.team2503.r2016;

import java.net.InetSocketAddress;

import org.usfirst.frc.team2503.r2016.server.DataServer;
import org.usfirst.frc.team2503.r2016.server.MessageServer;

/**
 * You can use this class for testing non-WPIlib code on your machine.
 */
public class Main {
	
	public static void main(String[] args) {
		System.setProperty("java.awt.headless", "true");
		
//		Logger.addPrintStream(new LoggerPrintStream(System.out));
//		
//		Camera camera = new Camera(0);
//		try {
//			camera.start();
//			camera.grabFrame();
//		} catch (Exception e) {
//			e.printStackTrace();
//		}
//		
//		Logger.println(camera.getLatestFrame());
//		
//		Logger.println("foo");
		
		Thread dataServerThread = null;
		Thread messageServerThread = null;
		
		DataServer ds = new DataServer(new InetSocketAddress(5800));
		MessageServer ms = new MessageServer(new InetSocketAddress(5801));
		
		dataServerThread = new Thread(ds);
		messageServerThread = new Thread(ms);

		dataServerThread.start();
		messageServerThread.start();
		
		try {
			dataServerThread.join();
			messageServerThread.join();
		} catch(InterruptedException ex) {
			ex.printStackTrace(System.err);
		}
	}
	
}

@@ -38,44 +38,8 @@
 6;%0A%0A
-import java.net.InetSocketAddress;%0A%0A
 impo
@@ -76,23 +76,18 @@
 016.
-server.DataServ
+debug.Logg
 er;%0A
@@ -128,28 +128,38 @@
 016.
-server.MessageServer
+debug.Logger.LoggerPrintStream
 ;%0A%0A/
@@ -306,62 +306,9 @@
 %7B%0A%09%09
-System.setProperty(%22java.awt.headless%22, %22true%22);%0A%09%09%0A//
+%0A
 %09%09Lo
@@ -367,740 +367,98 @@
 ));%0A
-//%09%09%0A//%09%09Camera camera = new Camera(0);%0A//%09%09try %7B%0A//%09%09%09camera.start();%0A//%09%09%09camera.grabFrame();%0A//%09%09%7D catch (Exception e) %7B%0A//%09%09%09e.printStackTrace();%0A//%09%09%7D%0A//%09%09%0A//%09%09Logger.println(camera.getLatestFrame());%0A//%09%09%0A//%09%09Logger.println(%22foo%22);%0A%09%09%0A%09%09Thread dataServerThread = null;%0A%09%09Thread messageServerThread = null;%0A%09%09%0A%09%09DataServer ds = new DataServer(new InetSocketAddress(5800));%0A%09%09MessageServer ms = new MessageServer(new InetSocketAddress(5801));%0A%09%09%0A%09%09dataServerThread = new Thread(ds);%0A%09%09messageServerThread = new Thread(ms);%0A%0A%09%09dataServerThread.start();%0A%09%09messageServerThread.start();%0A%09%09%0A%09%09try %7B%0A%09%09%09dataServerThread.join();%0A%09%09%09messageServerThread.join();%0A%09%09%7D catch(InterruptedException ex) %7B%0A%09%09%09ex.printStackTrace(System.err
+%09%09Logger.addPrintStream(new LoggerPrintStream(System.err));%0A%09%09%0A%09%09Logger.println(%22foo%22
 );%0A%09%09
-%7D
 %0A%09%7D%0A

Remove unused Main.java changes, create a Logger test