From 63834a362d2ce94f98322554c46945262340eb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Thu, 5 Dec 2024 18:25:32 +0900 Subject: [PATCH] refactor: java 7 migration aid - replace explicit type with <> --- framework/src/org/apache/cordova/AllowList.java | 2 +- framework/src/org/apache/cordova/CallbackMap.java | 4 ++-- framework/src/org/apache/cordova/ConfigXmlParser.java | 2 +- framework/src/org/apache/cordova/CordovaPreferences.java | 2 +- framework/src/org/apache/cordova/CordovaWebViewImpl.java | 4 ++-- framework/src/org/apache/cordova/CoreAndroid.java | 2 +- .../src/org/apache/cordova/NativeToJsMessageQueue.java | 4 ++-- framework/src/org/apache/cordova/PluginManager.java | 6 +++--- framework/src/org/apache/cordova/ResumeCallback.java | 2 +- .../org/apache/cordova/engine/SystemWebChromeClient.java | 2 +- .../src/org/apache/cordova/engine/SystemWebViewClient.java | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/framework/src/org/apache/cordova/AllowList.java b/framework/src/org/apache/cordova/AllowList.java index 55cb9d01..27e3f533 100644 --- a/framework/src/org/apache/cordova/AllowList.java +++ b/framework/src/org/apache/cordova/AllowList.java @@ -97,7 +97,7 @@ public class AllowList { public static final String TAG = "CordovaAllowList"; public AllowList() { - this.allowList = new ArrayList(); + this.allowList = new ArrayList<>(); } /* Match patterns (from http://developer.chrome.com/extensions/match_patterns.html) diff --git a/framework/src/org/apache/cordova/CallbackMap.java b/framework/src/org/apache/cordova/CallbackMap.java index 050daa01..8d8b2cde 100644 --- a/framework/src/org/apache/cordova/CallbackMap.java +++ b/framework/src/org/apache/cordova/CallbackMap.java @@ -31,7 +31,7 @@ public class CallbackMap { private SparseArray> callbacks; public CallbackMap() { - this.callbacks = new SparseArray>(); + this.callbacks = new SparseArray<>(); } /** @@ -45,7 +45,7 @@ public class CallbackMap { */ public synchronized int registerCallback(CordovaPlugin receiver, int requestCode) { int mappedId = this.currentCallbackId++; - callbacks.put(mappedId, new Pair(receiver, requestCode)); + callbacks.put(mappedId, new Pair<>(receiver, requestCode)); return mappedId; } diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java index 0b92e96b..9d4a768d 100644 --- a/framework/src/org/apache/cordova/ConfigXmlParser.java +++ b/framework/src/org/apache/cordova/ConfigXmlParser.java @@ -39,7 +39,7 @@ public class ConfigXmlParser { private String launchUrl; private String contentSrc; private CordovaPreferences prefs = new CordovaPreferences(); - private ArrayList pluginEntries = new ArrayList(20); + private ArrayList pluginEntries = new ArrayList<>(20); public CordovaPreferences getPreferences() { return prefs; diff --git a/framework/src/org/apache/cordova/CordovaPreferences.java b/framework/src/org/apache/cordova/CordovaPreferences.java index 8dc5d230..0ed3cb89 100644 --- a/framework/src/org/apache/cordova/CordovaPreferences.java +++ b/framework/src/org/apache/cordova/CordovaPreferences.java @@ -29,7 +29,7 @@ import android.app.Activity; import android.os.Bundle; public class CordovaPreferences { - private HashMap prefs = new HashMap(20); + private HashMap prefs = new HashMap<>(20); private Bundle preferencesBundleExtras; public void setPreferencesBundle(Bundle extras) { diff --git a/framework/src/org/apache/cordova/CordovaWebViewImpl.java b/framework/src/org/apache/cordova/CordovaWebViewImpl.java index 4d5221e2..d6791332 100644 --- a/framework/src/org/apache/cordova/CordovaWebViewImpl.java +++ b/framework/src/org/apache/cordova/CordovaWebViewImpl.java @@ -72,7 +72,7 @@ public class CordovaWebViewImpl implements CordovaWebView { private View mCustomView; private WebChromeClient.CustomViewCallback mCustomViewCallback; - private Set boundKeyCodes = new HashSet(); + private Set boundKeyCodes = new HashSet<>(); public static CordovaWebViewEngine createEngine(Context context, CordovaPreferences preferences) { String className = preferences.getString("webview", SystemWebViewEngine.class.getCanonicalName()); @@ -91,7 +91,7 @@ public class CordovaWebViewImpl implements CordovaWebView { // Convenience method for when creating programmatically (not from Config.xml). public void init(CordovaInterface cordova) { - init(cordova, new ArrayList(), new CordovaPreferences()); + init(cordova, new ArrayList<>(), new CordovaPreferences()); } @SuppressLint("Assert") diff --git a/framework/src/org/apache/cordova/CoreAndroid.java b/framework/src/org/apache/cordova/CoreAndroid.java index 36b28b2d..8bdf9340 100755 --- a/framework/src/org/apache/cordova/CoreAndroid.java +++ b/framework/src/org/apache/cordova/CoreAndroid.java @@ -167,7 +167,7 @@ public class CoreAndroid extends CordovaPlugin { boolean clearHistory = false; // If there are properties, then set them on the Activity - HashMap params = new HashMap(); + HashMap params = new HashMap<>(); if (props != null) { JSONArray keys = props.names(); for (int i = 0; i < keys.length(); i++) { diff --git a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java index 6e6f2a73..a140bacb 100755 --- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java +++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java @@ -51,12 +51,12 @@ public class NativeToJsMessageQueue { /** * The list of JavaScript statements to be sent to JavaScript. */ - private final LinkedList queue = new LinkedList(); + private final LinkedList queue = new LinkedList<>(); /** * The array of listeners that can be used to send messages to JS. */ - private ArrayList bridgeModes = new ArrayList(); + private ArrayList bridgeModes = new ArrayList<>(); /** * When null, the bridge is disabled. This occurs during page transitions. diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java index 255eacd0..09011d3d 100755 --- a/framework/src/org/apache/cordova/PluginManager.java +++ b/framework/src/org/apache/cordova/PluginManager.java @@ -52,8 +52,8 @@ public class PluginManager { private static final int SLOW_EXEC_WARNING_THRESHOLD = Debug.isDebuggerConnected() ? 60 : 16; // List of service entries - private final Map pluginMap = Collections.synchronizedMap(new LinkedHashMap()); - private final Map entryMap = Collections.synchronizedMap(new LinkedHashMap()); + private final Map pluginMap = Collections.synchronizedMap(new LinkedHashMap<>()); + private final Map entryMap = Collections.synchronizedMap(new LinkedHashMap<>()); private final CordovaInterface ctx; private final CordovaWebView app; @@ -611,7 +611,7 @@ public class PluginManager { * @return list of PathHandlers in no particular order */ public ArrayList getPluginPathHandlers() { - ArrayList handlers = new ArrayList(); + ArrayList handlers = new ArrayList<>(); for (CordovaPlugin plugin : this.pluginMap.values()) { if (plugin != null && plugin.getPathHandler() != null) { handlers.add(plugin.getPathHandler()); diff --git a/framework/src/org/apache/cordova/ResumeCallback.java b/framework/src/org/apache/cordova/ResumeCallback.java index 49a43b5d..25e0723f 100644 --- a/framework/src/org/apache/cordova/ResumeCallback.java +++ b/framework/src/org/apache/cordova/ResumeCallback.java @@ -66,7 +66,7 @@ public class ResumeCallback extends CallbackContext { // the PluginResult passed to this CallbackContext into JSON twice. // The results are combined into an event payload before the event is // fired on the js side of things (see platform.js) - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(eventResult); result.add(pluginResult); diff --git a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java index 8a48e351..9c0c01b1 100755 --- a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java +++ b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java @@ -274,7 +274,7 @@ public class SystemWebChromeClient extends WebChromeClient { // Handle result Uri[] result = null; if (resultCode == Activity.RESULT_OK) { - List uris = new ArrayList(); + List uris = new ArrayList<>(); if (intent != null && intent.getData() != null) { // single file LOG.v(LOG_TAG, "Adding file (single): " + intent.getData()); diff --git a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java index fd719f09..b9a8ca5f 100755 --- a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java +++ b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java @@ -68,7 +68,7 @@ public class SystemWebViewClient extends WebViewClient { boolean isCurrentlyLoading; /** The authorization tokens. */ - private Hashtable authenticationTokens = new Hashtable(); + private Hashtable authenticationTokens = new Hashtable<>(); public SystemWebViewClient(SystemWebViewEngine parentEngine) { this.parentEngine = parentEngine;