[Android] Rename variables
Jean-Baptiste Kempf
git at videolan.org
Wed Jul 4 12:40:52 CEST 2012
android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jul 4 11:30:42 2012 +0200| [6057de718dbf461c5d6ae6a32286745c54b25691] | committer: Jean-Baptiste Kempf
Rename variables
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=6057de718dbf461c5d6ae6a32286745c54b25691
---
vlc-android/src/org/videolan/vlc/Media.java | 12 ++++++------
vlc-android/src/org/videolan/vlc/MediaLibrary.java | 2 +-
vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/vlc-android/src/org/videolan/vlc/Media.java b/vlc-android/src/org/videolan/vlc/Media.java
index 07e2c54..b5eb7aa 100644
--- a/vlc-android/src/org/videolan/vlc/Media.java
+++ b/vlc-android/src/org/videolan/vlc/Media.java
@@ -30,8 +30,8 @@ public class Media implements Comparable<Media> {
public final static String TAG = "VLC/MediaItem";
- public final static HashSet<String> EXTENTIONS;
- public final static String EXTENTIONS_REGEX;
+ public final static HashSet<String> EXTENSIONS;
+ public final static String EXTENSIONS_REGEX;
public final static HashSet<String> FOLDER_BLACKLIST;
static {
@@ -60,11 +60,11 @@ public class Media implements Comparable<Media> {
"/media/audio/ringtones",
"/Android/data/" };
- EXTENTIONS = new HashSet<String>();
+ EXTENSIONS = new HashSet<String>();
for (String item : video_extensions)
- EXTENTIONS.add(item);
+ EXTENSIONS.add(item);
for (String item : audio_extensions)
- EXTENTIONS.add(item);
+ EXTENSIONS.add(item);
StringBuilder sb = new StringBuilder(115);
sb.append(".+(\\.)((?i)(");
@@ -78,7 +78,7 @@ public class Media implements Comparable<Media> {
sb.append(audio_extensions[i].substring(1));
}
sb.append("))");
- EXTENTIONS_REGEX = sb.toString();
+ EXTENSIONS_REGEX = sb.toString();
FOLDER_BLACKLIST = new HashSet<String>();
for (String item : folder_blacklist)
FOLDER_BLACKLIST.add(android.os.Environment.getExternalStorageDirectory().getPath() + item);
diff --git a/vlc-android/src/org/videolan/vlc/MediaLibrary.java b/vlc-android/src/org/videolan/vlc/MediaLibrary.java
index 9a5e099..41625e9 100644
--- a/vlc-android/src/org/videolan/vlc/MediaLibrary.java
+++ b/vlc-android/src/org/videolan/vlc/MediaLibrary.java
@@ -283,7 +283,7 @@ public class MediaLibrary {
int dotIndex = fileName.lastIndexOf(".");
if (dotIndex != -1) {
String fileExt = fileName.substring(dotIndex);
- accepted = Media.EXTENTIONS.contains(fileExt);
+ accepted = Media.EXTENSIONS.contains(fileExt);
}
}
}
diff --git a/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java b/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
index 6dc7588..989d9ae 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
@@ -47,7 +47,7 @@ public class DirectoryAdapter extends BaseAdapter {
public final static String TAG = "VLC/DirectoryAdapter";
public static boolean acceptedPath(String f) {
- return Pattern.compile(Media.EXTENTIONS_REGEX, Pattern.CASE_INSENSITIVE).matcher(f).matches();
+ return Pattern.compile(Media.EXTENSIONS_REGEX, Pattern.CASE_INSENSITIVE).matcher(f).matches();
}
/**
More information about the Android
mailing list