From d866ab3e075cab326f8935453c3d043c7a8e15b8 Mon Sep 17 00:00:00 2001 From: veyndan Date: Wed, 1 Mar 2017 15:44:32 +0000 Subject: [PATCH] Replace explicit type with diamond operator --- .../free/nrw/commons/CommonsApplication.java | 2 +- .../java/fr/free/nrw/commons/LicenseList.java | 2 +- .../main/java/fr/free/nrw/commons/Media.java | 6 ++-- .../free/nrw/commons/MediaDataExtractor.java | 6 ++-- .../nrw/commons/caching/CacheController.java | 4 +-- .../category/CategorizationFragment.java | 30 +++++++++---------- .../nrw/commons/category/MethodAUpdater.java | 4 +-- .../nrw/commons/category/PrefixUpdater.java | 12 ++++---- .../contributions/ContributionsActivity.java | 2 +- .../ContributionsSyncAdapter.java | 2 +- .../commons/media/CategoryImagesLoader.java | 2 +- .../commons/media/MediaDetailFragment.java | 2 +- .../modifications/ModifierSequence.java | 2 +- .../free/nrw/commons/nearby/NearbyPlaces.java | 2 +- .../commons/upload/MultipleShareActivity.java | 2 +- .../free/nrw/commons/upload/MwVolleyApi.java | 6 ++-- 16 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index 9e4482f0d..44bdf0336 100644 --- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java +++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -122,7 +122,7 @@ public class CommonsApplication extends Application { if (maxMem < 48L * 1024L * 1024L) { // Cache only one bitmap if VM memory is too small (such as Nexus One); Log.d("Commons", "Skipping bitmap cache; max mem is: " + maxMem); - imageCache = new LruCache(1); + imageCache = new LruCache<>(1); } else { int cacheSize = (int) (maxMem / (1024 * 8)); Log.d("Commons", "Bitmap cache size " + cacheSize + " from max mem " + maxMem); diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java index 52049127c..a30728fb7 100644 --- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java +++ b/app/src/main/java/fr/free/nrw/commons/LicenseList.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; public class LicenseList { - Map licenses = new HashMap(); + Map licenses = new HashMap<>(); Resources res; private static String XMLNS_LICENSE = "https://www.mediawiki.org/wiki/Extension:UploadWizard/xmlns/licenses"; diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java index 0b5b0fe00..f417f10b1 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -27,11 +27,11 @@ public class Media implements Parcelable { }; protected Media() { - this.categories = new ArrayList(); - this.descriptions = new HashMap(); + this.categories = new ArrayList<>(); + this.descriptions = new HashMap<>(); } - private HashMap tags = new HashMap(); + private HashMap tags = new HashMap<>(); public Object getTag(String key) { return tags.get(key); diff --git a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java index b514ca524..67ec50a38 100644 --- a/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java +++ b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java @@ -46,8 +46,8 @@ public class MediaDataExtractor { */ public MediaDataExtractor(String filename, LicenseList licenseList) { this.filename = filename; - categories = new ArrayList(); - descriptions = new HashMap(); + categories = new ArrayList<>(); + descriptions = new HashMap<>(); fetched = false; processed = false; this.licenseList = licenseList; @@ -251,7 +251,7 @@ public class MediaDataExtractor { // Texts are wrapped in things like {{en|foo} or {{en|1=foo bar}}. // Text outside those wrappers is stuffed into a 'default' faux language key if present. private Map getMultilingualText(Node parentNode) throws IOException { - Map texts = new HashMap(); + Map texts = new HashMap<>(); StringBuilder localText = new StringBuilder(); NodeList nodes = parentNode.getChildNodes(); diff --git a/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java b/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java index 52586cab3..be5b4dff7 100644 --- a/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java +++ b/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java @@ -33,7 +33,7 @@ public class CacheController { } public void cacheCategory() { - List pointCatList = new ArrayList(); + List pointCatList = new ArrayList<>(); if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true) { pointCatList.addAll(MwVolleyApi.getGpsCat()); Log.d(TAG, "Categories being cached: " + pointCatList); @@ -47,7 +47,7 @@ public class CacheController { //Convert decLatitude and decLongitude to a coordinate offset range convertCoordRange(); pointsFound = quadTree.searchWithin(xMinus, yMinus, xPlus, yPlus); - List displayCatList = new ArrayList(); + List displayCatList = new ArrayList<>(); Log.d(TAG, "Points found in quadtree: " + Arrays.asList(pointsFound)); if (pointsFound.length != 0) { diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 4bf2cc9ff..6ac48d628 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -69,14 +69,14 @@ public class CategorizationFragment extends Fragment { protected HashMap> categoriesCache; - private ArrayList selectedCategories = new ArrayList(); + private ArrayList selectedCategories = new ArrayList<>(); // LHS guarantees ordered insertions, allowing for prioritized method A results - private final Set results = new LinkedHashSet(); + private final Set results = new LinkedHashSet<>(); PrefixUpdater prefixUpdaterSub; MethodAUpdater methodAUpdaterSub; - private final ArrayList titleCatItems = new ArrayList(); + private final ArrayList titleCatItems = new ArrayList<>(); final CountDownLatch mergeLatch = new CountDownLatch(1); private ContentProviderClient client; @@ -164,7 +164,7 @@ public class CategorizationFragment extends Fragment { * @return a list containing recent categories */ protected ArrayList recentCatQuery() { - ArrayList items = new ArrayList(); + ArrayList items = new ArrayList<>(); try { Cursor cursor = client.query( @@ -192,16 +192,16 @@ public class CategorizationFragment extends Fragment { */ protected ArrayList mergeItems() { - Set mergedItems = new LinkedHashSet(); + Set mergedItems = new LinkedHashSet<>(); Log.d(TAG, "Calling APIs for GPS cats, title cats and recent cats..."); - List gpsItems = new ArrayList(); + List gpsItems = new ArrayList<>(); if (MwVolleyApi.GpsCatExists.getGpsCatExists()) { gpsItems.addAll(MwVolleyApi.getGpsCat()); } - List titleItems = new ArrayList(titleCatQuery()); - List recentItems = new ArrayList(recentCatQuery()); + List titleItems = new ArrayList<>(titleCatQuery()); + List recentItems = new ArrayList<>(recentCatQuery()); //Await results of titleItems, which is likely to come in last try { @@ -219,7 +219,7 @@ public class CategorizationFragment extends Fragment { Log.d(TAG, "Adding recent items: " + recentItems); //Needs to be an ArrayList and not a List unless we want to modify a big portion of preexisting code - ArrayList mergedItemsList = new ArrayList(mergedItems); + ArrayList mergedItemsList = new ArrayList<>(mergedItems); Log.d(TAG, "Merged item list: " + mergedItemsList); return mergedItemsList; @@ -233,8 +233,8 @@ public class CategorizationFragment extends Fragment { protected void setCatsAfterAsync(ArrayList categories, String filter) { if (getActivity() != null) { - ArrayList items = new ArrayList(); - HashSet existingKeys = new HashSet(); + ArrayList items = new ArrayList<>(); + HashSet existingKeys = new HashSet<>(); for (CategoryItem item : categoriesAdapter.getItems()) { if (item.selected) { items.add(item); @@ -282,7 +282,7 @@ public class CategorizationFragment extends Fragment { prefixUpdaterSub = new PrefixUpdater(this) { @Override protected ArrayList doInBackground(Void... voids) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); try { result = super.doInBackground(); latch.await(); @@ -302,7 +302,7 @@ public class CategorizationFragment extends Fragment { Log.d(TAG, "Prefix result: " + result); String filter = categoriesFilter.getText().toString(); - ArrayList resultsList = new ArrayList(results); + ArrayList resultsList = new ArrayList<>(results); categoriesCache.put(filter, resultsList); Log.d(TAG, "Final results List: " + resultsList); @@ -424,8 +424,8 @@ public class CategorizationFragment extends Fragment { ArrayList items; if(savedInstanceState == null) { - items = new ArrayList(); - categoriesCache = new HashMap>(); + items = new ArrayList<>(); + categoriesCache = new HashMap<>(); } else { items = savedInstanceState.getParcelableArrayList("currentCategories"); categoriesCache = (HashMap>) savedInstanceState.getSerializable("categoriesCache"); diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index bc9a8092d..1856ffef3 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -83,7 +83,7 @@ public class MethodAUpdater extends AsyncTask> { //otherwise if user has typed something in that isn't in cache, search API for matching categories MWApi api = CommonsApplication.createMWApi(); ApiResult result; - ArrayList categories = new ArrayList(); + ArrayList categories = new ArrayList<>(); //URL https://commons.wikimedia.org/w/api.php?action=query&format=xml&list=search&srwhat=text&srenablerewrites=1&srnamespace=14&srlimit=10&srsearch= try { @@ -110,7 +110,7 @@ public class MethodAUpdater extends AsyncTask> { } Log.d(TAG, "Found categories from Method A search, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(categories)); + ArrayList filteredItems = new ArrayList<>(filterYears(categories)); return filteredItems; } } diff --git a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java index d52564a81..bacd1a520 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java @@ -82,17 +82,17 @@ public class PrefixUpdater extends AsyncTask> { protected ArrayList doInBackground(Void... voids) { //If user hasn't typed anything in yet, get GPS and recent items if(TextUtils.isEmpty(filter)) { - ArrayList mergedItems = new ArrayList(catFragment.mergeItems()); + ArrayList mergedItems = new ArrayList<>(catFragment.mergeItems()); Log.d(TAG, "Merged items, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(mergedItems)); + ArrayList filteredItems = new ArrayList<>(filterYears(mergedItems)); return filteredItems; } //if user types in something that is in cache, return cached category if(catFragment.categoriesCache.containsKey(filter)) { - ArrayList cachedItems = new ArrayList(catFragment.categoriesCache.get(filter)); + ArrayList cachedItems = new ArrayList<>(catFragment.categoriesCache.get(filter)); Log.d(TAG, "Found cache items, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(cachedItems)); + ArrayList filteredItems = new ArrayList<>(filterYears(cachedItems)); return filteredItems; } @@ -100,7 +100,7 @@ public class PrefixUpdater extends AsyncTask> { //URL: https://commons.wikimedia.org/w/api.php?action=query&list=allcategories&acprefix=filter&aclimit=25 MWApi api = CommonsApplication.createMWApi(); ApiResult result; - ArrayList categories = new ArrayList(); + ArrayList categories = new ArrayList<>(); try { result = api.action("query") .param("list", "allcategories") @@ -120,7 +120,7 @@ public class PrefixUpdater extends AsyncTask> { } Log.d(TAG, "Found categories from Prefix search, waiting for filter"); - ArrayList filteredItems = new ArrayList(filterYears(categories)); + ArrayList filteredItems = new ArrayList<>(filterYears(categories)); return filteredItems; } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 8a8313662..ff7af70e8 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -45,7 +45,7 @@ public class ContributionsActivity private MediaDetailPagerFragment mediaDetails; private UploadService uploadService; private boolean isUploadServiceConnected; - private ArrayList observersWaitingForLoad = new ArrayList(); + private ArrayList observersWaitingForLoad = new ArrayList<>(); private String CONTRIBUTION_SELECTION = ""; /* This sorts in the following order: diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java index 7f67db20a..9cb01e02c 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java @@ -92,7 +92,7 @@ public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter { ArrayList uploads = result.getNodes("/api/query/logevents/item"); Log.d("Commons", uploads.size() + " results!"); - ArrayList imageValues = new ArrayList(); + ArrayList imageValues = new ArrayList<>(); for(ApiResult image: uploads) { String filename = image.getString("@title"); if(fileExists(contentProviderClient, filename)) { diff --git a/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java b/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java index 3fbe830c1..6e9898ef1 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java +++ b/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java @@ -32,7 +32,7 @@ public class CategoryImagesLoader extends AsyncTaskLoader>{ @Override public List loadInBackground() { - ArrayList mediaList = new ArrayList(); + ArrayList mediaList = new ArrayList<>(); ApiResult result; try { result = app.getApi().action("query") diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index ada308cca..f15ccf01f 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -108,7 +108,7 @@ public class MediaDetailFragment extends Fragment { index = getArguments().getInt("index"); initialListTop = 0; } - categoryNames = new ArrayList(); + categoryNames = new ArrayList<>(); categoryNames.add(getString(R.string.detail_panel_cats_loading)); final View view = inflater.inflate(R.layout.fragment_media_detail, container, false); diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java index 4869c3ee5..b660c0a72 100644 --- a/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java +++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java @@ -21,7 +21,7 @@ public class ModifierSequence { public ModifierSequence(Uri mediaUri) { this.mediaUri = mediaUri; - modifiers = new ArrayList(); + modifiers = new ArrayList<>(); } public ModifierSequence(Uri mediaUri, JSONObject data) { diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java index 65239da9f..ac7fd3252 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyPlaces.java @@ -21,7 +21,7 @@ public class NearbyPlaces { } else { try { - places = new ArrayList(); + places = new ArrayList<>(); StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.setThreadPolicy(policy); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java index 6b85f62e8..3c9faff48 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java @@ -249,7 +249,7 @@ public class MultipleShareActivity if(intent.getAction().equals(Intent.ACTION_SEND_MULTIPLE)) { if(photosList == null) { - photosList = new ArrayList(); + photosList = new ArrayList<>(); ArrayList urisList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); for(int i=0; i < urisList.size(); i++) { Contribution up = new Contribution(); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java index a8cc93ec6..913e6bfd3 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java @@ -42,7 +42,7 @@ public class MwVolleyApi { public MwVolleyApi(Context context) { this.context = context; - categorySet = new HashSet(); + categorySet = new HashSet<>(); } public static List getGpsCat() { @@ -50,7 +50,7 @@ public class MwVolleyApi { } public static void setGpsCat(List cachedList) { - categoryList = new ArrayList(); + categoryList = new ArrayList<>(); categoryList.addAll(cachedList); Log.d(TAG, "Setting GPS cats from cache: " + categoryList.toString()); } @@ -236,7 +236,7 @@ public class MwVolleyApi { } } - categoryList = new ArrayList(categorySet); + categoryList = new ArrayList<>(categorySet); builder.replace(builder.length() - 1, builder.length(), ""); return builder.toString(); }