Code style changes

src/main/java/com/rarchives/ripme/ripper/rippers/E621Ripper.java

@@ -52,11 +52,12 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 
 	@Override
 	public Document getFirstPage() throws IOException {
-		if (url.getPath().startsWith("/pool/show/"))
+		if (url.getPath().startsWith("/pool/show/")) {
 			return Http.url("https://e621.net/pool/show/" + getTerm(url)).get();
-		else
+		} else {
 			return Http.url("https://e621.net/post/index/1/" + getTerm(url)).get();
 		}
+	}
 
 	@Override
 	public List<String> getURLsFromPage(Document page) {
@@ -67,16 +68,22 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 			int index = 0;
 
 			Element e = page.getElementById("paginator");
-			if (e != null && (e = e.getElementsByClass("current").first()) != null)
+			if (e != null) {
+				e = e.getElementsByClass("current").first();
+				if (e != null) {
 					index = (Integer.parseInt(e.text()) - 1) * POOL_IMAGES_PER_PAGE;
+				}
+			}
 
-			for (Element e_ : elements)
+			for (Element e_ : elements) {
 				res.add(e_.absUrl("href") + "#" + ++index);
+			}
 
 		} else {
-			for (Element e : elements)
+			for (Element e : elements) {
 				res.add(e.absUrl("href") + "#" + e.child(0).attr("id").substring(1));
 			}
+		}
 
 		return res;
 	}
@@ -84,9 +91,10 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 	@Override
 	public Document getNextPage(Document page) throws IOException {
 		for (Element e : page.select("#paginator a")) {
-			if (e.attr("rel").equals("next"))
+			if (e.attr("rel").equals("next")) {
 				return Http.url(e.absUrl("href")).get();
 			}
+		}
 
 		return null;
 	}
@@ -99,12 +107,13 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 					Document page = Http.url(url).get();
 					Element e = page.getElementById("image");
 
-					if (e != null)
+					if (e != null) {
 						addURLToDownload(new URL(e.absUrl("src")), Utils.getConfigBoolean("download.save_order", true) ? url.getRef() + "-" : "");
-					else if ((e = page.select(".content object>param[name=\"movie\"]").first()) != null)
+					} else if ((e = page.select(".content object>param[name=\"movie\"]").first()) != null) {
 						addURLToDownload(new URL(e.absUrl("value")), Utils.getConfigBoolean("download.save_order", true) ? url.getRef() + "-" : "");
-					else
+					} else {
 						Logger.getLogger(E621Ripper.class.getName()).log(Level.WARNING, "Unsupported media type - please report to program author: " + url.toString());
+					}
 
 				} catch (IOException ex) {
 					Logger.getLogger(E621Ripper.class.getName()).log(Level.SEVERE, null, ex);
@@ -116,22 +125,25 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 	private String getTerm(URL url) throws MalformedURLException {
 		String query = url.getQuery();
 
-		if (query != null)
+		if (query != null) {
 			return Utils.parseUrlQuery(query, "tags");
+		}
 
 		if (query == null) {
 			if ((query = url.getPath()).startsWith("/post/index/")) {
 				query = query.substring(12);
 
 				int pos = query.indexOf('/');
-				if (pos == -1)
+				if (pos == -1) {
 					return null;
+				}
 
 				// skip page number
 				query = query.substring(pos + 1);
 
-				if (query.endsWith("/"))
+				if (query.endsWith("/")) {
 					query = query.substring(0, query.length() - 1);
+				}
 
 				try {
 					return URLDecoder.decode(query, "UTF-8");
@@ -143,8 +155,9 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 			} else if (query.startsWith("/pool/show/")) {
 				query = query.substring(11);
 
-				if (query.endsWith("/"))
+				if (query.endsWith("/")) {
 					query = query.substring(0, query.length() - 1);
+				}
 
 				return query;
 			}
@@ -156,10 +169,11 @@ public static final int POOL_IMAGES_PER_PAGE = 24;
 	@Override
 	public String getGID(URL url) throws MalformedURLException {
 		String prefix = "";
-		if (url.getPath().startsWith("/pool/show/"))
+		if (url.getPath().startsWith("/pool/show/")) {
 			prefix = "pool_";
-		else
+		} else {
 			prefix = "term_";
+		}
 
 		return Utils.filesystemSafe(prefix + getTerm(url));
 	}

src/main/java/com/rarchives/ripme/utils/Utils.java

@@ -401,20 +401,21 @@ public class Utils {
     public static Map<String,String> parseUrlQuery(String query) {
         Map<String,String> res = new HashMap<String, String>();
 
-		if (query.equals(""))
+        if (query.equals("")){
             return res;
+        }
 
         String[] parts = query.split("&");
         int pos;
 
         try {
             for (String part : parts) {
-				if ((pos = part.indexOf('=')) >= 0)
+                if ((pos = part.indexOf('=')) >= 0){
-					res.put(URLDecoder.decode(part.substring(0, pos), "UTF-8"),
+                    res.put(URLDecoder.decode(part.substring(0, pos), "UTF-8"), URLDecoder.decode(part.substring(pos + 1), "UTF-8"));
-							URLDecoder.decode(part.substring(pos + 1), "UTF-8"));
+                }else{
-				else
                     res.put(URLDecoder.decode(part, "UTF-8"), "");
                 }
+            }
         } catch (UnsupportedEncodingException e) {
             // Shouldn't happen since UTF-8 is required to be supported
             throw new RuntimeException(e);
@@ -433,8 +434,9 @@ public class Utils {
      * @return The associated value or null if key wasn't found
      */
     public static String parseUrlQuery(String query, String key) {
-		if (query.equals(""))
+        if (query.equals("")){
             return null;
+        }
 
         String[] parts = query.split("&");
         int pos;
@@ -442,8 +444,9 @@ public class Utils {
         try {
             for (String part : parts) {
                 if ((pos = part.indexOf('=')) >= 0) {
-					if (URLDecoder.decode(part.substring(0, pos), "UTF-8").equals(key))
+                    if (URLDecoder.decode(part.substring(0, pos), "UTF-8").equals(key)){
                         return URLDecoder.decode(part.substring(pos + 1), "UTF-8");
+                    }
 
                 } else if (URLDecoder.decode(part, "UTF-8").equals(key)) {
                     return "";