From fb1fcb06005e925f6c1ebabeb1f31007bc86a48c Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Sun, 6 Jul 2014 13:48:38 +0200 Subject: Increased use of library methods --- src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java | 8 +++++--- src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/de/danoeh/antennapod/fragment/gpodnet') diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java index 79d0c5d6f..080436aa6 100644 --- a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java +++ b/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java @@ -4,6 +4,9 @@ import android.os.Bundle; import android.support.v7.widget.SearchView; import android.view.Menu; import android.view.MenuInflater; + +import org.apache.commons.lang3.Validate; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.fragment.SearchFragment; @@ -68,9 +71,8 @@ public class SearchListFragment extends PodcastListFragment { } public void changeQuery(String query) { - if (query == null) { - throw new NullPointerException(); - } + Validate.notNull(query); + this.query = query; loadData(); } diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java index f016290bf..204dda992 100644 --- a/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java +++ b/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java @@ -1,6 +1,9 @@ package de.danoeh.antennapod.fragment.gpodnet; import android.os.Bundle; + +import org.apache.commons.lang3.Validate; + import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.gpoddernet.GpodnetService; import de.danoeh.antennapod.gpoddernet.GpodnetServiceException; @@ -21,7 +24,7 @@ public class TagFragment extends PodcastListFragment { private GpodnetTag tag; public static TagFragment newInstance(String tagName) { - if (tagName == null) throw new IllegalArgumentException("tagName = null"); + Validate.notNull(tagName); TagFragment fragment = new TagFragment(); Bundle args = new Bundle(); args.putString("tag", tagName); @@ -34,7 +37,7 @@ public class TagFragment extends PodcastListFragment { super.onCreate(savedInstanceState); Bundle args = getArguments(); - if (args == null || args.getString("tag") == null) throw new IllegalArgumentException("args invalid"); + Validate.isTrue(args != null && args.getString("tag") != null, "args invalid"); tag = new GpodnetTag(args.getString("tag")); ((MainActivity) getActivity()).getMainActivtyActionBar().setTitle(tag.getName()); -- cgit v1.2.3