Code cleanup

Author: gkalab

scidOnTheGo/src/main/java/org/scid/android/AddEngineActivity.java

@@ -40,37 +40,36 @@ public class AddEngineActivity extends AppCompatActivity {
 	private volatile String currentExecutable;
 	private volatile String currentPackage;
 	private volatile int currentVersion = 0;
-	private List<ChessEngine> openEngines = new ArrayList<ChessEngine>();
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		Set<String> ignoreExtensions = new HashSet<String>(
-				Arrays.asList(new String[] { ".sg4", ".sn4", ".si4", ".pgn",
-						".zip", ".xml" }));
+		Set<String> ignoreExtensions = new HashSet<>(
+				Arrays.asList(".sg4", ".sn4", ".si4", ".pgn",
+						".zip", ".xml"));
 
 		// Build set of engines. Add any additional engines from the external
 		// directory.
 		SortedSet<Engine> engines = Tools.findEnginesInDirectory(
 				Tools.getScidDirectory(), ignoreExtensions);
 
-		executablesList = new ArrayList<Engine>(engines);
+		executablesList = new ArrayList<>(engines);
 		addOpenExchangeFormatEngines();
 
 		setContentView(R.layout.add_engine);
 
-		ListView executablesListView = (ListView) findViewById(R.id.engine_list);
+		ListView executablesListView = findViewById(R.id.engine_list);
 		executablesListView
 				.setOnItemClickListener(new ExecutableClickListener());
-		executablesListView.setAdapter(new CheckableArrayAdapter<Engine>(this,
+		executablesListView.setAdapter(new CheckableArrayAdapter<>(this,
 				android.R.layout.simple_list_item_single_choice,
 				executablesList));
 	}
 
 	private void addOpenExchangeFormatEngines() {
 		ChessEngineResolver resolver = new ChessEngineResolver(this);
-		this.openEngines = resolver.resolveEngines();
+		List<ChessEngine> openEngines = resolver.resolveEngines();
 		for (ChessEngine engine : openEngines) {
 			if (!executablesList.contains(engine.getFileName())) {
 				executablesList.add(new Engine(engine.getName(), engine
@@ -108,8 +107,8 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
 	 */
 	private class CheckableArrayAdapter<T> extends ArrayAdapter<T> {
 
-		public CheckableArrayAdapter(Context context, int textViewResourceId,
-				List<T> objects) {
+		CheckableArrayAdapter(Context context, int textViewResourceId,
+							  List<T> objects) {
 			super(context, textViewResourceId, objects);
 		}
 
@@ -118,7 +117,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			View view = super.getView(position, convertView, parent);
 			Engine item = (Engine) this.getItem(position);
 			if (item != null) {
-				TextView textView = (TextView) view
+				TextView textView = view
 						.findViewById(android.R.id.text1);
 				if (textView != null) {
 					textView.setText(item.getName() != null ? item.getName()
@@ -139,14 +138,13 @@ public View getView(int position, View convertView, ViewGroup parent) {
 	private class ExecutableClickListener implements OnItemClickListener {
 
 		@Override
-		public void onItemClick(AdapterView<?> parent, View view, int position,
-				long id) {
+		public void onItemClick(AdapterView<?> parent, View view, int position,	long id) {
 			if (position != ListView.INVALID_POSITION) {
 				Engine engine = (Engine) parent.getItemAtPosition(position);
 				currentExecutable = engine.getFileName();
 				currentPackage = engine.getPackageName();
 				currentVersion = engine.getVersionCode();
-				EditText nameField = (EditText) findViewById(R.id.engine_name);
+				EditText nameField = findViewById(R.id.engine_name);
 				Editable nameEditable = nameField.getText();
 				if (nameEditable.length() == 0) {
 					// If a name is not yet specified, set it to the selected
@@ -191,7 +189,7 @@ public void onCancelClick(View view) {
 	public void onOkClick(View view) {
 		Intent data = getIntent();
 
-		EditText nameField = (EditText) findViewById(R.id.engine_name);
+		EditText nameField = findViewById(R.id.engine_name);
 		String name = nameField.getText().toString();
 
 		boolean makeCurrentEngine = ((Checkable) findViewById(R.id.make_current))

scidOnTheGo/src/main/java/org/scid/android/ChessBoard.java

@@ -76,7 +76,7 @@ public ChessBoard(Context context, AttributeSet attrs) {
 		blackPiecePaint = new Paint();
 		blackPiecePaint.setAntiAlias(true);
 
-		moveMarkPaint = new ArrayList<Paint>();
+		moveMarkPaint = new ArrayList<>();
 		for (int i = 0; i < 6; i++) {
 			Paint p = new Paint();
 			p.setStyle(Paint.Style.FILL);
@@ -120,25 +120,23 @@ final class AnimInfo {
 		int piece1, from1, to1, hide1;
 		int piece2, from2, to2, hide2;
 
-		public final boolean updateState() {
+		final boolean updateState() {
 			now = System.currentTimeMillis();
 			return animActive();
 		}
 
-		private final boolean animActive() {
-			if (paused || (startTime < 0) || (now >= stopTime)
-					|| (posHash != pos.zobristHash()))
-				return false;
-			return true;
+		private boolean animActive() {
+			return !paused && (startTime >= 0) && (now < stopTime)
+					&& (posHash == pos.zobristHash());
 		}
 
-		public final boolean squareHidden(int sq) {
+		final boolean squareHidden(int sq) {
 			if (!animActive())
 				return false;
 			return (sq == hide1) || (sq == hide2);
 		}
 
-		public final void draw(Canvas canvas) {
+		final void draw(Canvas canvas) {
 			if (!animActive())
 				return;
 			double animState = (now - startTime)
@@ -162,13 +160,13 @@ private void drawAnimPiece(Canvas canvas, int piece, int from, int to,
 				double animState) {
 			if (piece == Piece.EMPTY)
 				return;
-			final int xCrd1 = getXCrd(Position.getX(from));
-			final int yCrd1 = getYCrd(Position.getY(from));
-			final int xCrd2 = getXCrd(Position.getX(to));
-			final int yCrd2 = getYCrd(Position.getY(to));
-			final int xCrd = xCrd1
+			int xCrd1 = getXCrd(Position.getX(from));
+			int yCrd1 = getYCrd(Position.getY(from));
+			int xCrd2 = getXCrd(Position.getX(to));
+			int yCrd2 = getYCrd(Position.getY(to));
+			int xCrd = xCrd1
 					+ (int) Math.round((xCrd2 - xCrd1) * animState);
-			final int yCrd = yCrd1
+			int yCrd = yCrd1
 					+ (int) Math.round((yCrd2 - yCrd1) * animState);
 			drawPiece(canvas, xCrd, yCrd, piece);
 		}
@@ -269,21 +267,16 @@ public void setAnimMove(Position sourcePos, Move move, boolean forward, double s
 	/**
 	 * Set the board to a given state.
 	 *
-	 * @param pos
+	 * @param pos the position to set
 	 */
 	final public void setPosition(Position pos) {
-		boolean doInvalidate = false;
 		if (anim.paused = true) {
 			anim.paused = false;
-			doInvalidate = true;
 		}
 		if (!this.pos.equals(pos)) {
 			this.pos = new Position(pos);
-			doInvalidate = true;
-		}
-		if (doInvalidate) {
-			invalidate();
 		}
+		invalidate();
 	}
 
 	/**
@@ -370,16 +363,16 @@ protected void onDraw(Canvas canvas) {
         if (isInEditMode())
             return;
 		boolean animActive = anim.updateState();
-		final int width = getWidth();
-		final int height = getHeight();
+		int width = getWidth();
+		int height = getHeight();
 		sqSize = Math.min(getSqSizeW(width), getSqSizeH(height));
 		blackPiecePaint.setTextSize(sqSize);
 		whitePiecePaint.setTextSize(sqSize);
 		computeOrigin(width, height);
 		for (int x = 0; x < 8; x++) {
 			for (int y = 0; y < 8; y++) {
-				final int xCrd = getXCrd(x);
-				final int yCrd = getYCrd(y);
+				int xCrd = getXCrd(x);
+				int yCrd = getYCrd(y);
 				Paint paint = Position.darkSquare(x, y) ? darkPaint
 						: brightPaint;
 				canvas
@@ -428,7 +421,7 @@ protected void onDraw(Canvas canvas) {
 		anim.draw(canvas);
 	}
 
-	private final void drawMoveHints(Canvas canvas) {
+	private void drawMoveHints(Canvas canvas) {
 		if (moveHints == null)
 			return;
 		float h = (float) (sqSize / 2.0);
@@ -553,7 +546,7 @@ public int eventToSquare(MotionEvent evt) {
 		return sq;
 	}
 
-	final private boolean myColor(int piece) {
+	private boolean myColor(int piece) {
         return (piece != Piece.EMPTY) && (Piece.isWhite(piece) == pos.whiteMove);
 	}
 
@@ -632,8 +625,7 @@ public boolean onTrackballEvent(MotionEvent event) {
     protected int getSquare(int x, int y) { return Position.getSquare(x, y); }
 
 	public final Move handleTrackballEvent(MotionEvent event) {
-		switch (event.getAction()) {
-		case MotionEvent.ACTION_DOWN:
+		if (event.getAction() == MotionEvent.ACTION_DOWN) {
 			invalidate();
 			if (cursorVisible) {
 				int x = Math.round(cursorX);
@@ -658,7 +650,7 @@ public final Move handleTrackballEvent(MotionEvent event) {
 	}
 
 	public final void setMoveHints(List<Move> moveHints) {
-		boolean equal = false;
+		boolean equal;
 		if ((this.moveHints == null) || (moveHints == null)) {
 			equal = this.moveHints == moveHints;
 		} else {