From 2d690ad014b8626e81210b9575533ed80d87c90a Mon Sep 17 00:00:00 2001 From: Bryce Curtis Date: Wed, 26 Oct 2011 14:28:39 -0500 Subject: [PATCH] Use LOG instead of System.out.println for logging. --- framework/src/com/phonegap/App.java | 6 +++--- framework/src/com/phonegap/CameraLauncher.java | 6 +++--- framework/src/com/phonegap/Capture.java | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/framework/src/com/phonegap/App.java b/framework/src/com/phonegap/App.java index 811f6c1c..09a22e22 100755 --- a/framework/src/com/phonegap/App.java +++ b/framework/src/com/phonegap/App.java @@ -10,7 +10,7 @@ package com.phonegap; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import android.app.Activity; +import com.phonegap.api.LOG; import com.phonegap.api.Plugin; import com.phonegap.api.PluginResult; import java.util.HashMap; @@ -86,7 +86,7 @@ public class App extends Plugin { * @throws JSONException */ public void loadUrl(String url, JSONObject props) throws JSONException { - System.out.println("App.loadUrl("+url+","+props+")"); + LOG.d("App", "App.loadUrl("+url+","+props+")"); int wait = 0; boolean openExternal = false; boolean clearHistory = false; @@ -167,7 +167,7 @@ public class App extends Plugin { * @param override T=override, F=cancel override */ public void overrideBackbutton(boolean override) { - System.out.println("WARNING: Back Button Default Behaviour will be overridden. The backbutton event will be fired!"); + LOG.i("DroidGap", "WARNING: Back Button Default Behaviour will be overridden. The backbutton event will be fired!"); ((DroidGap)this.ctx).bound = override; } diff --git a/framework/src/com/phonegap/CameraLauncher.java b/framework/src/com/phonegap/CameraLauncher.java index e885bb17..a2a28b9c 100755 --- a/framework/src/com/phonegap/CameraLauncher.java +++ b/framework/src/com/phonegap/CameraLauncher.java @@ -21,6 +21,7 @@ import org.json.JSONObject; import com.phonegap.api.Plugin; import com.phonegap.api.PluginResult; +import com.phonegap.api.LOG; import android.app.Activity; import android.content.ContentValues; @@ -30,7 +31,6 @@ import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.net.Uri; import android.provider.MediaStore; -import android.util.Log; /** * This class launches the camera view, allows the user to take a picture, closes the camera view, @@ -304,11 +304,11 @@ public class CameraLauncher extends Plugin { try { uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); } catch (UnsupportedOperationException e) { - System.out.println("Can't write to external media storage."); + LOG.d(LOG_TAG, "Can't write to external media storage."); try { uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values); } catch (UnsupportedOperationException ex) { - System.out.println("Can't write to internal media storage."); + LOG.d(LOG_TAG, "Can't write to internal media storage."); this.failPicture("Error capturing image - no media storage found."); return; } diff --git a/framework/src/com/phonegap/Capture.java b/framework/src/com/phonegap/Capture.java index 0a843564..e68cbe14 100644 --- a/framework/src/com/phonegap/Capture.java +++ b/framework/src/com/phonegap/Capture.java @@ -24,6 +24,7 @@ import android.media.MediaPlayer; import android.net.Uri; import android.util.Log; +import com.phonegap.api.LOG; import com.phonegap.api.Plugin; import com.phonegap.api.PluginResult; @@ -243,11 +244,11 @@ public class Capture extends Plugin { try { uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); } catch (UnsupportedOperationException e) { - System.out.println("Can't write to external media storage."); + LOG.d(LOG_TAG, "Can't write to external media storage."); try { uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values); } catch (UnsupportedOperationException ex) { - System.out.println("Can't write to internal media storage."); + LOG.d(LOG_TAG, "Can't write to internal media storage."); this.fail("Error capturing image - no media storage found."); return; }