From 28f55802b56fcb491b7da0e3882a969ffac60464 Mon Sep 17 00:00:00 2001
From: Brad Miller <brad@bradhouse.com>
Date: Sat, 7 Nov 2015 12:01:44 -0500
Subject: [PATCH] Reverted RobotBase debugging changes from Peter.

Change-Id: I336b63bae0f751fe846a13d702e01c80e53831cf
---
 .../java/edu/wpi/first/wpilibj/RobotBase.java | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
index 0250c4a6e4..51df54dd44 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
@@ -23,7 +23,6 @@ import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tReso
 import edu.wpi.first.wpilibj.communication.UsageReporting;
 import edu.wpi.first.wpilibj.internal.HardwareHLUsageReporting;
 import edu.wpi.first.wpilibj.internal.HardwareTimer;
-import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
 import edu.wpi.first.wpilibj.networktables.NetworkTable;
 import edu.wpi.first.wpilibj.Utility;
 
@@ -45,12 +44,6 @@ public abstract class RobotBase {
 
   protected final DriverStation m_ds;
 
-  private static class MyLogger implements NetworkTablesJNI.LoggerFunction {
-    public void apply(int level, String file, int line, String msg) {
-      System.err.println(msg);
-    }
-  }
-
   /**
    * Constructor for a generic robot program. User code should be placed in the
    * constructor that runs before the Autonomous or Operator Control period
@@ -66,7 +59,6 @@ public abstract class RobotBase {
     // TODO: See if the next line is necessary
     // Resource.RestartProgram();
 
-    NetworkTablesJNI.setLogger(new MyLogger(), 0);
     NetworkTable.setNetworkIdentity("Robot");
     NetworkTable.setServerMode();// must be before b
     m_ds = DriverStation.getInstance();
@@ -202,21 +194,21 @@ public abstract class RobotBase {
 
     UsageReporting.report(tResourceType.kResourceType_Language, tInstances.kLanguage_Java);
 
-    String robotName = "MyRobot";
-    //Enumeration<URL> resources = null;
-    //try {
-    //  resources = RobotBase.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
-    //} catch (IOException e) {
-    //  e.printStackTrace();
-    //}
-    //while (resources != null && resources.hasMoreElements()) {
-    //  try {
-    //    Manifest manifest = new Manifest(resources.nextElement().openStream());
-    //    robotName = manifest.getMainAttributes().getValue("Robot-Class");
-    //  } catch (IOException e) {
-    //    e.printStackTrace();
-    //  }
-    //}
+    String robotName = "";
+    Enumeration<URL> resources = null;
+    try {
+      resources = RobotBase.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    while (resources != null && resources.hasMoreElements()) {
+      try {
+        Manifest manifest = new Manifest(resources.nextElement().openStream());
+        robotName = manifest.getMainAttributes().getValue("Robot-Class");
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
 
     RobotBase robot;
     try {