code cleanup

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sun Nov 04 09:22:04 EST 2018
+#Sun Nov 04 11:32:14 EST 2018
 version_minor=0
-version_build=10
+version_build=11
 version_patch=1
-version_major=2
 version_store=42
+version_major=2

app/src/main/java/com/vrem/wifianalyzer/ActivityUtils.java

@@ -27,12 +27,12 @@
 
 import com.vrem.wifianalyzer.settings.Settings;
 
-public class ActivityUtils {
+class ActivityUtils {
     private ActivityUtils() {
         throw new IllegalStateException("Utility class");
     }
 
-    public static void setActionBarOptions(ActionBar actionBar) {
+    static void setActionBarOptions(ActionBar actionBar) {
         if (actionBar == null) {
             return;
         }

app/src/main/java/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphFragment.java

@@ -56,7 +56,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
     private void addGraphViews(View view, ChannelGraphAdapter channelGraphAdapter) {
         IterableUtils.forEach(channelGraphAdapter.getGraphViews(),
-            new GraphViewAdd((ViewGroup) view.findViewById(R.id.graphFlipper)));
+            new GraphViewAdd(view.findViewById(R.id.graphFlipper)));
     }
 
     private void refresh() {

app/src/main/java/com/vrem/wifianalyzer/wifi/model/WiFiData.java

@@ -35,7 +35,7 @@
 import java.util.List;
 
 public class WiFiData {
-    public static final WiFiData EMPTY = new WiFiData(Collections.<WiFiDetail>emptyList(), WiFiConnection.EMPTY, Collections.<String>emptyList());
+    public static final WiFiData EMPTY = new WiFiData(Collections.emptyList(), WiFiConnection.EMPTY, Collections.emptyList());
 
     private final List<WiFiDetail> wiFiDetails;
     private final WiFiConnection wiFiConnection;

app/src/main/java/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphFragment.java

@@ -53,7 +53,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
     private void addGraphViews(View view, TimeGraphAdapter timeGraphAdapter) {
         IterableUtils.forEach(timeGraphAdapter.getGraphViews(),
-            new GraphViewAdd((ViewGroup) view.findViewById(R.id.graphFlipper)));
+            new GraphViewAdd(view.findViewById(R.id.graphFlipper)));
     }
 
     private void refresh() {

app/src/test/java/com/vrem/util/EnumUtilsTest.java

@@ -90,7 +90,7 @@ public void testFindUsingOrdinalsWithEmptyInput() {
         // setup
         Set<TestObject> expected = EnumUtils.values(TestObject.class);
         // execute
-        Set<TestObject> actual = EnumUtils.find(TestObject.class, Collections.<String>emptySet(), TestObject.VALUE2);
+        Set<TestObject> actual = EnumUtils.find(TestObject.class, Collections.emptySet(), TestObject.VALUE2);
         // validate
         validate(expected, actual);
     }

app/src/test/java/com/vrem/wifianalyzer/ActivityUtilsTest.java

@@ -18,7 +18,6 @@
 
 package com.vrem.wifianalyzer;
 
-import android.content.Context;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.Window;
@@ -54,10 +53,6 @@ public class ActivityUtilsTest {
     private Window window;
     @Mock
     private ActionBar actionBar;
-    @Mock
-    private Context context;
-    @Mock
-    private Context newContext;
 
     private Settings settings;
 

app/src/test/java/com/vrem/wifianalyzer/navigation/items/ExportItemTest.java

@@ -149,7 +149,7 @@ public void testGetVisibility() {
 
     @NonNull
     private WiFiData withWiFiData() {
-        return new WiFiData(Collections.singletonList(wiFiDetail), WiFiConnection.EMPTY, Collections.<String>emptyList());
+        return new WiFiData(Collections.singletonList(wiFiDetail), WiFiConnection.EMPTY, Collections.emptyList());
     }
 
     private void verifySendIntentInformation(String sendData) {

app/src/test/java/com/vrem/wifianalyzer/navigation/items/FragmentItemTest.java

@@ -27,7 +27,6 @@
 import com.vrem.wifianalyzer.MainActivity;
 import com.vrem.wifianalyzer.R;
 import com.vrem.wifianalyzer.navigation.NavigationMenu;
-import com.vrem.wifianalyzer.navigation.NavigationMenuView;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,8 +50,6 @@ public class FragmentItemTest {
     @Mock
     private MenuItem menuItem;
     @Mock
-    private NavigationMenuView navigationMenuView;
-    @Mock
     private FragmentManager fragmentManager;
     @Mock
     private FragmentTransaction fragmentTransaction;

app/src/test/java/com/vrem/wifianalyzer/navigation/options/FilterActionTest.java

@@ -18,7 +18,6 @@
 
 package com.vrem.wifianalyzer.navigation.options;
 
-import com.vrem.wifianalyzer.MainActivity;
 import com.vrem.wifianalyzer.RobolectricUtil;
 
 import org.junit.Before;
@@ -33,8 +32,7 @@ public class FilterActionTest {
 
     @Before
     public void setUp() {
-        MainActivity mainActivity = RobolectricUtil.INSTANCE.getActivity();
-
+        RobolectricUtil.INSTANCE.getActivity();
         fixture = new FilterAction();
     }