From 1edab71d010f3efdde212b96aa1a44ab7a5b4ee5 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 1 Sep 2016 10:55:20 -0700 Subject: [PATCH] Unifying toString() method for various ItemInfo subclasses Change-Id: I7cde42f0df412e2877fb93c77e74ee56a25edead --- src/com/android/launcher3/AppInfo.java | 7 ++---- src/com/android/launcher3/FolderInfo.java | 8 ------- src/com/android/launcher3/ItemInfo.java | 22 +++++++++++++++---- .../launcher3/LauncherAppWidgetInfo.java | 4 ++-- .../android/launcher3/PendingAddItemInfo.java | 5 +++++ src/com/android/launcher3/ShortcutInfo.java | 8 ------- .../launcher3/model/PackageItemInfo.java | 9 ++------ .../widget/PendingAddShortcutInfo.java | 6 ----- .../widget/PendingAddWidgetInfo.java | 6 ----- 9 files changed, 29 insertions(+), 46 deletions(-) diff --git a/src/com/android/launcher3/AppInfo.java b/src/com/android/launcher3/AppInfo.java index e0694f3cfa..604b164638 100644 --- a/src/com/android/launcher3/AppInfo.java +++ b/src/com/android/launcher3/AppInfo.java @@ -125,11 +125,8 @@ public class AppInfo extends ItemInfo { } @Override - public String toString() { - return "ApplicationInfo(title=" + title + " id=" + this.id - + " type=" + this.itemType + " container=" + this.container - + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY - + " spanX=" + spanX + " spanY=" + spanY + " user=" + user + ")"; + protected String dumpProperties() { + return super.dumpProperties() + " componentName=" + componentName; } /** diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java index 9a99852119..c0a8caaa33 100644 --- a/src/com/android/launcher3/FolderInfo.java +++ b/src/com/android/launcher3/FolderInfo.java @@ -126,14 +126,6 @@ public class FolderInfo extends ItemInfo { public void onItemsChanged(boolean animate); } - @Override - public String toString() { - return "FolderInfo(id=" + this.id + " type=" + this.itemType - + " container=" + this.container + " screen=" + screenId - + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX - + " spanY=" + spanY + ")"; - } - public boolean hasOption(int optionFlag) { return (options & optionFlag) != 0; } diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java index 2a94e55c04..c0c22a325a 100644 --- a/src/com/android/launcher3/ItemInfo.java +++ b/src/com/android/launcher3/ItemInfo.java @@ -189,10 +189,24 @@ public class ItemInfo { } @Override - public String toString() { - return "Item(id=" + this.id + " type=" + this.itemType + " container=" + this.container - + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX - + " spanY=" + spanY + " user=" + user + ")"; + public final String toString() { + return getClass().getSimpleName() + "(" + dumpProperties() + ")"; + } + + protected String dumpProperties() { + return "id=" + id + + " type=" + itemType + + " container=" + container + + " screen=" + screenId + + " cellX=" + cellX + + " cellY=" + cellY + + " spanX=" + spanX + + " spanY=" + spanY + + " minSpanX=" + minSpanX + + " minSpanY=" + minSpanY + + " rank=" + rank + + " user=" + user + + " title=" + title; } /** diff --git a/src/com/android/launcher3/LauncherAppWidgetInfo.java b/src/com/android/launcher3/LauncherAppWidgetInfo.java index f22c2a4742..66d895726b 100644 --- a/src/com/android/launcher3/LauncherAppWidgetInfo.java +++ b/src/com/android/launcher3/LauncherAppWidgetInfo.java @@ -143,8 +143,8 @@ public class LauncherAppWidgetInfo extends ItemInfo { } @Override - public String toString() { - return "AppWidget(id=" + Integer.toString(appWidgetId) + ")"; + protected String dumpProperties() { + return super.dumpProperties() + " appWidgetId=" + appWidgetId; } public final boolean isWidgetIdAllocated() { diff --git a/src/com/android/launcher3/PendingAddItemInfo.java b/src/com/android/launcher3/PendingAddItemInfo.java index 1aaf85bbda..31820d7424 100644 --- a/src/com/android/launcher3/PendingAddItemInfo.java +++ b/src/com/android/launcher3/PendingAddItemInfo.java @@ -29,4 +29,9 @@ public class PendingAddItemInfo extends ItemInfo { * The component that will be created. */ public ComponentName componentName; + + @Override + protected String dumpProperties() { + return super.dumpProperties() + " componentName=" + componentName; + } } diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 21fa8a05e6..9d7be1693c 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -270,14 +270,6 @@ public class ShortcutInfo extends ItemInfo { } } - @Override - public String toString() { - return "ShortcutInfo(title=" + title + "intent=" + intent + "id=" + this.id - + " type=" + this.itemType + " container=" + this.container + " screen=" + screenId - + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX + " spanY=" + spanY - + " user=" + user + ")"; - } - public ComponentName getTargetComponent() { return promisedIntent != null ? promisedIntent.getComponent() : intent.getComponent(); } diff --git a/src/com/android/launcher3/model/PackageItemInfo.java b/src/com/android/launcher3/model/PackageItemInfo.java index ddc9cbfd98..c86ba86fd0 100644 --- a/src/com/android/launcher3/model/PackageItemInfo.java +++ b/src/com/android/launcher3/model/PackageItemInfo.java @@ -46,17 +46,12 @@ public class PackageItemInfo extends ItemInfo { */ public String titleSectionName; - int flags = 0; - PackageItemInfo(String packageName) { this.packageName = packageName; } @Override - public String toString() { - return "PackageItemInfo(title=" + title + " id=" + this.id - + " type=" + this.itemType + " container=" + this.container - + " screen=" + screenId + " cellX=" + cellX + " cellY=" + cellY - + " spanX=" + spanX + " spanY=" + spanY + " user=" + user + ")"; + protected String dumpProperties() { + return super.dumpProperties() + " packageName=" + packageName; } } diff --git a/src/com/android/launcher3/widget/PendingAddShortcutInfo.java b/src/com/android/launcher3/widget/PendingAddShortcutInfo.java index a56985083c..486b18ef21 100644 --- a/src/com/android/launcher3/widget/PendingAddShortcutInfo.java +++ b/src/com/android/launcher3/widget/PendingAddShortcutInfo.java @@ -35,10 +35,4 @@ public class PendingAddShortcutInfo extends PendingAddItemInfo { componentName = new ComponentName(activityInfo.packageName, activityInfo.name); itemType = LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; } - - @Override - public String toString() { - return String.format("PendingAddShortcutInfo package=%s, name=%s", - activityInfo.packageName, activityInfo.name); - } } diff --git a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java index de06ab664a..f800ac44dc 100644 --- a/src/com/android/launcher3/widget/PendingAddWidgetInfo.java +++ b/src/com/android/launcher3/widget/PendingAddWidgetInfo.java @@ -59,10 +59,4 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo { public boolean isCustomWidget() { return itemType == LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET; } - - @Override - public String toString() { - return String.format("PendingAddWidgetInfo package=%s, name=%s", - componentName.getPackageName(), componentName.getShortClassName()); - } }