SonarQube code smells corrections

This commit is contained in:
2018-06-28 19:20:51 +02:00
parent 3261c060bc
commit 68d5f91707
7 changed files with 27 additions and 23 deletions

View File

@@ -23,6 +23,8 @@ import com.wismna.geoffroy.donext.fragments.TaskFormDialogFragment;
import com.wismna.geoffroy.donext.fragments.TaskListsDialogFragment;
import com.wismna.geoffroy.donext.fragments.TasksFragment;
import java.util.Objects;
/**
* Main Activity class
*/
@@ -80,13 +82,13 @@ public class MainActivity extends AppCompatActivity {
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor editor = sharedPref.edit();
String layoutTypeString = sharedPref.getString("pref_conf_task_layout", "1");
int layoutType = Integer.valueOf(layoutTypeString);
int layoutType = Integer.parseInt(layoutTypeString);
editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1));
editor.apply();
// Update the ViewPagerAdapter to refresh all tabs
ViewPager viewPager = getMainFragmentViewPager();
viewPager.getAdapter().notifyDataSetChanged();
Objects.requireNonNull(viewPager.getAdapter()).notifyDataSetChanged();
}
/** Called when the user clicks the Edit Lists button */

View File

@@ -75,7 +75,7 @@ public class TodayActivity extends ToolBarActivityBase
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
SharedPreferences.Editor editor = sharedPref.edit();
String layoutTypeString = sharedPref.getString("pref_conf_task_layout", "1");
int layoutType = Integer.valueOf(layoutTypeString);
int layoutType = Integer.parseInt(layoutTypeString);
editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1));
editor.apply();

View File

@@ -21,7 +21,7 @@ import java.util.List;
* {@link RecyclerView.Adapter} that can display a {@link TaskList}.
*/
public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRecyclerViewAdapter.ViewHolder>
public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRecyclerViewAdapter.TaskViewHolder>
implements TaskListTouchHelper.TaskListTouchHelperAdapter {
public interface TaskListRecyclerViewAdapterListener {
@@ -41,14 +41,14 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public TaskViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.fragment_tasklist, parent, false);
return new ViewHolder(view);
return new TaskViewHolder(view);
}
@Override
public void onBindViewHolder(final ViewHolder holder, int position) {
public void onBindViewHolder(final TaskViewHolder holder, int position) {
holder.mItem = mValues.get(position);
holder.mTaskCountView.setText(String.valueOf(mValues.get(position).getTaskCount()));
holder.mTaskNameView.setText(mValues.get(position).getName());
@@ -134,7 +134,7 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
return true;
}
class ViewHolder extends RecyclerView.ViewHolder {
class TaskViewHolder extends RecyclerView.ViewHolder {
final View mView;
final ImageView handleView;
final TextView mTaskCountView;
@@ -142,7 +142,7 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
final Button mTaskDeleteButton;
TaskList mItem;
ViewHolder(View view) {
TaskViewHolder(View view) {
super(view);
mView = view;
handleView = itemView.findViewById(R.id.handle);

View File

@@ -2,6 +2,7 @@ package com.wismna.geoffroy.donext.adapters;
import android.graphics.Color;
import android.graphics.Typeface;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@@ -32,25 +33,25 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter<TaskRecyclerVi
this.viewType = viewType;
}
@NonNull
@Override
public SimpleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view;
switch (viewType)
{
case 1:
view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.fragment_task_simple, parent, false);
return new SimpleViewHolder(view);
case 2:
view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.fragment_task_detailed, parent, false);
return new DetailedViewHolder(view);
default:
view = LayoutInflater.from(parent.getContext())
.inflate(R.layout.fragment_task_simple, parent, false);
return new SimpleViewHolder(view);
}
return null;
}
@Override
public void onBindViewHolder(final SimpleViewHolder holder, int position) {
public void onBindViewHolder(@NonNull final SimpleViewHolder holder, int position) {
// Set basic information
holder.mItem = mValues.get(position);
holder.mIdView.setText(String.valueOf(holder.mItem.getId()));
@@ -84,6 +85,9 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter<TaskRecyclerVi
case 2:
holder.mTitleView.setTypeface(holder.mTitleView.getTypeface(), Typeface.BOLD);
break;
default:
// No special styles to apply
break;
}
}

View File

@@ -25,7 +25,7 @@ public class TaskDataAccess implements AutoCloseable {
private SQLiteDatabase database;
private final DatabaseHelper dbHelper;
private final String[] taskColumns = {
private final static String[] taskColumns = {
DatabaseHelper.COLUMN_ID, DatabaseHelper.TASKS_COLUMN_NAME,
DatabaseHelper.TASKS_COLUMN_DESC, DatabaseHelper.TASKS_COLUMN_PRIORITY,
DatabaseHelper.TASKS_COLUMN_CYCLE, DatabaseHelper.TASKS_COLUMN_DONE,
@@ -40,7 +40,7 @@ public class TaskDataAccess implements AutoCloseable {
open(writeMode);
}
private void open(MODE writeMode) throws SQLException {
private void open(MODE writeMode) {
if (writeMode == MODE.WRITE) database = dbHelper.getWritableDatabase();
else database = dbHelper.getReadableDatabase();
}

View File

@@ -23,7 +23,7 @@ public class TaskListDataAccess implements AutoCloseable {
// Database fields
private SQLiteDatabase database;
private final DatabaseHelper dbHelper;
private final String[] taskListColumns =
private final static String[] taskListColumns =
{DatabaseHelper.COLUMN_ID, DatabaseHelper.TASKLIST_COLUMN_NAME,
DatabaseHelper.COLUMN_ORDER, DatabaseHelper.TASKLIST_COLUMN_VISIBLE};
@@ -35,7 +35,7 @@ public class TaskListDataAccess implements AutoCloseable {
open(writeMode);
}
public void open(MODE writeMode) throws SQLException {
public void open(MODE writeMode) {
if (writeMode == MODE.WRITE) database = dbHelper.getWritableDatabase();
else database = dbHelper.getReadableDatabase();
}

View File

@@ -22,11 +22,9 @@ public class ConfirmDialogFragment extends DialogFragment {
NO
}
private ConfirmDialogListener confirmDialogListener;
//private String message;
public static ConfirmDialogFragment newInstance(/*String message, */ConfirmDialogListener confirmDialogListener) {
public static ConfirmDialogFragment newInstance(ConfirmDialogListener confirmDialogListener) {
ConfirmDialogFragment fragment = new ConfirmDialogFragment();
//fragment.message = message;
fragment.confirmDialogListener = confirmDialogListener;
fragment.setRetainInstance(true);
return fragment;