Skip to content

Commit d0deae0

Browse files
AndreMirasAndreMiras
committed
Java code linting using PMD 6.23.0
- Avoid duplicate imports - Avoid importing anything from the package java.lang - Avoid unused imports - Avoid unused local variables - Avoid unused private fields - No need to import a type that lives in the same package - Unnecessary use of fully qualified name due to existing import In the future we may want to add a dedicated Java linting job in the CI.
1 parent 2604406 commit d0deae0

File tree

9 files changed

+10
-86
lines changed

9 files changed

+10
-86
lines changed

‎pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonUtil.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import android.util.Log;
66
import java.util.ArrayList;
7-
import java.io.FilenameFilter;
87
import java.util.regex.Pattern;
98

109

@@ -45,7 +44,6 @@ protected static ArrayList<String> getLibraries(File libsDir) {
4544
}
4645

4746
public static void loadLibraries(File filesDir, File libsDir) {
48-
String filesDirPath = filesDir.getAbsolutePath();
4947
boolean foundPython = false;
5048

5149
for (String lib : getLibraries(libsDir)) {
@@ -61,7 +59,7 @@ public static void loadLibraries(File filesDir, File libsDir) {
6159
// general error
6260
Log.v(TAG, "Library loading error: " + e.getMessage());
6361
if (lib.startsWith("python3.8") && !foundPython) {
64-
throw new java.lang.RuntimeException("Could not load any libpythonXXX.so");
62+
throw new RuntimeException("Could not load any libpythonXXX.so");
6563
} else if (lib.startsWith("python")) {
6664
continue;
6765
} else {

‎pythonforandroid/bootstraps/common/build/src/main/java/org/renpy/android/AssetExtract.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@
22
// spaces amount
33
package org.renpy.android;
44

5-
import java.io.*;
6-
75
import android.content.Context;
86
import android.util.Log;
97

108
import java.io.BufferedInputStream;
119
import java.io.BufferedOutputStream;
1210
import java.io.IOException;
1311
import java.io.InputStream;
14-
import java.io.FileInputStream;
12+
import java.io.OutputStream;
1513
import java.io.FileOutputStream;
14+
import java.io.FileNotFoundException;
1615
import java.io.File;
1716

1817
import java.util.zip.GZIPInputStream;
1918

2019
import android.content.res.AssetManager;
21-
22-
import org.kamranzafar.jtar.*;
20+
import org.kamranzafar.jtar.TarEntry;
21+
import org.kamranzafar.jtar.TarInputStream;
2322

2423
public class AssetExtract {
2524

@@ -49,7 +48,7 @@ public boolean extractTar(String asset, String target) {
4948

5049
try {
5150
entry = tis.getNextEntry();
52-
} catch ( java.io.IOException e ) {
51+
} catch ( IOException e ) {
5352
Log.e("python", "extracting tar", e);
5453
return false;
5554
}
@@ -95,7 +94,7 @@ public boolean extractTar(String asset, String target) {
9594

9695
out.flush();
9796
out.close();
98-
} catch ( java.io.IOException e ) {
97+
} catch ( IOException e ) {
9998
Log.e("python", "extracting zip", e);
10099
return false;
101100
}

‎pythonforandroid/bootstraps/common/build/src/main/java/org/renpy/android/Hardware.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
import android.hardware.SensorManager;
99
import android.util.DisplayMetrics;
1010
import android.view.inputmethod.InputMethodManager;
11-
import android.view.inputmethod.EditorInfo;
1211
import android.view.View;
1312

1413
import java.util.List;
15-
import java.util.ArrayList;
1614
import android.net.wifi.ScanResult;
1715
import android.net.wifi.WifiManager;
1816
import android.content.BroadcastReceiver;
@@ -223,9 +221,6 @@ public static String scanWifi() {
223221

224222
// Now you can call this and it should execute the broadcastReceiver's
225223
// onReceive()
226-
WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
227-
boolean a = wm.startScan();
228-
229224
if (latestResult != null){
230225

231226
String latestResultString = "";

‎pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.io.File;
99
import java.io.IOException;
1010
import java.lang.reflect.InvocationTargetException;
11-
import java.lang.UnsatisfiedLinkError;
1211
import java.util.ArrayList;
1312
import java.util.Collections;
1413
import java.util.Iterator;
@@ -21,26 +20,19 @@
2120
import android.content.Intent;
2221
import android.content.pm.ActivityInfo;
2322
import android.content.pm.PackageManager;
24-
import android.content.pm.ApplicationInfo;
2523
import android.graphics.Bitmap;
2624
import android.graphics.BitmapFactory;
2725
import android.graphics.Color;
2826
import android.graphics.PixelFormat;
29-
import android.Manifest;
3027
import android.os.AsyncTask;
3128
import android.os.Bundle;
3229
import android.os.PowerManager;
3330
import android.util.Log;
34-
import android.view.SurfaceHolder;
3531
import android.view.SurfaceView;
36-
import android.view.View;
3732
import android.view.ViewGroup;
38-
import android.view.Window;
39-
import android.view.WindowManager;
4033
import android.widget.ImageView;
4134
import android.widget.Toast;
4235

43-
import org.libsdl.app.SDL;
4436
import org.libsdl.app.SDLActivity;
4537

4638
import org.kivy.android.PythonUtil;
@@ -58,7 +50,6 @@ public class PythonActivity extends SDLActivity {
5850
private ResourceManager resourceManager = null;
5951
private Bundle mMetaData = null;
6052
private PowerManager.WakeLock mWakeLock = null;
61-
private static boolean appliedWindowedModeHack = false;
6253

6354
public String getAppRoot() {
6455
String app_root = getFilesDir().getAbsolutePath() + "/app";
@@ -393,7 +384,6 @@ public static void _do_start_service(
393384
) {
394385
Intent serviceIntent = new Intent(PythonActivity.mActivity, PythonService.class);
395386
String argument = PythonActivity.mActivity.getFilesDir().getAbsolutePath();
396-
String filesDirectory = argument;
397387
String app_root_dir = PythonActivity.mActivity.getAppRoot();
398388
String entry_point = PythonActivity.mActivity.getEntryPoint(app_root_dir + "/service");
399389
serviceIntent.putExtra("androidPrivate", argument);
@@ -646,7 +636,7 @@ public boolean checkCurrentPermission(String permission) {
646636

647637
try {
648638
java.lang.reflect.Method methodCheckPermission =
649-
Activity.class.getMethod("checkSelfPermission", java.lang.String.class);
639+
Activity.class.getMethod("checkSelfPermission", String.class);
650640
Object resultObj = methodCheckPermission.invoke(this, permission);
651641
int result = Integer.parseInt(resultObj.toString());
652642
if (result == PackageManager.PERMISSION_GRANTED)
@@ -666,7 +656,7 @@ public void requestPermissionsWithRequestCode(String[] permissions, int requestC
666656
try {
667657
java.lang.reflect.Method methodRequestPermission =
668658
Activity.class.getMethod("requestPermissions",
669-
java.lang.String[].class, int.class);
659+
String[].class, int.class);
670660
methodRequestPermission.invoke(this, permissions, requestCode);
671661
} catch (IllegalAccessException | NoSuchMethodException |
672662
InvocationTargetException e) {

‎pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import android.util.Log;
66
import java.util.ArrayList;
7-
import java.io.FilenameFilter;
87
import java.util.regex.Pattern;
98

109
public class PythonUtil {
@@ -49,7 +48,6 @@ protected static ArrayList<String> getLibraries(File libsDir) {
4948
}
5049

5150
public static void loadLibraries(File filesDir, File libsDir) {
52-
String filesDirPath = filesDir.getAbsolutePath();
5351
boolean foundPython = false;
5452

5553
for (String lib : getLibraries(libsDir)) {
@@ -65,7 +63,7 @@ public static void loadLibraries(File filesDir, File libsDir) {
6563
// general error
6664
Log.v(TAG, "Library loading error: " + e.getMessage());
6765
if (lib.startsWith("python3.8") && !foundPython) {
68-
throw new java.lang.RuntimeException("Could not load any libpythonXXX.so");
66+
throw new RuntimeException("Could not load any libpythonXXX.so");
6967
} else if (lib.startsWith("python")) {
7068
continue;
7169
} else {

‎pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/launcher/ProjectAdapter.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
11
package org.kivy.android.launcher;
22

33
import android.app.Activity;
4-
import android.content.Context;
54
import android.view.View;
65
import android.view.ViewGroup;
7-
import android.view.Gravity;
86
import android.widget.ArrayAdapter;
97
import android.widget.TextView;
10-
import android.widget.LinearLayout;
118
import android.widget.ImageView;
12-
import android.graphics.Bitmap;
13-
import android.graphics.BitmapFactory;
14-
import android.util.Log;
159

1610
import org.renpy.android.ResourceManager;
1711

1812
public class ProjectAdapter extends ArrayAdapter<Project> {
1913

20-
private Activity mContext;
2114
private ResourceManager resourceManager;
2215

2316
public ProjectAdapter(Activity context) {
2417
super(context, 0);
25-
26-
mContext = context;
2718
resourceManager = new ResourceManager(context);
2819
}
2920

‎pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/launcher/ProjectChooser.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package org.kivy.android.launcher;
22

33
import android.app.Activity;
4-
import android.os.Bundle;
54

65
import android.content.Intent;
7-
import android.content.res.Resources;
8-
import android.util.Log;
96
import android.view.View;
107
import android.widget.ListView;
118
import android.widget.TextView;
129
import android.widget.AdapterView;
1310
import android.os.Environment;
1411

1512
import java.io.File;
16-
import java.util.ArrayList;
1713
import java.util.Arrays;
1814
import android.net.Uri;
1915

‎pythonforandroid/bootstraps/service_only/build/src/main/java/org/kivy/android/PythonActivity.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,25 @@
11

22
package org.kivy.android;
33

4-
import java.net.Socket;
5-
import java.net.InetSocketAddress;
6-
74
import android.os.SystemClock;
85

96
import java.io.InputStream;
107
import java.io.FileInputStream;
118
import java.io.FileOutputStream;
12-
import java.io.FileWriter;
139
import java.io.File;
14-
import java.io.IOException;
1510
import java.util.Collections;
1611
import java.util.Iterator;
1712
import java.util.List;
1813
import java.util.ArrayList;
1914

20-
import android.app.*;
21-
import android.content.*;
22-
import android.view.*;
23-
import android.view.SurfaceView;
2415
import android.app.Activity;
2516
import android.content.Intent;
2617
import android.util.Log;
2718
import android.widget.Toast;
28-
import android.os.AsyncTask;
2919
import android.os.Bundle;
3020
import android.os.PowerManager;
31-
import android.graphics.PixelFormat;
32-
import android.view.SurfaceHolder;
3321
import android.content.Context;
34-
import android.content.pm.ActivityInfo;
3522
import android.content.pm.PackageManager;
36-
import android.content.pm.ApplicationInfo;
37-
import android.content.Intent;
38-
import android.widget.ImageView;
39-
import java.io.InputStream;
40-
import android.graphics.Bitmap;
41-
import android.graphics.BitmapFactory;
42-
import android.graphics.Color;
43-
44-
import android.widget.AbsoluteLayout;
45-
46-
import android.webkit.WebViewClient;
47-
import android.webkit.WebView;
48-
4923
import org.kivy.android.PythonUtil;
5024

5125
import org.renpy.android.ResourceManager;
@@ -408,7 +382,6 @@ public static void _do_start_service(
408382
) {
409383
Intent serviceIntent = new Intent(PythonActivity.mActivity, PythonService.class);
410384
String argument = PythonActivity.mActivity.getFilesDir().getAbsolutePath();
411-
String filesDirectory = argument;
412385
String app_root_dir = PythonActivity.mActivity.getAppRoot();
413386
String entry_point = PythonActivity.mActivity.getEntryPoint(app_root_dir + "/service");
414387
serviceIntent.putExtra("androidPrivate", argument);

‎pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/PythonActivity.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,28 @@
1-
21
package org.kivy.android;
32

4-
import java.net.Socket;
5-
import java.net.InetSocketAddress;
6-
73
import android.os.SystemClock;
84

95
import java.io.InputStream;
106
import java.io.FileInputStream;
117
import java.io.FileOutputStream;
12-
import java.io.FileWriter;
138
import java.io.File;
149
import java.io.IOException;
1510
import java.util.Collections;
1611
import java.util.Iterator;
1712
import java.util.List;
1813
import java.util.ArrayList;
1914

20-
import android.app.*;
21-
import android.content.*;
22-
import android.view.*;
2315
import android.view.ViewGroup;
24-
import android.view.SurfaceView;
2516
import android.app.Activity;
2617
import android.content.Intent;
2718
import android.util.Log;
2819
import android.widget.Toast;
2920
import android.os.AsyncTask;
3021
import android.os.Bundle;
3122
import android.os.PowerManager;
32-
import android.graphics.PixelFormat;
33-
import android.view.SurfaceHolder;
3423
import android.content.Context;
35-
import android.content.pm.ActivityInfo;
3624
import android.content.pm.PackageManager;
37-
import android.content.pm.ApplicationInfo;
38-
import android.content.Intent;
3925
import android.widget.ImageView;
40-
import java.io.InputStream;
4126
import android.graphics.Bitmap;
4227
import android.graphics.BitmapFactory;
4328
import android.graphics.Color;
@@ -536,7 +521,6 @@ public static void _do_start_service(
536521
) {
537522
Intent serviceIntent = new Intent(PythonActivity.mActivity, PythonService.class);
538523
String argument = PythonActivity.mActivity.getFilesDir().getAbsolutePath();
539-
String filesDirectory = argument;
540524
String app_root_dir = PythonActivity.mActivity.getAppRoot();
541525
String entry_point = PythonActivity.mActivity.getEntryPoint(app_root_dir + "/service");
542526
serviceIntent.putExtra("androidPrivate", argument);

0 commit comments

Comments
 (0)