Coding style fixes

app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java

@@ -93,7 +93,7 @@ class LoginTask extends AsyncTask<String, String, String> {
     }
 
     /**
-     * Match known failure message codes and provide messages
+     * Match known failure message codes and provide messages.
      * @param result String
      */
     private void handleOtherResults(String result) {

app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java

@@ -35,6 +35,19 @@ import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.mwapi.EventLog;
 
 public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPageChangeListener {
+
+    public interface MediaDetailProvider {
+        Media getMediaAtPosition(int i);
+
+        int getTotalMediaCount();
+
+        void notifyDatasetChanged();
+
+        void registerDataSetObserver(DataSetObserver observer);
+
+        void unregisterDataSetObserver(DataSetObserver observer);
+    }
+
     private ViewPager pager;
     private Boolean editable;
     private CommonsApplication app;
@@ -48,14 +61,6 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
         this.editable = editable;
     }
 
-    public interface MediaDetailProvider {
-        Media getMediaAtPosition(int i);
-        int getTotalMediaCount();
-        void notifyDatasetChanged();
-        void registerDataSetObserver(DataSetObserver observer);
-        void unregisterDataSetObserver(DataSetObserver observer);
-    }
-
     //FragmentStatePagerAdapter allows user to swipe across collection of images (no. of images undetermined)
     private class MediaDetailAdapter extends FragmentStatePagerAdapter {
 

app/src/main/java/fr/free/nrw/commons/nearby/NearbyBaseMarker.java

@@ -16,6 +16,17 @@ import fr.free.nrw.commons.utils.UriDeserializer;
 import fr.free.nrw.commons.utils.UriSerializer;
 
 public class NearbyBaseMarker extends BaseMarkerOptions<NearbyMarker, NearbyBaseMarker> {
+
+    public static final Parcelable.Creator<NearbyBaseMarker> CREATOR = new Parcelable.Creator<NearbyBaseMarker>() {
+        public NearbyBaseMarker createFromParcel(Parcel in) {
+            return new NearbyBaseMarker(in);
+        }
+
+        public NearbyBaseMarker[] newArray(int size) {
+            return new NearbyBaseMarker[size];
+        }
+    };
+
     private Place place;
 
     NearbyBaseMarker() {
@@ -74,15 +85,4 @@ public class NearbyBaseMarker extends BaseMarkerOptions<NearbyMarker, NearbyBase
         dest.writeString(title);
         dest.writeString(gson.toJson(place));
     }
-
-    public static final Parcelable.Creator<NearbyBaseMarker> CREATOR
-            = new Parcelable.Creator<NearbyBaseMarker>() {
-        public NearbyBaseMarker createFromParcel(Parcel in) {
-            return new NearbyBaseMarker(in);
-        }
-
-        public NearbyBaseMarker[] newArray(int size) {
-            return new NearbyBaseMarker[size];
-        }
-    };
 }

app/src/main/java/fr/free/nrw/commons/upload/UploadService.java

@@ -318,9 +318,8 @@ public class UploadService extends HandlerService<Contribution> {
                     sequenceFileName = regexMatcher.replaceAll("$1 " + sequenceNumber + "$2");
                 }
             }
-            if ( api.fileExistsWithName(sequenceFileName) || unfinishedUploads.contains(sequenceFileName) ) {
+            if (!api.fileExistsWithName(sequenceFileName)
-                continue;
+                    && !unfinishedUploads.contains(sequenceFileName)) {
-            } else {
                 break;
             }
         }

app/src/test/java/fr/free/nrw/commons/LatLngTests.java

@@ -1,12 +1,12 @@
 package fr.free.nrw.commons;
 
-import static org.hamcrest.CoreMatchers.is;
-
-import fr.free.nrw.commons.location.LatLng;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import fr.free.nrw.commons.location.LatLng;
+
+import static org.hamcrest.CoreMatchers.is;
+
 public class LatLngTests {
     @Test public void testZeroZero() {
         LatLng place = new LatLng(0, 0, 0);

app/src/test/java/fr/free/nrw/commons/LengthUtilsTest.java

@@ -1,12 +1,12 @@
 package fr.free.nrw.commons;
 
-import static org.hamcrest.CoreMatchers.is;
+import org.junit.Assert;
+import org.junit.Test;
 
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.utils.LengthUtils;
 
-import org.junit.Assert;
+import static org.hamcrest.CoreMatchers.is;
-import org.junit.Test;
 
 public class LengthUtilsTest {
     @Test public void testZeroDistance() {

app/src/test/java/fr/free/nrw/commons/UtilsFixExtensionTest.java

@@ -1,10 +1,10 @@
 package fr.free.nrw.commons;
 
-import static org.hamcrest.CoreMatchers.is;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.is;
+
 public class UtilsFixExtensionTest {
 
     @Test public void jpegResultsInJpg() {