From ad31df723c335d9e2fd9d180ee5c14591a6aaf37 Mon Sep 17 00:00:00 2001 From: Omertron Date: Sun, 1 Apr 2012 09:08:03 +0000 Subject: [PATCH] Caught new image exception error --- .../themoviedb/MovieDbException.java | 2 +- .../moviejukebox/themoviedb/TheMovieDb.java | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java index fcd9a938d..832203c04 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/MovieDbException.java @@ -6,7 +6,7 @@ public class MovieDbException extends Exception { public enum MovieDbExceptionType { - UNKNOWN_CAUSE, INVALID_URL, HTTP_404_ERROR, MOVIE_ID_NOT_FOUND, MAPPING_FAILED, CONNECTION_ERROR; + UNKNOWN_CAUSE, INVALID_URL, HTTP_404_ERROR, MOVIE_ID_NOT_FOUND, MAPPING_FAILED, CONNECTION_ERROR, INVALID_IMAGE; } private final MovieDbExceptionType exceptionType; private final String response; diff --git a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java index a34775eac..e15b25023 100644 --- a/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java +++ b/themoviedbapi/src/main/java/com/moviejukebox/themoviedb/TheMovieDb.java @@ -423,24 +423,18 @@ public class TheMovieDb { * @return */ public URL createImageUrl(String imagePath, String requiredSize) throws MovieDbException { - URL returnUrl = null; - StringBuilder sb; - if (!tmdbConfig.isValidSize(requiredSize)) { - sb = new StringBuilder(); - sb.append(" - Invalid size requested: ").append(requiredSize); - LOGGER.warn(sb.toString()); - return returnUrl; + throw new MovieDbException(MovieDbExceptionType.INVALID_IMAGE, requiredSize); } + StringBuilder sb = new StringBuilder(tmdbConfig.getBaseUrl()); + sb.append(requiredSize); + sb.append(imagePath); try { - sb = new StringBuilder(tmdbConfig.getBaseUrl()); - sb.append(requiredSize); - sb.append(imagePath); return (new URL(sb.toString())); } catch (MalformedURLException ex) { LOGGER.warn("Failed to create image URL: " + ex.getMessage()); - throw new MovieDbException(MovieDbExceptionType.INVALID_URL, returnUrl.toString()); + throw new MovieDbException(MovieDbExceptionType.INVALID_URL, sb.toString()); } } @@ -584,7 +578,7 @@ public class TheMovieDb { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webPage); } } - + public List getNowPlayingMovies() throws MovieDbException { return getNowPlayingMovies(""); }