[Libreoffice-commits] core.git: android/source

[Michael Weghorn (via logerrit)]

 android/source/src/java/org/libreoffice/FontController.java |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 87d0037d75386afcaef4002e2e652b95d6cd92d5
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri May 6 22:27:51 2022 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sun May 8 08:21:04 2022 +0200

    android: Drop explicit type arguments when calling ctors
    
    Addresses these suggestions shown in Android Studio:
    
    * "Explicit type argument String can be replaced with <>"
    * "Explicit type argument String, ArrayList<String> can be replaced with <>"
    
    Change-Id: Ibc78364cf5b246d8c1e1d32d755c3e8dcf0e32aa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133985
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/android/source/src/java/org/libreoffice/FontController.java 
b/android/source/src/java/org/libreoffice/FontController.java
index 8b7f232ac65c..ab8ffe307363 100644
--- a/android/source/src/java/org/libreoffice/FontController.java
+++ b/android/source/src/java/org/libreoffice/FontController.java
@@ -26,9 +26,9 @@ public class FontController implements 
AdapterView.OnItemSelectedListener {
     private boolean mFontNameSpinnerSet = false;
     private boolean mFontSizeSpinnerSet = false;
     private final LibreOfficeMainActivity mActivity;
-    private final ArrayList<String> mFontList = new ArrayList<String>();
-    private final ArrayList<String> mFontSizes = new ArrayList<String>();
-    private final HashMap<String, ArrayList<String>> mAllFontSizes = new 
HashMap<String, ArrayList<String>>();
+    private final ArrayList<String> mFontList = new ArrayList<>();
+    private final ArrayList<String> mFontSizes = new ArrayList<>();
+    private final HashMap<String, ArrayList<String>> mAllFontSizes = new 
HashMap<>();
 
     private String mCurrentFontSelected = null;
     private String mCurrentFontSizeSelected = null;
@@ -213,7 +213,7 @@ public class FontController implements 
AdapterView.OnItemSelectedListener {
                 String key = keys.next();
                 mFontList.add(key);
                 JSONArray array = jObject2.getJSONArray(key);
-                fontSizes = new ArrayList<String>();
+                fontSizes = new ArrayList<>();
                 for (int i = 0; i < array.length(); i++) {
                     fontSizes.add(array.getString(i));
                 }
@@ -237,14 +237,14 @@ public class FontController implements 
AdapterView.OnItemSelectedListener {
 
     private void setupFontNameSpinner() {
         Spinner fontSpinner = mActivity.findViewById(R.id.font_name_spinner);
-        ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(mActivity, 
android.R.layout.simple_spinner_item, mFontList);
+        ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(mActivity, 
android.R.layout.simple_spinner_item, mFontList);
         
dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         fontSpinner.setAdapter(dataAdapter);
     }
 
     private void setupFontSizeSpinner() {
         Spinner fontSizeSpinner = 
mActivity.findViewById(R.id.font_size_spinner);
-        ArrayAdapter<String> dataAdapter = new ArrayAdapter<String>(mActivity, 
android.R.layout.simple_spinner_item, mFontSizes);
+        ArrayAdapter<String> dataAdapter = new ArrayAdapter<>(mActivity, 
android.R.layout.simple_spinner_item, mFontSizes);
         
dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         fontSizeSpinner.setAdapter(dataAdapter);
     }