[Android] Make some inner classes static

Edward Wang git at videolan.org
Wed Jul 16 19:12:18 CEST 2014


vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Wed Jul 16 13:10:37 2014 -0400| [e1e092e9c8657932c4012ef025a705fc718eea64] | committer: Edward Wang

Make some inner classes static

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=e1e092e9c8657932c4012ef025a705fc718eea64
---

 vlc-android/src/org/videolan/libvlc/MediaList.java                   |    2 +-
 vlc-android/src/org/videolan/vlc/MediaLibrary.java                   |    2 +-
 vlc-android/src/org/videolan/vlc/gui/AboutFragment.java              |    2 +-
 vlc-android/src/org/videolan/vlc/gui/BrowserActivity.java            |    2 +-
 .../src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java     |    2 +-
 .../src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java      |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vlc-android/src/org/videolan/libvlc/MediaList.java b/vlc-android/src/org/videolan/libvlc/MediaList.java
index 1889481..85b2d2a 100644
--- a/vlc-android/src/org/videolan/libvlc/MediaList.java
+++ b/vlc-android/src/org/videolan/libvlc/MediaList.java
@@ -32,7 +32,7 @@ public class MediaList {
 
     /* Since the libvlc_media_t is not created until the media plays, we have
      * to cache them here. */
-    private class MediaHolder {
+    private static class MediaHolder {
         Media m;
         boolean noVideo; // default false
         boolean noHardwareAcceleration; // default false
diff --git a/vlc-android/src/org/videolan/vlc/MediaLibrary.java b/vlc-android/src/org/videolan/vlc/MediaLibrary.java
index 797ba42..29a1a0b 100644
--- a/vlc-android/src/org/videolan/vlc/MediaLibrary.java
+++ b/vlc-android/src/org/videolan/vlc/MediaLibrary.java
@@ -384,7 +384,7 @@ public class MediaLibrary {
     /**
      * Filters all irrelevant files
      */
-    private class MediaItemFilter implements FileFilter {
+    private static class MediaItemFilter implements FileFilter {
 
         @Override
         public boolean accept(File f) {
diff --git a/vlc-android/src/org/videolan/vlc/gui/AboutFragment.java b/vlc-android/src/org/videolan/vlc/gui/AboutFragment.java
index 2a20397..d1a0417 100644
--- a/vlc-android/src/org/videolan/vlc/gui/AboutFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/AboutFragment.java
@@ -129,7 +129,7 @@ public class AboutFragment extends Fragment {
         return v;
     }
 
-    private class DummyContentFactory implements TabHost.TabContentFactory {
+    private static class DummyContentFactory implements TabHost.TabContentFactory {
         private final Context mContext;
         public DummyContentFactory(Context ctx) {
             mContext = ctx;
diff --git a/vlc-android/src/org/videolan/vlc/gui/BrowserActivity.java b/vlc-android/src/org/videolan/vlc/gui/BrowserActivity.java
index d6f3122..8a33357 100644
--- a/vlc-android/src/org/videolan/vlc/gui/BrowserActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/BrowserActivity.java
@@ -64,7 +64,7 @@ public class BrowserActivity extends ListActivity {
     private final Stack<ScrollState> mScrollStates = new Stack<ScrollState>();
     private String mRoots[];
 
-    private class ScrollState {
+    private static class ScrollState {
         public ScrollState(int index, int top) {
             this.index = index;
             this.top = top;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java
index 4851c4d..e4967b9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioAlbumsSongsFragment.java
@@ -169,7 +169,7 @@ public class AudioAlbumsSongsFragment extends Fragment {
         return v;
     }
 
-    private class DummyContentFactory implements TabHost.TabContentFactory {
+    private static class DummyContentFactory implements TabHost.TabContentFactory {
         private final Context mContext;
         public DummyContentFactory(Context ctx) {
             mContext = ctx;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java
index e6f64d9..c51d1ed 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserListAdapter.java
@@ -307,7 +307,7 @@ public class AudioBrowserListAdapter extends BaseAdapter implements SectionIndex
         return v;
     }
 
-    class ViewHolder {
+    static class ViewHolder {
         View layout;
         ImageView cover;
         TextView title;



More information about the Android mailing list