From 4106a4261a91c538d62c3acf660746c336fe7dbf Mon Sep 17 00:00:00 2001
From: jdf <jdf@pobox.com>
Date: Thu, 25 Feb 2010 20:57:22 +0000
Subject: [PATCH] Fix Java 5 incompatibility; sorry Ben.

---
 .../tool/src/processing/app/tools/android/AndroidDevice.java | 1 -
 android/tool/src/processing/app/tools/android/Harness.java   | 5 -----
 .../tool/src/processing/app/tools/android/ProcessResult.java | 1 -
 .../src/processing/app/tools/android/SketchLogCatter.java    | 1 -
 .../tool/src/processing/app/tools/android/StreamPump.java    | 3 ---
 5 files changed, 11 deletions(-)

diff --git a/android/tool/src/processing/app/tools/android/AndroidDevice.java b/android/tool/src/processing/app/tools/android/AndroidDevice.java
index 8275586e5..76fd30c83 100644
--- a/android/tool/src/processing/app/tools/android/AndroidDevice.java
+++ b/android/tool/src/processing/app/tools/android/AndroidDevice.java
@@ -32,7 +32,6 @@ public class AndroidDevice implements AndroidDeviceProperties {
   //  adb shell am start -n com.android.launcher2/.Launcher
 
   private class LogLineProcessor implements LineProcessor {
-    @Override
     public void processLine(final String line) {
       final LogEntry entry = new LogEntry(line);
 
diff --git a/android/tool/src/processing/app/tools/android/Harness.java b/android/tool/src/processing/app/tools/android/Harness.java
index 93049a371..fdad7fc75 100644
--- a/android/tool/src/processing/app/tools/android/Harness.java
+++ b/android/tool/src/processing/app/tools/android/Harness.java
@@ -9,18 +9,15 @@ public class Harness implements AndroidEnvironmentProperties,
     final AndroidEnvironment env = new AndroidEnvironment();
     env.addPropertyChangeListener(PCD);
     env.addPropertyChangeListener(new PropertyChangeListener() {
-      @Override
       public void propertyChange(final PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(DEVICE_ADDED)) {
           final AndroidDevice device = (AndroidDevice) evt.getNewValue();
           device.addOutputListener("processing.android.test.testconsole",
             new ProcessOutputListener() {
-              @Override
               public void handleStdout(final String line) {
                 System.out.println("testconsole: " + line);
               }
 
-              @Override
               public void handleStderr(final String line) {
                 System.err.println("testconsole: " + line);
               }
@@ -28,12 +25,10 @@ public class Harness implements AndroidEnvironmentProperties,
 
           device.addOutputListener("processing.android.test.testmouse",
             new ProcessOutputListener() {
-              @Override
               public void handleStdout(final String line) {
                 System.out.println("testmouse: " + line);
               }
 
-              @Override
               public void handleStderr(final String line) {
                 System.err.println("testmouse: " + line);
               }
diff --git a/android/tool/src/processing/app/tools/android/ProcessResult.java b/android/tool/src/processing/app/tools/android/ProcessResult.java
index a7fcc6bf3..0cf0271b6 100644
--- a/android/tool/src/processing/app/tools/android/ProcessResult.java
+++ b/android/tool/src/processing/app/tools/android/ProcessResult.java
@@ -19,7 +19,6 @@ public class ProcessResult implements Iterable<String> {
     this.time = time;
   }
 
-  @Override
   public Iterator<String> iterator() {
     return Arrays.asList(output.split("\r?\n")).iterator();
   }
diff --git a/android/tool/src/processing/app/tools/android/SketchLogCatter.java b/android/tool/src/processing/app/tools/android/SketchLogCatter.java
index e04af0573..e9b9b45a9 100644
--- a/android/tool/src/processing/app/tools/android/SketchLogCatter.java
+++ b/android/tool/src/processing/app/tools/android/SketchLogCatter.java
@@ -48,7 +48,6 @@ class SketchLogCatter implements LineProcessor {
     process.waitFor();
   }
 
-  @Override
   public void processLine(final String line) {
     final Matcher m = interestingLine.matcher(line);
     if (m.matches()) {
diff --git a/android/tool/src/processing/app/tools/android/StreamPump.java b/android/tool/src/processing/app/tools/android/StreamPump.java
index 53dcc7c38..b3a5dc012 100644
--- a/android/tool/src/processing/app/tools/android/StreamPump.java
+++ b/android/tool/src/processing/app/tools/android/StreamPump.java
@@ -29,7 +29,6 @@ import java.util.concurrent.ThreadFactory;
 class StreamPump implements Runnable {
   private static final ExecutorService threads = Executors
       .newCachedThreadPool(new ThreadFactory() {
-        @Override
         public Thread newThread(final Runnable r) {
           final Thread t = new Thread(r);
           t.setDaemon(true);
@@ -64,7 +63,6 @@ class StreamPump implements Runnable {
     threads.execute(this);
   }
 
-  @Override
   public void run() {
     try {
       String line;
@@ -92,7 +90,6 @@ class StreamPump implements Runnable {
       this.writer = new PrintWriter(writer, true);
     }
 
-    @Override
     public void processLine(final String line) {
       writer.println(line);
     }