From f98986f4d6257c7a36d905c04ab73341dd911961 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sat, 5 Sep 2015 22:32:07 +0900 Subject: スタックトレースから Logger の呼びだしクラス・メソッドを取得することにした MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/lacolaco/smileessence/IntentRouter.java | 2 +- .../smileessence/activity/EditCommandActivity.java | 2 +- .../activity/EditExtractionActivity.java | 2 +- .../smileessence/activity/EditTabActivity.java | 2 +- .../smileessence/activity/EditTemplateActivity.java | 2 +- .../lacolaco/smileessence/activity/MainActivity.java | 8 ++++---- .../net/lacolaco/smileessence/logging/Logger.java | 20 +++++++++++++++----- .../smileessence/twitter/UserStreamListener.java | 3 ++- .../net/lacolaco/smileessence/view/PostFragment.java | 10 +++++----- 9 files changed, 31 insertions(+), 20 deletions(-) (limited to 'app/src/main/java/net/lacolaco/smileessence') diff --git a/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java b/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java index 84bde3c0..5af91930 100644 --- a/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java +++ b/app/src/main/java/net/lacolaco/smileessence/IntentRouter.java @@ -57,7 +57,7 @@ public class IntentRouter { // -------------------------- STATIC METHODS -------------------------- public static void onNewIntent(MainActivity activity, Intent intent) { - Logger.debug("IntentRouter:onNewIntent"); + Logger.debug("onNewIntent"); Uri uri = intent.getData(); if (uri != null) { onUriIntent(activity, uri); diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java index 556148ac..62bc24eb 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java @@ -94,7 +94,7 @@ public class EditCommandActivity extends Activity { ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); initializeViews(); - Logger.debug("EditCommandActivity:onCreate"); + Logger.debug("onCreate"); } @Override diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java index a4e03ec3..78414e63 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java @@ -120,7 +120,7 @@ public class EditExtractionActivity extends Activity implements AdapterView.OnIt ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); initializeViews(); - Logger.debug("EditExtractionWordActivity:onCreate"); + Logger.debug("onCreate"); } @Override diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java index c6457437..bc2f1f6b 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java @@ -105,7 +105,7 @@ public class EditTabActivity extends Activity { ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); initializeViews(); - Logger.debug("EditTabActivity:onCreate"); + Logger.debug("onCreate"); } @Override diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java index 25b6ce5d..1fb6daa8 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java @@ -120,7 +120,7 @@ public class EditTemplateActivity extends Activity implements AdapterView.OnItem ActionBar actionBar = getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); initializeViews(); - Logger.debug("EditTemplateActivity:onCreate"); + Logger.debug("onCreate"); } @Override diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java index 6c82f26d..300eb5bf 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java +++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java @@ -289,7 +289,7 @@ public class MainActivity extends Activity { } else { startOAuthActivity(); } - Logger.debug("MainActivity:onCreate"); + Logger.debug("onCreate"); } @Override @@ -304,7 +304,7 @@ public class MainActivity extends Activity { if (stream != null) { stream.shutdown(); } - Logger.debug("MainActivity:onDestroy"); + Logger.debug("onDestroy"); } @Override @@ -321,7 +321,7 @@ public class MainActivity extends Activity { @Override protected void onPause() { super.onPause(); - Logger.debug("MainActivity:onPause"); + Logger.debug("onPause"); getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); Notificator.stopNotification(); } @@ -329,7 +329,7 @@ public class MainActivity extends Activity { @Override protected void onResume() { super.onResume(); - Logger.debug("MainActivity:onResume"); + Logger.debug("onResume"); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); Notificator.startNotification(); } diff --git a/app/src/main/java/net/lacolaco/smileessence/logging/Logger.java b/app/src/main/java/net/lacolaco/smileessence/logging/Logger.java index cf2f81bf..23861ae8 100644 --- a/app/src/main/java/net/lacolaco/smileessence/logging/Logger.java +++ b/app/src/main/java/net/lacolaco/smileessence/logging/Logger.java @@ -35,22 +35,32 @@ public class Logger { // -------------------------- STATIC METHODS -------------------------- public static void debug(Object message) { - Log.d(TAG, String.valueOf(message)); + Log.d(getTag(), String.valueOf(message)); } public static void info(Object message) { - Log.i(TAG, String.valueOf(message)); + Log.i(getTag(), String.valueOf(message)); } public static void error(Object message) { - Log.e(TAG, String.valueOf(message)); + Log.e(getTag(), String.valueOf(message)); } public static void warn(Object message) { - Log.w(TAG, String.valueOf(message)); + Log.w(getTag(), String.valueOf(message)); } public static void verbose(Object message) { - Log.v(TAG, String.valueOf(message)); + Log.v(getTag(), String.valueOf(message)); + } + + private static String getTag() { + StackTraceElement[] st = Thread.currentThread().getStackTrace(); + for (int i = 0; i < st.length; ++i) { + if (st[i].getMethodName().equals("getTag")) { + return st[i + 2].getClassName() + "." + st[i + 2].getMethodName(); + } + } + return TAG; } } diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java index b34a8984..3321df20 100644 --- a/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java +++ b/app/src/main/java/net/lacolaco/smileessence/twitter/UserStreamListener.java @@ -30,6 +30,7 @@ import net.lacolaco.smileessence.data.*; import net.lacolaco.smileessence.entity.DirectMessage; import net.lacolaco.smileessence.entity.Tweet; import net.lacolaco.smileessence.entity.User; +import net.lacolaco.smileessence.logging.Logger; import net.lacolaco.smileessence.notification.Notificator; import net.lacolaco.smileessence.view.adapter.CustomListAdapter; import net.lacolaco.smileessence.view.adapter.EventListAdapter; @@ -134,7 +135,7 @@ public class UserStreamListener implements twitter4j.UserStreamListener, Connect @Override public void onException(Exception ex) { - net.lacolaco.smileessence.logging.Logger.error(ex.toString()); + Logger.error(ex.toString()); } // --------------------- Interface UserStreamListener --------------------- diff --git a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java index fd980bff..b72791e1 100644 --- a/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java +++ b/app/src/main/java/net/lacolaco/smileessence/view/PostFragment.java @@ -128,7 +128,7 @@ public class PostFragment extends Fragment implements TextWatcher, View.OnFocusC @Override public void onPostStateChange(final PostState postState) { - Logger.debug("PostFragment PostStateChange"); + Logger.debug("onPostStateChange"); final MainActivity activity = (MainActivity) getActivity(); if (editText != null) { final int start = postState.getSelectionStart(); @@ -218,7 +218,7 @@ public class PostFragment extends Fragment implements TextWatcher, View.OnFocusC @Override public void onCreate(Bundle savedInstanceState) { - Logger.debug("PostFragment Create"); + Logger.debug("onCreate"); super.onCreate(savedInstanceState); setHasOptionsMenu(true); } @@ -231,7 +231,7 @@ public class PostFragment extends Fragment implements TextWatcher, View.OnFocusC } public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Logger.debug("PostFragment CreateView"); + Logger.debug("onCreateView"); MainActivity activity = (MainActivity) getActivity(); PostState.getState().setListener(this); UserPreferenceHelper preferenceHelper = new UserPreferenceHelper(activity); @@ -273,7 +273,7 @@ public class PostFragment extends Fragment implements TextWatcher, View.OnFocusC @Override public void onDestroyView() { - Logger.debug("PostFragment DestroyView"); + Logger.debug("onDestroyView"); super.onDestroyView(); setStateFromView(); PostState.getState().removeListener(); @@ -281,7 +281,7 @@ public class PostFragment extends Fragment implements TextWatcher, View.OnFocusC @Override public void onViewStateRestored(Bundle savedInstanceState) { - Logger.debug("PostFragment ViewStateRestored"); + Logger.debug("onViewStateRestored"); super.onViewStateRestored(savedInstanceState); PostState state = PostState.getState(); onPostStateChange(state); -- cgit v1.2.3