Skip to content

Commit 66a3e9e

Browse files
gkalabgkalab
committed
Code cleanup
1 parent ac1f5c2 commit 66a3e9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+507
-752
lines changed

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,36 @@ public class AddEngineActivity extends AppCompatActivity {
4040
private volatile String currentExecutable;
4141
private volatile String currentPackage;
4242
private volatile int currentVersion = 0;
43-
private List<ChessEngine> openEngines = new ArrayList<ChessEngine>();
4443

4544
@Override
4645
public void onCreate(Bundle savedInstanceState) {
4746
super.onCreate(savedInstanceState);
4847

49-
Set<String> ignoreExtensions = new HashSet<String>(
50-
Arrays.asList(new String[] { ".sg4", ".sn4", ".si4", ".pgn",
51-
".zip", ".xml" }));
48+
Set<String> ignoreExtensions = new HashSet<>(
49+
Arrays.asList(".sg4", ".sn4", ".si4", ".pgn",
50+
".zip", ".xml"));
5251

5352
// Build set of engines. Add any additional engines from the external
5453
// directory.
5554
SortedSet<Engine> engines = Tools.findEnginesInDirectory(
5655
Tools.getScidDirectory(), ignoreExtensions);
5756

58-
executablesList = new ArrayList<Engine>(engines);
57+
executablesList = new ArrayList<>(engines);
5958
addOpenExchangeFormatEngines();
6059

6160
setContentView(R.layout.add_engine);
6261

63-
ListView executablesListView = (ListView) findViewById(R.id.engine_list);
62+
ListView executablesListView = findViewById(R.id.engine_list);
6463
executablesListView
6564
.setOnItemClickListener(new ExecutableClickListener());
66-
executablesListView.setAdapter(new CheckableArrayAdapter<Engine>(this,
65+
executablesListView.setAdapter(new CheckableArrayAdapter<>(this,
6766
android.R.layout.simple_list_item_single_choice,
6867
executablesList));
6968
}
7069

7170
private void addOpenExchangeFormatEngines() {
7271
ChessEngineResolver resolver = new ChessEngineResolver(this);
73-
this.openEngines = resolver.resolveEngines();
72+
List<ChessEngine> openEngines = resolver.resolveEngines();
7473
for (ChessEngine engine : openEngines) {
7574
if (!executablesList.contains(engine.getFileName())) {
7675
executablesList.add(new Engine(engine.getName(), engine
@@ -108,8 +107,8 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
108107
*/
109108
private class CheckableArrayAdapter<T> extends ArrayAdapter<T> {
110109

111-
public CheckableArrayAdapter(Context context, int textViewResourceId,
112-
List<T> objects) {
110+
CheckableArrayAdapter(Context context, int textViewResourceId,
111+
List<T> objects) {
113112
super(context, textViewResourceId, objects);
114113
}
115114

@@ -118,7 +117,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
118117
View view = super.getView(position, convertView, parent);
119118
Engine item = (Engine) this.getItem(position);
120119
if (item != null) {
121-
TextView textView = (TextView) view
120+
TextView textView = view
122121
.findViewById(android.R.id.text1);
123122
if (textView != null) {
124123
textView.setText(item.getName() != null ? item.getName()
@@ -139,14 +138,13 @@ public View getView(int position, View convertView, ViewGroup parent) {
139138
private class ExecutableClickListener implements OnItemClickListener {
140139

141140
@Override
142-
public void onItemClick(AdapterView<?> parent, View view, int position,
143-
long id) {
141+
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
144142
if (position != ListView.INVALID_POSITION) {
145143
Engine engine = (Engine) parent.getItemAtPosition(position);
146144
currentExecutable = engine.getFileName();
147145
currentPackage = engine.getPackageName();
148146
currentVersion = engine.getVersionCode();
149-
EditText nameField = (EditText) findViewById(R.id.engine_name);
147+
EditText nameField = findViewById(R.id.engine_name);
150148
Editable nameEditable = nameField.getText();
151149
if (nameEditable.length() == 0) {
152150
// If a name is not yet specified, set it to the selected
@@ -191,7 +189,7 @@ public void onCancelClick(View view) {
191189
public void onOkClick(View view) {
192190
Intent data = getIntent();
193191

194-
EditText nameField = (EditText) findViewById(R.id.engine_name);
192+
EditText nameField = findViewById(R.id.engine_name);
195193
String name = nameField.getText().toString();
196194

197195
boolean makeCurrentEngine = ((Checkable) findViewById(R.id.make_current))

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

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public ChessBoard(Context context, AttributeSet attrs) {
7676
blackPiecePaint = new Paint();
7777
blackPiecePaint.setAntiAlias(true);
7878

79-
moveMarkPaint = new ArrayList<Paint>();
79+
moveMarkPaint = new ArrayList<>();
8080
for (int i = 0; i < 6; i++) {
8181
Paint p = new Paint();
8282
p.setStyle(Paint.Style.FILL);
@@ -120,25 +120,23 @@ final class AnimInfo {
120120
int piece1, from1, to1, hide1;
121121
int piece2, from2, to2, hide2;
122122

123-
public final boolean updateState() {
123+
final boolean updateState() {
124124
now = System.currentTimeMillis();
125125
return animActive();
126126
}
127127

128-
private final boolean animActive() {
129-
if (paused || (startTime < 0) || (now >= stopTime)
130-
|| (posHash != pos.zobristHash()))
131-
return false;
132-
return true;
128+
private boolean animActive() {
129+
return !paused && (startTime >= 0) && (now < stopTime)
130+
&& (posHash == pos.zobristHash());
133131
}
134132

135-
public final boolean squareHidden(int sq) {
133+
final boolean squareHidden(int sq) {
136134
if (!animActive())
137135
return false;
138136
return (sq == hide1) || (sq == hide2);
139137
}
140138

141-
public final void draw(Canvas canvas) {
139+
final void draw(Canvas canvas) {
142140
if (!animActive())
143141
return;
144142
double animState = (now - startTime)
@@ -162,13 +160,13 @@ private void drawAnimPiece(Canvas canvas, int piece, int from, int to,
162160
double animState) {
163161
if (piece == Piece.EMPTY)
164162
return;
165-
final int xCrd1 = getXCrd(Position.getX(from));
166-
final int yCrd1 = getYCrd(Position.getY(from));
167-
final int xCrd2 = getXCrd(Position.getX(to));
168-
final int yCrd2 = getYCrd(Position.getY(to));
169-
final int xCrd = xCrd1
163+
int xCrd1 = getXCrd(Position.getX(from));
164+
int yCrd1 = getYCrd(Position.getY(from));
165+
int xCrd2 = getXCrd(Position.getX(to));
166+
int yCrd2 = getYCrd(Position.getY(to));
167+
int xCrd = xCrd1
170168
+ (int) Math.round((xCrd2 - xCrd1) * animState);
171-
final int yCrd = yCrd1
169+
int yCrd = yCrd1
172170
+ (int) Math.round((yCrd2 - yCrd1) * animState);
173171
drawPiece(canvas, xCrd, yCrd, piece);
174172
}
@@ -269,21 +267,16 @@ public void setAnimMove(Position sourcePos, Move move, boolean forward, double s
269267
/**
270268
* Set the board to a given state.
271269
*
272-
* @param pos
270+
* @param pos the position to set
273271
*/
274272
final public void setPosition(Position pos) {
275-
boolean doInvalidate = false;
276273
if (anim.paused = true) {
277274
anim.paused = false;
278-
doInvalidate = true;
279275
}
280276
if (!this.pos.equals(pos)) {
281277
this.pos = new Position(pos);
282-
doInvalidate = true;
283-
}
284-
if (doInvalidate) {
285-
invalidate();
286278
}
279+
invalidate();
287280
}
288281

289282
/**
@@ -370,16 +363,16 @@ protected void onDraw(Canvas canvas) {
370363
if (isInEditMode())
371364
return;
372365
boolean animActive = anim.updateState();
373-
final int width = getWidth();
374-
final int height = getHeight();
366+
int width = getWidth();
367+
int height = getHeight();
375368
sqSize = Math.min(getSqSizeW(width), getSqSizeH(height));
376369
blackPiecePaint.setTextSize(sqSize);
377370
whitePiecePaint.setTextSize(sqSize);
378371
computeOrigin(width, height);
379372
for (int x = 0; x < 8; x++) {
380373
for (int y = 0; y < 8; y++) {
381-
final int xCrd = getXCrd(x);
382-
final int yCrd = getYCrd(y);
374+
int xCrd = getXCrd(x);
375+
int yCrd = getYCrd(y);
383376
Paint paint = Position.darkSquare(x, y) ? darkPaint
384377
: brightPaint;
385378
canvas
@@ -428,7 +421,7 @@ protected void onDraw(Canvas canvas) {
428421
anim.draw(canvas);
429422
}
430423

431-
private final void drawMoveHints(Canvas canvas) {
424+
private void drawMoveHints(Canvas canvas) {
432425
if (moveHints == null)
433426
return;
434427
float h = (float) (sqSize / 2.0);
@@ -553,7 +546,7 @@ public int eventToSquare(MotionEvent evt) {
553546
return sq;
554547
}
555548

556-
final private boolean myColor(int piece) {
549+
private boolean myColor(int piece) {
557550
return (piece != Piece.EMPTY) && (Piece.isWhite(piece) == pos.whiteMove);
558551
}
559552

@@ -632,8 +625,7 @@ public boolean onTrackballEvent(MotionEvent event) {
632625
protected int getSquare(int x, int y) { return Position.getSquare(x, y); }
633626

634627
public final Move handleTrackballEvent(MotionEvent event) {
635-
switch (event.getAction()) {
636-
case MotionEvent.ACTION_DOWN:
628+
if (event.getAction() == MotionEvent.ACTION_DOWN) {
637629
invalidate();
638630
if (cursorVisible) {
639631
int x = Math.round(cursorX);
@@ -658,7 +650,7 @@ public final Move handleTrackballEvent(MotionEvent event) {
658650
}
659651

660652
public final void setMoveHints(List<Move> moveHints) {
661-
boolean equal = false;
653+
boolean equal;
662654
if ((this.moveHints == null) || (moveHints == null)) {
663655
equal = this.moveHints == moveHints;
664656
} else {

‎scidOnTheGo/src/main/java/org/scid/android/ColorTheme.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import android.content.SharedPreferences.Editor;
55
import android.graphics.Color;
66

7-
public class ColorTheme {
7+
class ColorTheme {
88
private static ColorTheme inst = null;
99

1010
/** Get singleton instance. */
11-
static final ColorTheme instance() {
11+
static ColorTheme instance() {
1212
if (inst == null)
1313
inst = new ColorTheme();
1414
return inst;
@@ -29,27 +29,27 @@ static final ColorTheme instance() {
2929
final static int ARROW_5 = 12;
3030
private final static int numColors = 13;
3131

32-
private int colorTable[] = new int[numColors];
32+
private int[] colorTable = new int[numColors];
3333

3434
private static final String[] prefNames = { "darkSquare", "brightSquare",
3535
"selectedSquare", "cursorSquare", "darkPiece", "brightPiece",
3636
"currentMove", "arrow0", "arrow1", "arrow2", "arrow3", "arrow4",
3737
"arrow5" };
3838
private static final String prefPrefix = "colors_";
3939

40-
private final static String themeColors[][] = {
41-
{ "#FF80A0A0", "#FFD0E0D0", "#FFFF0000", "#FF00FF00", "#FF000000",
40+
private final static String[][] themeColors = {
41+
{"#FF80A0A0", "#FFD0E0D0", "#FFFF0000", "#FF00FF00", "#FF000000",
4242
"#FFFFFFFF", "#FFAFC4D4", "#A01F1FFF", "#A0FF1F1F",
43-
"#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F" },
44-
{ "#B58863", "#F0D9B5", "#FFFF0000", "#FF00FF00", "#FF000000",
43+
"#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F"},
44+
{"#B58863", "#F0D9B5", "#FFFF0000", "#FF00FF00", "#FF000000",
4545
"#FFFFFFFF", "#FFAFC4D4", "#A01F1FFF", "#A0FF1F1F",
46-
"#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F" },
47-
{ "#FF83A5D2", "#FFFFFFFA", "#FF3232D1", "#FF5F5FFD", "#FF282828",
46+
"#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F"},
47+
{"#FF83A5D2", "#FFFFFFFA", "#FF3232D1", "#FF5F5FFD", "#FF282828",
4848
"#FFF0F0F0", "#FFAFC4D4", "#A01F1FFF", "#A01FFF1F",
49-
"#501F1FFF", "#501FFF1F", "#1E1F1FFF", "#281FFF1F" },
50-
{ "#FF769656", "#FFEEEED2", "#FFFF0000", "#FF0000FF", "#FF000000",
49+
"#501F1FFF", "#501FFF1F", "#1E1F1FFF", "#281FFF1F"},
50+
{"#FF769656", "#FFEEEED2", "#FFFF0000", "#FF0000FF", "#FF000000",
5151
"#FFFFFFFF", "#FFAFC4D4", "#A01F1FFF", "#A0FF1F1F",
52-
"#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F" } };
52+
"#501F1FFF", "#50FF1F1F", "#1E1F1FFF", "#28FF1F1F"}};
5353

5454
final void readColors(SharedPreferences preferences) {
5555
for (int i = 0; i < numColors; i++) {

‎scidOnTheGo/src/main/java/org/scid/android/Constants.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.scid.android;
22

33
public class Constants {
4-
5-
public static final String SCID_DIRECTORY = "scid";
6-
4+
static final String SCID_DIRECTORY = "scid";
75
}

‎scidOnTheGo/src/main/java/org/scid/android/DownloadTask.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
import android.os.AsyncTask;
77

88
public class DownloadTask extends AsyncTask {
9-
private String path;
109
private IDownloadCallback callback;
1110

1211
@Override
1312
protected Object doInBackground(Object... params) {
1413
File result = null;
1514
this.callback = (IDownloadCallback) params[0];
16-
this.path = (String) params[1];
15+
String path = (String) params[1];
1716
try {
1817
result = Tools.downloadFile(path);
1918
} catch (IOException e) {

0 commit comments

Comments
 (0)