From 94cb5e7efd6cd0f04bd29b688cf87ee293377c7b Mon Sep 17 00:00:00 2001
From: jdf <jdf@pobox.com>
Date: Sat, 27 Feb 2010 18:43:44 +0000
Subject: [PATCH] cleaning up

---
 .../app/tools/android/AndroidProcess.java     | 36 -------------------
 .../processing/app/tools/android/Harness.java | 20 -----------
 .../app/tools/android/LineProcessor.java      |  2 +-
 .../processing/app/tools/android/Reset.java   |  3 --
 .../app/tools/android/StreamPump.java         |  6 ++--
 5 files changed, 4 insertions(+), 63 deletions(-)
 delete mode 100644 android/tool/src/processing/app/tools/android/AndroidProcess.java
 delete mode 100644 android/tool/src/processing/app/tools/android/Harness.java

diff --git a/android/tool/src/processing/app/tools/android/AndroidProcess.java b/android/tool/src/processing/app/tools/android/AndroidProcess.java
deleted file mode 100644
index bfcfa7c62..000000000
--- a/android/tool/src/processing/app/tools/android/AndroidProcess.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package processing.app.tools.android;
-
-public class AndroidProcess {
-  public final String pid;
-  public final String name;
-
-  public AndroidProcess(final String pid, final String name) {
-    if (pid == null) {
-      throw new IllegalArgumentException("null pid");
-    }
-    if (name == null) {
-      throw new IllegalArgumentException("null name");
-    }
-    this.pid = pid;
-    this.name = name;
-  }
-
-  @Override
-  public String toString() {
-    return name + " (" + pid + ")";
-  }
-
-  @Override
-  public boolean equals(final Object obj) {
-    if (!(obj instanceof AndroidProcess)) {
-      return false;
-    }
-    final AndroidProcess o = (AndroidProcess) obj;
-    return pid.equals(o.pid) && name.equals(o.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return pid.hashCode() * 17 + name.hashCode();
-  }
-}
diff --git a/android/tool/src/processing/app/tools/android/Harness.java b/android/tool/src/processing/app/tools/android/Harness.java
deleted file mode 100644
index 5e91f1e40..000000000
--- a/android/tool/src/processing/app/tools/android/Harness.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package processing.app.tools.android;
-
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-
-public class Harness implements AndroidEnvironmentProperties,
-    AndroidDeviceProperties {
-  public static void main(final String[] args) throws Exception {
-    System.err.println("Waiting for device to be plugged in.");
-    final AndroidDevice device = AndroidEnvironment.getInstance().getHardware()
-        .get();
-    System.err.println("Got it.");
-    final JFrame f = new JFrame("Harness");
-    f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    f.add(new JLabel("Close me to quit"));
-    f.pack();
-    f.setVisible(true);
-  }
-
-}
diff --git a/android/tool/src/processing/app/tools/android/LineProcessor.java b/android/tool/src/processing/app/tools/android/LineProcessor.java
index 6c77fecbf..39e58434a 100644
--- a/android/tool/src/processing/app/tools/android/LineProcessor.java
+++ b/android/tool/src/processing/app/tools/android/LineProcessor.java
@@ -1,5 +1,5 @@
 package processing.app.tools.android;
 
-public interface LineProcessor {
+interface LineProcessor {
   void processLine(final String line);
 }
diff --git a/android/tool/src/processing/app/tools/android/Reset.java b/android/tool/src/processing/app/tools/android/Reset.java
index f1bbaa3a4..0c02ba6bd 100644
--- a/android/tool/src/processing/app/tools/android/Reset.java
+++ b/android/tool/src/processing/app/tools/android/Reset.java
@@ -27,14 +27,11 @@ import processing.app.tools.Tool;
 public class Reset implements Tool {
   static final String MENU_TITLE = "Reset Android";
 
-  Editor editor;
-
   public String getMenuTitle() {
     return MENU_TITLE;
   }
 
   public void init(final Editor editor) {
-    this.editor = editor;
   }
 
   public void run() {
diff --git a/android/tool/src/processing/app/tools/android/StreamPump.java b/android/tool/src/processing/app/tools/android/StreamPump.java
index 1ac65af06..be05d5beb 100644
--- a/android/tool/src/processing/app/tools/android/StreamPump.java
+++ b/android/tool/src/processing/app/tools/android/StreamPump.java
@@ -79,14 +79,14 @@ class StreamPump implements Runnable {
     }
   }
 
-  static public class WriterLineProcessor implements LineProcessor {
+  private class WriterLineProcessor implements LineProcessor {
     private final PrintWriter writer;
 
-    public WriterLineProcessor(final OutputStream out) {
+    WriterLineProcessor(final OutputStream out) {
       this.writer = new PrintWriter(out, true);
     }
 
-    public WriterLineProcessor(final Writer writer) {
+    WriterLineProcessor(final Writer writer) {
       this.writer = new PrintWriter(writer, true);
     }