Increased use of library methods

3 files changed, 13 insertions, 11 deletions

diff --git a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java b/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
index 1c5003ab3..21ae5291e 100644
--- a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
+++ b/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
@@ -5,6 +5,9 @@ import android.content.*;
 import android.os.Handler;
 import android.os.IBinder;
 import android.util.Log;
+
+import org.apache.commons.lang3.Validate;
+
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.service.download.DownloadService;
 import de.danoeh.antennapod.service.download.Downloader;
@@ -45,9 +48,9 @@ public class DownloadObserver {
      * @throws java.lang.IllegalArgumentException if one of the arguments is null.
      */
     public DownloadObserver(Activity activity, Handler handler, Callback callback) {
-        if (activity == null) throw new IllegalArgumentException("activity = null");
-        if (handler == null) throw new IllegalArgumentException("handler = null");
-        if (callback == null) throw new IllegalArgumentException("callback = null");
+        Validate.notNull(activity);
+        Validate.notNull(handler);
+        Validate.notNull(callback);
 
         this.activity = activity;
         this.handler = handler;
@@ -166,7 +169,7 @@ public class DownloadObserver {
     }
 
     public void setActivity(Activity activity) {
-        if (activity == null) throw new IllegalArgumentException("activity = null");
+        Validate.notNull(activity);
         this.activity = activity;
     }
 
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
index 06828944c..9210ac1d1 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
@@ -11,6 +11,7 @@ import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.Toast;
 
+import org.apache.commons.lang3.Validate;
 import org.shredzone.flattr4j.exception.FlattrException;
 
 import java.util.LinkedList;
@@ -65,7 +66,7 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
      * @param context A context for accessing the database and posting notifications. Must not be null.
      */
     public FlattrClickWorker(Context context) {
-        if (context == null) throw new IllegalArgumentException("context = null");
+        Validate.notNull(context);
         this.context = context.getApplicationContext();
     }
 
diff --git a/src/de/danoeh/antennapod/asynctask/ImageDiskCache.java b/src/de/danoeh/antennapod/asynctask/ImageDiskCache.java
index 1d069daa5..77609f28b 100644
--- a/src/de/danoeh/antennapod/asynctask/ImageDiskCache.java
+++ b/src/de/danoeh/antennapod/asynctask/ImageDiskCache.java
@@ -11,6 +11,7 @@ import de.danoeh.antennapod.service.download.DownloadRequest;
 import de.danoeh.antennapod.service.download.HttpDownloader;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -48,9 +49,8 @@ public class ImageDiskCache {
      * Return an instance of an ImageDiskCache that stores images in the specified folder.
      */
     public static synchronized ImageDiskCache getInstance(String path, long maxCacheSize) {
-        if (path == null) {
-            throw new NullPointerException();
-        }
+        Validate.notNull(path);
+
         if (cacheSingletons.containsKey(path)) {
             return cacheSingletons.get(path);
         }
@@ -358,9 +358,7 @@ public class ImageDiskCache {
         private final long size;
 
         public DiskCacheObject(String fileUrl, long size) {
-            if (fileUrl == null) {
-                throw new NullPointerException();
-            }
+            Validate.notNull(fileUrl);
             this.fileUrl = fileUrl;
             this.timestamp = System.currentTimeMillis();
             this.size = size;