Allow inferred types using diamond syntax (flutter#7237)

nt4f04uNd · Dec 18, 2018 · f79f7f6 · f79f7f6
1 parent 951edf3
commit f79f7f6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -171,7 +171,7 @@ public void onCreate(Bundle savedInstanceState) {
           String appBundlePath = FlutterMain.findAppBundlePath(activity.getApplicationContext());
           if (appBundlePath != null) {
             FlutterRunArguments arguments = new FlutterRunArguments();
-            ArrayList<String> bundlePaths = new ArrayList<String>();
+            ArrayList<String> bundlePaths = new ArrayList<>();
             if (FlutterMain.getUpdateInstallationPath() != null) {
                 bundlePaths.add(FlutterMain.getUpdateInstallationPath());
             }
@@ -296,7 +296,7 @@ private static String[] getArgsFromIntent(Intent intent) {
         // Before adding more entries to this list, consider that arbitrary
         // Android applications can generate intents with extra data and that
         // there are many security-sensitive args in the binary.
-        ArrayList<String> args = new ArrayList<String>();
+        ArrayList<String> args = new ArrayList<>();
         if (intent.getBooleanExtra("trace-startup", false)) {
             args.add("--trace-startup");
         }
@@ -343,7 +343,7 @@ private boolean loadIntent(Intent intent) {
             }
             if (!flutterView.getFlutterNativeView().isApplicationRunning()) {
               FlutterRunArguments args = new FlutterRunArguments();
-              ArrayList<String> bundlePaths = new ArrayList<String>();
+              ArrayList<String> bundlePaths = new ArrayList<>();
               if (FlutterMain.getUpdateInstallationPath() != null) {
                   bundlePaths.add(FlutterMain.getUpdateInstallationPath());
               }

diff --git a/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java b/shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
@@ -51,7 +51,7 @@ private void updateEditingState() {
                              selectionStart, selectionEnd,
                              composingStart, composingEnd);
 
-        HashMap<Object, Object> state = new HashMap<Object, Object>();
+        HashMap<Object, Object> state = new HashMap<>();
         state.put("text", mEditable.toString());
         state.put("selectionBase", selectionStart);
         state.put("selectionExtent", selectionEnd);

diff --git a/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/shell/platform/android/io/flutter/view/AccessibilityBridge.java
@@ -108,8 +108,8 @@ enum Flag {
     AccessibilityBridge(FlutterView owner) {
         assert owner != null;
         mOwner = owner;
-        mObjects = new HashMap<Integer, SemanticsObject>();
-        mCustomAccessibilityActions = new HashMap<Integer, CustomAccessibilityAction>();
+        mObjects = new HashMap<>();
+        mCustomAccessibilityActions = new HashMap<>();
         previousRoutes = new ArrayList<>();
         mFlutterAccessibilityChannel = new BasicMessageChannel<>(
                 owner, "flutter/accessibility", StandardMessageCodec.INSTANCE);
@@ -443,7 +443,7 @@ public boolean performAction(int virtualViewId, int action, Bundle arguments) {
                 return true;
             }
             case AccessibilityNodeInfo.ACTION_SET_SELECTION: {
-                final Map<String, Integer> selection = new HashMap<String, Integer>();
+                final Map<String, Integer> selection = new HashMap<>();
                 final boolean hasSelection = arguments != null
                         && arguments.containsKey(
                                    AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT)
@@ -611,7 +611,7 @@ void updateCustomAccessibilityActions(ByteBuffer buffer, String[] strings) {
     }
 
     void updateSemantics(ByteBuffer buffer, String[] strings) {
-        ArrayList<SemanticsObject> updated = new ArrayList<SemanticsObject>();
+        ArrayList<SemanticsObject> updated = new ArrayList<>();
         while (buffer.hasRemaining()) {
             int id = buffer.getInt();
             SemanticsObject object = getOrCreateObject(id);
@@ -627,7 +627,7 @@ void updateSemantics(ByteBuffer buffer, String[] strings) {
             }
         }
 
-        Set<SemanticsObject> visitedObjects = new HashSet<SemanticsObject>();
+        Set<SemanticsObject> visitedObjects = new HashSet<>();
         SemanticsObject rootObject = getRootObject();
         List<SemanticsObject> newRoutes = new ArrayList<>();
         if (rootObject != null) {
@@ -1115,7 +1115,7 @@ void updateWith(ByteBuffer buffer, String[] strings) {
                 childrenInHitTestOrder = null;
             } else {
                 if (childrenInTraversalOrder == null)
-                    childrenInTraversalOrder = new ArrayList<SemanticsObject>(childCount);
+                    childrenInTraversalOrder = new ArrayList<>(childCount);
                 else
                     childrenInTraversalOrder.clear();
 
@@ -1126,7 +1126,7 @@ void updateWith(ByteBuffer buffer, String[] strings) {
                 }
 
                 if (childrenInHitTestOrder == null)
-                    childrenInHitTestOrder = new ArrayList<SemanticsObject>(childCount);
+                    childrenInHitTestOrder = new ArrayList<>(childCount);
                 else
                     childrenInHitTestOrder.clear();
 
@@ -1141,8 +1141,7 @@ void updateWith(ByteBuffer buffer, String[] strings) {
                 customAccessibilityActions = null;
             } else {
                 if (customAccessibilityActions == null)
-                    customAccessibilityActions =
-                            new ArrayList<CustomAccessibilityAction>(actionCount);
+                    customAccessibilityActions = new ArrayList<>(actionCount);
                 else
                     customAccessibilityActions.clear();
 

diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java
@@ -319,7 +319,7 @@ private void setLocales(Configuration config) {
                 Method localeListGet = localeList.getClass().getDeclaredMethod("get", int.class);
                 Method localeListSize = localeList.getClass().getDeclaredMethod("size");
                 int localeCount = (int)localeListSize.invoke(localeList);
-                List<String> data = new ArrayList<String>();
+                List<String> data = new ArrayList<>();
                 for (int index = 0; index < localeCount; ++index) {
                     Locale locale = (Locale)localeListGet.invoke(localeList, index);
                     data.add(locale.getLanguage());

diff --git a/shell/platform/android/io/flutter/view/ResourceExtractor.java b/shell/platform/android/io/flutter/view/ResourceExtractor.java
@@ -330,7 +330,7 @@ protected Void doInBackground(Void... unused) {
 
     ResourceExtractor(Context context) {
         mContext = context;
-        mResources = new HashSet<String>();
+        mResources = new HashSet<>();
     }
 
     ResourceExtractor addResource(String resource) {