From 74add1680ed309558d4b85a56f1830e862e8ca43 Mon Sep 17 00:00:00 2001 From: jdf Date: Sat, 27 Feb 2010 19:03:01 +0000 Subject: [PATCH] more cleanup --- .../app/tools/android/AndroidDevice.java | 4 ++-- .../app/tools/android/AndroidSDK.java | 2 +- .../app/tools/android/AndroidTool.java | 4 ++-- .../processing/app/tools/android/Build.java | 22 +++++++++---------- .../processing/app/tools/android/Device.java | 7 +++--- .../app/tools/android/EmulatorController.java | 3 +-- .../app/tools/android/LogEntry.java | 4 ++-- .../tools/android/ProcessOutputListener.java | 7 ------ .../app/tools/android/StreamPump.java | 4 ++-- 9 files changed, 25 insertions(+), 32 deletions(-) delete mode 100644 android/tool/src/processing/app/tools/android/ProcessOutputListener.java diff --git a/android/tool/src/processing/app/tools/android/AndroidDevice.java b/android/tool/src/processing/app/tools/android/AndroidDevice.java index df0b3885e..8863a0746 100644 --- a/android/tool/src/processing/app/tools/android/AndroidDevice.java +++ b/android/tool/src/processing/app/tools/android/AndroidDevice.java @@ -8,7 +8,7 @@ import java.util.regex.Pattern; import processing.app.debug.RunnerListener; import processing.app.tools.android.LogEntry.Severity; -public class AndroidDevice implements AndroidDeviceProperties { +class AndroidDevice implements AndroidDeviceProperties { private final AndroidEnvironment env; private final String id; private final Set activeProcesses = new HashSet(); @@ -160,7 +160,7 @@ public class AndroidDevice implements AndroidDeviceProperties { activeProcesses.remove(pid); } - String[] generateAdbCommand(final String... cmd) { + private String[] generateAdbCommand(final String... cmd) { final String[] adbCmd = new String[3 + cmd.length]; adbCmd[0] = "adb"; adbCmd[1] = "-s"; diff --git a/android/tool/src/processing/app/tools/android/AndroidSDK.java b/android/tool/src/processing/app/tools/android/AndroidSDK.java index 340ccfb66..ad3e9b5bc 100644 --- a/android/tool/src/processing/app/tools/android/AndroidSDK.java +++ b/android/tool/src/processing/app/tools/android/AndroidSDK.java @@ -2,7 +2,7 @@ package processing.app.tools.android; import java.io.File; -public class AndroidSDK { +class AndroidSDK { private final File sdk; private final File tools; private final File androidTool; diff --git a/android/tool/src/processing/app/tools/android/AndroidTool.java b/android/tool/src/processing/app/tools/android/AndroidTool.java index 4bb2f9aa9..af8c32457 100644 --- a/android/tool/src/processing/app/tools/android/AndroidTool.java +++ b/android/tool/src/processing/app/tools/android/AndroidTool.java @@ -105,7 +105,7 @@ public class AndroidTool implements Tool { .compile("^\"([^\"]*)\"$"); // make sure that $ANDROID_SDK/tools has been added to the PATH - protected boolean checkPath() { + private boolean checkPath() { final String canonicalTools; try { canonicalTools = sdk.getTools().getCanonicalPath(); @@ -254,7 +254,7 @@ public class AndroidTool implements Tool { return new File(Base.getSketchbookFolder(), ANDROID_CORE_FILENAME); } - protected boolean checkCore() { + private boolean checkCore() { // File target = new File(Base.getSketchbookFolder(), // ANDROID_CORE_FILENAME); final File target = getCoreZipFile(); diff --git a/android/tool/src/processing/app/tools/android/Build.java b/android/tool/src/processing/app/tools/android/Build.java index 2262ee671..4e88b1a3c 100644 --- a/android/tool/src/processing/app/tools/android/Build.java +++ b/android/tool/src/processing/app/tools/android/Build.java @@ -20,7 +20,7 @@ import processing.app.debug.RunnerException; import processing.app.preproc.PdePreprocessor; import processing.core.PApplet; -public class Build { +class Build { static SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd.HHmm"); static String basePackage = "processing.android.test"; @@ -388,8 +388,8 @@ public class Build { } } - void writeAndroidManifest(final File file, final String sketchName, - final String className) { + private void writeAndroidManifest(final File file, final String sketchName, + final String className) { final PrintWriter writer = PApplet.createWriter(file); writer.println(""); writer @@ -418,14 +418,14 @@ public class Build { writer.close(); } - void writeBuildProps(final File file) { + private void writeBuildProps(final File file) { final PrintWriter writer = PApplet.createWriter(file); writer.println("application-package=" + getPackageName()); writer.flush(); writer.close(); } - void writeBuildXML(final File file, final String projectName) { + private void writeBuildXML(final File file, final String projectName) { final PrintWriter writer = PApplet.createWriter(file); writer.println(""); @@ -478,14 +478,14 @@ public class Build { writer.close(); } - void writeDefaultProps(final File file) { + private void writeDefaultProps(final File file) { final PrintWriter writer = PApplet.createWriter(file); writer.println("target=Google Inc.:Google APIs:" + sdkVersion); writer.flush(); writer.close(); } - void writeLocalProps(final File file) { + private void writeLocalProps(final File file) { final PrintWriter writer = PApplet.createWriter(file); final String sdkPath = sdk.getSdk().getAbsolutePath(); if (Base.isWindows()) { @@ -500,7 +500,7 @@ public class Build { writer.close(); } - void writeRes(final File resFolder, final String className) + private void writeRes(final File resFolder, final String className) throws RunnerException { final File layoutFolder = mkdirs(resFolder, "layout"); final File layoutFile = new File(layoutFolder, "main.xml"); @@ -519,7 +519,7 @@ public class Build { return result; } - void writeResLayoutMain(final File file) { + private void writeResLayoutMain(final File file) { final PrintWriter writer = PApplet.createWriter(file); writer.println(""); writer @@ -551,7 +551,7 @@ public class Build { writer.close(); } - void writeLibraries(final File libsFolder, final File assetsFolder) + private void writeLibraries(final File libsFolder, final File assetsFolder) throws IOException { // Copy any libraries to the 'libs' folder final Sketch sketch = editor.getSketch(); @@ -627,7 +627,7 @@ public class Build { * Place quotes around a string to avoid dreadful syntax mess of escaping * quotes near quoted strings. Mmmm! */ - static final String q(final String what) { + private static final String q(final String what) { return "\"" + what + "\""; } } \ No newline at end of file diff --git a/android/tool/src/processing/app/tools/android/Device.java b/android/tool/src/processing/app/tools/android/Device.java index c25cbb85d..bc0ab53b7 100644 --- a/android/tool/src/processing/app/tools/android/Device.java +++ b/android/tool/src/processing/app/tools/android/Device.java @@ -25,13 +25,13 @@ import java.io.IOException; import processing.app.Base; import processing.core.PApplet; -public class Device { +class Device { private static final ProcessHelper LIST_DEVICES_CMD = new ProcessHelper( "adb", "devices"); - static final String ADB_DEVICES_ERROR = "Received unfamiliar output from “adb devices”.\n" + private static final String ADB_DEVICES_ERROR = "Received unfamiliar output from “adb devices”.\n" + "The device list may have errors."; static final int DEFAULT_WIDTH = 320; @@ -68,7 +68,8 @@ public class Device { // /dev/input/event0: 0001 0066 00000000 } - static void sendKey(final String device, final int key) throws IOException { + private static void sendKey(final String device, final int key) + throws IOException { final String inputDevice = device.startsWith("emulator") ? "/dev/input/event0" : "/dev/input/event3"; final String[] cmd = new String[] { diff --git a/android/tool/src/processing/app/tools/android/EmulatorController.java b/android/tool/src/processing/app/tools/android/EmulatorController.java index f178accc4..8b9d4fc63 100644 --- a/android/tool/src/processing/app/tools/android/EmulatorController.java +++ b/android/tool/src/processing/app/tools/android/EmulatorController.java @@ -24,8 +24,7 @@ class EmulatorController { // launch emulator because it's not running yet final String[] cmd = new String[] { - "emulator", "-avd", AVD.ECLAIR.name, "-port", portString, "-netfast", - "-no-boot-anim" }; + "emulator", "-avd", AVD.ECLAIR.name, "-port", portString, "-no-boot-anim" }; System.err.println("Launching emulator"); final Process p = Runtime.getRuntime().exec(cmd); // "emulator: ERROR: the user data image is used by another emulator. aborting" diff --git a/android/tool/src/processing/app/tools/android/LogEntry.java b/android/tool/src/processing/app/tools/android/LogEntry.java index e6f451a6d..a61a94373 100644 --- a/android/tool/src/processing/app/tools/android/LogEntry.java +++ b/android/tool/src/processing/app/tools/android/LogEntry.java @@ -3,7 +3,7 @@ package processing.app.tools.android; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class LogEntry { +class LogEntry { public static enum Severity { Verbose(false), Debug(false), Info(false), Warning(true), Error(true), Fatal( true); @@ -13,7 +13,7 @@ public class LogEntry { this.useErrorStream = useErrorStream; } - static Severity fromChar(final char c) { + private static Severity fromChar(final char c) { if (c == 'V') { return Verbose; } else if (c == 'D') { diff --git a/android/tool/src/processing/app/tools/android/ProcessOutputListener.java b/android/tool/src/processing/app/tools/android/ProcessOutputListener.java deleted file mode 100644 index 5c0b7abf3..000000000 --- a/android/tool/src/processing/app/tools/android/ProcessOutputListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package processing.app.tools.android; - -public interface ProcessOutputListener { - public void handleStdout(final String line); - - public void handleStderr(final String line); -} diff --git a/android/tool/src/processing/app/tools/android/StreamPump.java b/android/tool/src/processing/app/tools/android/StreamPump.java index be05d5beb..9e71f9521 100644 --- a/android/tool/src/processing/app/tools/android/StreamPump.java +++ b/android/tool/src/processing/app/tools/android/StreamPump.java @@ -82,11 +82,11 @@ class StreamPump implements Runnable { private class WriterLineProcessor implements LineProcessor { private final PrintWriter writer; - WriterLineProcessor(final OutputStream out) { + private WriterLineProcessor(final OutputStream out) { this.writer = new PrintWriter(out, true); } - WriterLineProcessor(final Writer writer) { + private WriterLineProcessor(final Writer writer) { this.writer = new PrintWriter(writer, true); }