From 7bae6756a65930dd17db2028baa2dacd67333187 Mon Sep 17 00:00:00 2001
From: Omertron <Stuart.Boston@Gmail.com>
Date: Wed, 20 Jul 2011 20:01:57 +0000
Subject: [PATCH] Tidied up some methods Removed some Sonar Critical issues

---
 .../moviejukebox/themoviedb/TheMovieDb.java   |  4 +--
 .../themoviedb/model/Artwork.java             | 16 ++++++++++++
 .../moviejukebox/themoviedb/tools/Base64.java | 26 +++++++++----------
 .../themoviedb/tools/MovieDbParser.java       |  4 ---
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
index 8b219788a..1e6c41198 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java
@@ -424,9 +424,7 @@ public class TheMovieDb {
      * @return          A movie bean with all of the information
      */
     public MovieDB moviedbGetInfo(String tmdbID, String language) {
-        MovieDB movie = null;
-        movie = moviedbGetInfo(tmdbID, movie, language);
-        return movie;
+        return moviedbGetInfo(tmdbID, new MovieDB(), language);
     }
 
     /**
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
index 79872791b..61f7b3309 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/model/Artwork.java
@@ -116,4 +116,20 @@ public class Artwork implements Comparable<Object> {
         builder.append("]]");
         return builder.toString();
     }
+
+   
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Artwork other = (Artwork)obj;
+        if (id != other.id)
+            return false;
+        return true;
+    }
  }
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/Base64.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/Base64.java
index 8af02639e..b6f54b773 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/Base64.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/Base64.java
@@ -13,28 +13,26 @@
 package com.moviejukebox.themoviedb.tools;
 
 public class Base64 {
-    public static String base64code = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
-        "abcdefghijklmnopqrstuvwxyz" + "0123456789" + "+/";
+    public static String base64code = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789" + "+/";
 
     public static int splitLinesAt = 76;
-    public static String base64Encode(String string) {
 
-        String encoded = "";
+    public static String base64Encode(String string) {
+        String unEncoded = string; // Copy the string so we can modify it
+        StringBuffer encoded = new StringBuffer();
         // determine how many padding bytes to add to the output
-        int paddingCount = (3 - (string.length() % 3)) % 3;
+        int paddingCount = (3 - (unEncoded.length() % 3)) % 3;
         // add any necessary padding to the input
-        string += "\0\0".substring(0, paddingCount);
+        unEncoded += "\0\0".substring(0, paddingCount);
         // process 3 bytes at a time, churning out 4 output bytes
         // worry about CRLF insertions later
-        for (int i = 0; i < string.length(); i += 3) {
-            int j = (string.charAt(i) << 16) + (string.charAt(i + 1) << 8) + string.charAt(i + 2);
-            encoded = encoded + base64code.charAt((j >> 18) & 0x3f) +
-                base64code.charAt((j >> 12) & 0x3f) +
-                base64code.charAt((j >> 6) & 0x3f) +
-                base64code.charAt(j & 0x3f);
+        for (int i = 0; i < unEncoded.length(); i += 3) {
+            int j = (unEncoded.charAt(i) << 16) + (unEncoded.charAt(i + 1) << 8) + unEncoded.charAt(i + 2);
+            encoded.append(base64code.charAt((j >> 18) & 0x3f) + base64code.charAt((j >> 12) & 0x3f) + base64code.charAt((j >> 6) & 0x3f)
+                            + base64code.charAt(j & 0x3f));
         }
         // replace encoded padding nulls with "="
         // return encoded;
-        return "Basic " + encoded;
+        return "Basic " + encoded.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/MovieDbParser.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/MovieDbParser.java
index 40ff0c443..3827995a5 100644
--- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/MovieDbParser.java
+++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/tools/MovieDbParser.java
@@ -136,8 +136,6 @@ public class MovieDbParser {
 
         Node node = nlMovies.item(0);
         if (node.getNodeType() == Node.ELEMENT_NODE) {
-            movie = new MovieDB();
-
             Element element = (Element) node;
             movie = MovieDbParser.parseSimpleMovie(element);
         }
@@ -168,8 +166,6 @@ public class MovieDbParser {
 
         Node node = nlMovies.item(0);
         if (node.getNodeType() == Node.ELEMENT_NODE) {
-            person = new Person();
-
             Element element = (Element) node;
             person = MovieDbParser.parseSimplePerson(element);
         }