From baba59f37683bf7e90e8042fa7c1b02206336a8e Mon Sep 17 00:00:00 2001
From: George Kankava <george.kankava@devfactory.com>
Date: Mon, 7 Mar 2016 15:06:15 +0400
Subject: [PATCH] Multiple code improvements - squid:UselessParenthesesCheck ,
 squid:SwitchLastCaseIsDefaultCheck, squid:S1444

---
 .../java/com/jigdraw/draw/activity/BaseJigsawActivity.java  | 2 ++
 .../main/java/com/jigdraw/draw/activity/DrawActivity.java   | 2 +-
 app/src/main/java/com/jigdraw/draw/util/DBUtil.java         | 2 +-
 .../main/java/com/jigdraw/draw/views/JigsawGridView.java    | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/jigdraw/draw/activity/BaseJigsawActivity.java b/app/src/main/java/com/jigdraw/draw/activity/BaseJigsawActivity.java
index 562a2a3..4be8446 100644
--- a/app/src/main/java/com/jigdraw/draw/activity/BaseJigsawActivity.java
+++ b/app/src/main/java/com/jigdraw/draw/activity/BaseJigsawActivity.java
@@ -48,6 +48,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 startActivity(new Intent(getApplicationContext(),
                         JigsawHistoryActivity.class));
                 return true;
+            default:
+                break;
         }
         return false;
     }
diff --git a/app/src/main/java/com/jigdraw/draw/activity/DrawActivity.java b/app/src/main/java/com/jigdraw/draw/activity/DrawActivity.java
index 5079a91..ad6dfaf 100644
--- a/app/src/main/java/com/jigdraw/draw/activity/DrawActivity.java
+++ b/app/src/main/java/com/jigdraw/draw/activity/DrawActivity.java
@@ -169,7 +169,7 @@ private void openNewDrawingDialog() {
                 .title(R.string.action_new_drawing)
                 .positiveText(R.string.action_ok)
                 .negativeText(R.string.action_cancel)
-                .content((R.string.action_new_q))
+                .content(R.string.action_new_q)
                 .show();
     }
 
diff --git a/app/src/main/java/com/jigdraw/draw/util/DBUtil.java b/app/src/main/java/com/jigdraw/draw/util/DBUtil.java
index 449de5e..745e606 100644
--- a/app/src/main/java/com/jigdraw/draw/util/DBUtil.java
+++ b/app/src/main/java/com/jigdraw/draw/util/DBUtil.java
@@ -53,7 +53,7 @@ public class DBUtil {
     public static final String ORIGINAL_SELECTION_NULL = "original is null";
 
     /** all columns selection */
-    public static String[] ALL_COLUMNS = new String[]{ID_COLUMN, NAME_COLUMN,
+    public final static String[] ALL_COLUMNS = new String[]{ID_COLUMN, NAME_COLUMN,
             IMAGE_COLUMN, DESC_COLUMN, ORIGINAL_COLUMN};
 
     /** arguments to set for the prepared statements */
diff --git a/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java b/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
index e0e3a08..81549e6 100644
--- a/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
+++ b/app/src/main/java/com/jigdraw/draw/views/JigsawGridView.java
@@ -389,7 +389,7 @@ public int getPositionForID(long itemId) {
     }
 
     private OrderableAdapter getAdapterInterface() {
-        return ((OrderableAdapter) getAdapter());
+        return (OrderableAdapter) getAdapter();
     }
 
     private long getId(int position) {
@@ -578,7 +578,7 @@ private void handleCellSwitch() {
             View view = getViewForId(id);
             if (view != null) {
                 Point targetColumnRowPair = getColumnAndRowForView(view);
-                if ((aboveRight(targetColumnRowPair, mobileColumnRowPair)
+                if (aboveRight(targetColumnRowPair, mobileColumnRowPair)
                         && deltaYTotal < view.getBottom()
                         && deltaXTotal > view.getLeft()
                         || aboveLeft(targetColumnRowPair, mobileColumnRowPair)
@@ -601,7 +601,7 @@ private void handleCellSwitch() {
                         + mOverlapIfSwitchStraightLine || left(
                         targetColumnRowPair, mobileColumnRowPair)
                         && deltaXTotal < view.getRight()
-                        - mOverlapIfSwitchStraightLine)) {
+                        - mOverlapIfSwitchStraightLine) {
                     float xDiff = Math.abs(GridUtil.getViewX(view)
                             - GridUtil.getViewX(mMobileView));
                     float yDiff = Math.abs(GridUtil.getViewY(view)