From 512ddfdd7df95f71aab4cbd3b0d1c64b02dadae0 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 19:15:40 +1300 Subject: [PATCH] Minor fixes 3 --- .../fr/free/nrw/commons/upload/FilePathConverter.java | 4 +--- .../java/fr/free/nrw/commons/upload/GPSExtractor.java | 1 - .../java/fr/free/nrw/commons/upload/MwVolleyApi.java | 11 +++-------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java b/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java index 8d1711f47..9267bf9f8 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java @@ -48,9 +48,7 @@ public class FilePathConverter { Log.d("Image", "File path: " + filePath); return filePath; - } - - catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { Log.w("Image", e); return null; } diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java index 9b3ce8516..88191b894 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java @@ -26,7 +26,6 @@ public class GPSExtractor { try { exif = new ExifInterface(filePath); - } catch (IOException e) { Log.w("Image", e); return null; diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java index 84a57ddf8..7a79062d7 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java @@ -156,8 +156,7 @@ public class MwVolleyApi { gpsCatExists = false; Log.d("Cat", "gpsCatExists=" + gpsCatExists); return "No collection of categories"; - } - else { + } else { gpsCatExists = true; Log.d("Cat", "gpsCatExists=" + gpsCatExists); return "CATEGORIES FOUND" + categorySet.toString(); @@ -168,8 +167,7 @@ public class MwVolleyApi { public String toString() { if (query != null) { return "query=" + query.toString() + "\n" + printSet(); - } - else { + } else { return "No pages found near " + coordsLog; } } @@ -206,16 +204,13 @@ public class MwVolleyApi { if (categories == null || categories.length == 0) { builder.append("no categories exist\n"); - } - else { + } else { for (Category category : categories) { builder.append(category.toString()); builder.append("\n"); if (category != null) { String categoryString = category.toString().replace("Category:", ""); categorySet.add(categoryString); - //Log.d("Set", "category added: " + category.toString()); - //Log.d("Set", "Current category Set" + categorySet.toString()); } } }