Bug 1316006 - Change implicit toString() to Arrays.toString(); r?sebastian
MozReview-Commit-ID: Cgcc8UMNpCr
--- a/mobile/android/base/java/org/mozilla/gecko/db/AbstractTransactionalProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/AbstractTransactionalProvider.java
@@ -8,16 +8,17 @@ import org.mozilla.gecko.AppConstants.Ve
import android.content.ContentProvider;
import android.content.ContentValues;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Log;
+import java.util.Arrays;
/**
* This abstract class exists to capture some of the transaction-handling
* commonalities in Fennec's DB layer.
*
* In particular, this abstracts DB access, batching, and a particular
* transaction approach.
*
@@ -166,17 +167,17 @@ public abstract class AbstractTransactio
protected void endBatch(final SQLiteDatabase db) {
trace("Ending batch.");
db.endTransaction();
isInBatchOperation.set(Boolean.FALSE);
}
@Override
public int delete(Uri uri, String selection, String[] selectionArgs) {
- trace("Calling delete on URI: " + uri + ", " + selection + ", " + selectionArgs);
+ trace("Calling delete on URI: " + uri + ", " + selection + ", " + Arrays.toString(selectionArgs));
final SQLiteDatabase db = getWritableDatabase(uri);
int deleted = 0;
try {
deleted = deleteInTransaction(uri, selection, selectionArgs);
markWriteSuccessful(db);
} finally {
@@ -213,17 +214,17 @@ public abstract class AbstractTransactio
getContext().getContentResolver().notifyChange(uri, null, shouldSyncToNetwork);
}
return result;
}
@Override
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
- trace("Calling update on URI: " + uri + ", " + selection + ", " + selectionArgs);
+ trace("Calling update on URI: " + uri + ", " + selection + ", " + Arrays.toString(selectionArgs));
final SQLiteDatabase db = getWritableDatabase(uri);
int updated = 0;
try {
updated = updateInTransaction(uri, values, selection,
selectionArgs);
markWriteSuccessful(db);
--- a/mobile/android/base/java/org/mozilla/gecko/db/BaseTable.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BaseTable.java
@@ -5,16 +5,17 @@
package org.mozilla.gecko.db;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.util.Log;
+import java.util.Arrays;
// BaseTable provides a basic implementation of a Table for tables that don't require advanced operations during
// insert, delete, update, or query operations. Implementors must still provide onCreate and onUpgrade operations.
public abstract class BaseTable implements Table {
private static final String LOGTAG = "GeckoBaseTable";
private static final boolean DEBUG = false;
@@ -32,17 +33,17 @@ public abstract class BaseTable implemen
// Returns the name of the table to modify/query
protected abstract String getTable();
// Table implementation
@Override
public Cursor query(SQLiteDatabase db, Uri uri, int dbId, String[] columns, String selection, String[] selectionArgs, String sortOrder, String groupBy, String limit) {
Cursor c = db.query(getTable(), columns, selection, selectionArgs, groupBy, null, sortOrder, limit);
- log("query " + columns + " in " + selection + " = " + c);
+ log("query " + Arrays.toString(columns) + " in " + selection + " = " + c);
return c;
}
@Override
public int update(SQLiteDatabase db, Uri uri, int dbId, ContentValues values, String selection, String[] selectionArgs) {
int updated = db.updateWithOnConflict(getTable(), values, selection, selectionArgs, SQLiteDatabase.CONFLICT_REPLACE);
log("update " + values + " in " + selection + " = " + updated);
return updated;