From ff7f5642791081549ff6c41946569dc93a444362 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sat, 28 Sep 2019 14:49:55 +0100 Subject: [PATCH] Cleanups as directed by code analysis --- .../ctfwstimer/lib/CtFwSGameStateManager.java | 1 - .../ctfwstimer/activity/AboutActivity.java | 2 +- .../ctfwstimer/activity/HandbookActivity.java | 2 +- .../ctfwstimer/activity/MainActivity.java | 5 ----- .../activity/MainActivityCtFwSDisplay.java | 2 -- .../ctfwstimer/service/MainService.java | 2 +- .../ctfwstimer/utils/CtFwSDisplayTinyChrono.java | 14 ++++++++++---- mobile/src/main/res/drawable/hand_tab_div.xml | 5 ----- mobile/src/main/res/menu/aboutmenu.xml | 2 +- mobile/src/main/res/menu/handmenu.xml | 2 +- mobile/src/main/res/values/dimens.xml | 2 -- 11 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 mobile/src/main/res/drawable/hand_tab_div.xml diff --git a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java index c3889f3..26967d9 100644 --- a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java +++ b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java @@ -2,7 +2,6 @@ package com.acmetensortoys.ctfwstimer.lib; import java.util.HashSet; import java.util.InputMismatchException; -import java.util.List; import java.util.Locale; import java.util.NoSuchElementException; import java.util.Scanner; diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java index b6068fc..71188a3 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java @@ -144,7 +144,7 @@ public class AboutActivity extends CtFwSActivityBase { public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.aboutmenu, menu); - Chronometer ch = (Chronometer) menu.findItem(R.id.about_menu_crono).getActionView(); + Chronometer ch = (Chronometer) menu.findItem(R.id.about_menu_chrono).getActionView(); mTitleChronoObs = new CtFwSDisplayTinyChrono(getResources(), ch); if (mSrvBinder != null) { doRegisterObservers(); diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java index f8809e7..b84a616 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java @@ -94,7 +94,7 @@ public class HandbookActivity extends CtFwSActivityBase { Log.d(TAG, "onCreateOptionsMenu"); getMenuInflater().inflate(R.menu.handmenu, menu); - Chronometer ch = (Chronometer) menu.findItem(R.id.hand_menu_crono).getActionView(); + Chronometer ch = (Chronometer) menu.findItem(R.id.hand_menu_chrono).getActionView(); mTitleChronoObs = new CtFwSDisplayTinyChrono(getResources(), ch); if (mSrvBinder != null) { diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java index be9eb55..b56c9cc 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java @@ -1,15 +1,10 @@ package com.acmetensortoys.ctfwstimer.activity; -import android.content.ComponentName; -import android.content.Context; import android.content.Intent; -import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; -import android.os.IBinder; import android.preference.PreferenceManager; import android.support.annotation.StringRes; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.text.Spanned; import android.util.Log; diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java index cb14738..90f5fef 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java @@ -87,8 +87,6 @@ class MainActivityCtFwSDisplay implements CtFwSGameStateManager.Observer { String sfx; switch (nr) { case NR_EXPLICIT_END: - sfx = rs.getString(R.string.notify_game_over); - break; case NR_TIME_UP: sfx = rs.getString(R.string.notify_game_over); break; diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java index a8f67a8..7cedc23 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java @@ -57,7 +57,7 @@ public class MainService extends Service { } }); - @SuppressWarnings({"FieldCanBeLocal", "unused"}) + @SuppressWarnings({"FieldCanBeLocal"}) private MainServiceNotification mMsn; // set in onCreate public MainService() { } diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java index 0ea1ece..7159074 100644 --- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java +++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java @@ -48,10 +48,16 @@ public class CtFwSDisplayTinyChrono implements CtFwSGameStateManager.Observer { if (now.rationale != CtFwSGameStateManager.NowRationale.NR_GAME_IN_PROGRESS) { int rid = R.string.ctfws_chrono_nogame; switch(now.rationale) { - case NR_TIME_UP: rid = R.string.ctfws_chrono_over ; break; - case NR_EXPLICIT_END: rid = R.string.ctfws_chrono_over ; break; - case NR_START_FUTURE: rid = R.string.ctfws_chrono_future; break; - case NR_NOT_CONFIG: rid = R.string.ctfws_chrono_nogame; break; + case NR_TIME_UP: + case NR_EXPLICIT_END: + rid = R.string.ctfws_chrono_over; + break; + case NR_START_FUTURE: + rid = R.string.ctfws_chrono_future; + break; + case NR_NOT_CONFIG: + rid = R.string.ctfws_chrono_nogame; + break; } mCh.setText(rid); return; diff --git a/mobile/src/main/res/drawable/hand_tab_div.xml b/mobile/src/main/res/drawable/hand_tab_div.xml deleted file mode 100644 index fb8e136..0000000 --- a/mobile/src/main/res/drawable/hand_tab_div.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/mobile/src/main/res/menu/aboutmenu.xml b/mobile/src/main/res/menu/aboutmenu.xml index aba983f..06ba996 100644 --- a/mobile/src/main/res/menu/aboutmenu.xml +++ b/mobile/src/main/res/menu/aboutmenu.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/mobile/src/main/res/menu/handmenu.xml b/mobile/src/main/res/menu/handmenu.xml index 8c1a666..8295bf3 100644 --- a/mobile/src/main/res/menu/handmenu.xml +++ b/mobile/src/main/res/menu/handmenu.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/mobile/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml index 974ec00..47c8224 100644 --- a/mobile/src/main/res/values/dimens.xml +++ b/mobile/src/main/res/values/dimens.xml @@ -2,6 +2,4 @@ 16dp 16dp - - 4dp -- 2.50.1