From b4eece7ace43887978da96a9af2890d0a6a32609 Mon Sep 17 00:00:00 2001
From: Mohammed Le Doze <mohammed.ledoze@gmail.com>
Date: Mon, 18 Oct 2010 09:31:35 +0000
Subject: [PATCH] removed category.setType("") in MovieDbParser.parseCategories
 so that this field keeps its UNKNOWN value added getDefaultLanguage in
 TheMovieDb updated javadoc

---
 .../moviejukebox/themoviedb/TheMovieDb.java   | 39 +++++++++++++++++--
 .../themoviedb/tools/MovieDbParser.java       |  1 -
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
index 62077b004..8ea884585 100644
--- a/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
+++ b/themoviedbapi/src/com/moviejukebox/themoviedb/TheMovieDb.java
@@ -12,11 +12,10 @@
  */
 package com.moviejukebox.themoviedb;
 
-import com.moviejukebox.themoviedb.model.Category;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -25,12 +24,12 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.moviejukebox.themoviedb.model.Category;
 import com.moviejukebox.themoviedb.model.MovieDB;
 import com.moviejukebox.themoviedb.model.Person;
 import com.moviejukebox.themoviedb.tools.MovieDbParser;
 import com.moviejukebox.themoviedb.tools.LogFormatter;
 import com.moviejukebox.themoviedb.tools.WebBrowser;
-import java.util.Arrays;
 
 /**
  * This is the main class for the API to connect to TheMovieDb.org.
@@ -63,14 +62,27 @@ public class TheMovieDb {
 
     public TheMovieDb(String apiKey) {
         setLogger(Logger.getLogger("TheMovieDB"));
+        if (!isValidString(apiKey)) {
+            logger.severe("TheMovieDb was initialized with a wrong API key!");
+        }
         setApiKey(apiKey);
     }
 
     public TheMovieDb(String apiKey, Logger logger) {
         setLogger(logger);
+        if (!isValidString(apiKey)) {
+            logger.severe("TheMovieDb was initialized with a wrong API key!");
+        }
         setApiKey(apiKey);
     }
 
+    /**
+     * Set proxy parameters.
+     * @param host proxy host URL
+     * @param port proxy port
+     * @param username proxy username
+     * @param password proxy password
+     */
     public void setProxy(String host, String port, String username, String password) {
         WebBrowser.setProxyHost(host);
         WebBrowser.setProxyPort(port);
@@ -78,6 +90,11 @@ public class TheMovieDb {
         WebBrowser.setProxyPassword(password);
     }
 
+    /**
+     * Set web browser timeout.
+     * @param webTimeoutConnect
+     * @param webTimeoutRead
+     */
     public void setTimeout(int webTimeoutConnect, int webTimeoutRead) {
         WebBrowser.setWebTimeoutConnect(webTimeoutConnect);
         WebBrowser.setWebTimeoutRead(webTimeoutRead);
@@ -100,15 +117,31 @@ public class TheMovieDb {
         logger.setLevel(Level.ALL);
     }
 
+    /**
+     * Return the API key.
+     * @return
+     */
     public String getApiKey() {
         return apiKey;
     }
 
+    /**
+     * Set the TMDb API key.
+     * @param apiKey a valid TMDb API key.
+     */
     public void setApiKey(String apiKey) {
         this.apiKey = apiKey;
         tmdbFormatter.addApiKey(apiKey);
     }
 
+    /**
+     * Return the TMDb default language: en-US.
+     * @return
+     */
+    public String getDefaultLanguage() {
+        return defaultLanguage;
+    }
+
     /**
      * Searches the database using the movie title passed
      * 
diff --git a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/MovieDbParser.java b/themoviedbapi/src/com/moviejukebox/themoviedb/tools/MovieDbParser.java
index 6eee3ffcf..14eacfa24 100644
--- a/themoviedbapi/src/com/moviejukebox/themoviedb/tools/MovieDbParser.java
+++ b/themoviedbapi/src/com/moviejukebox/themoviedb/tools/MovieDbParser.java
@@ -478,7 +478,6 @@ public class MovieDbParser {
                 category.setName(element.getAttribute("name"));
                 category.setId(DOMHelper.getValueFromElement(element, "id"));
                 category.setUrl(DOMHelper.getValueFromElement(element, "url"));
-                category.setType(""); // there are no type in the XML
                 categories.add(category);
             }
         }