From 1d976cd634f3ccb036b925ee8ae0af0fee59afd9 Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Thu, 3 Apr 2014 00:02:27 +0200 Subject: [PATCH] Set attributes protected instead of private --- .../filepicker/AbstractFilePickerActivity.java | 8 ++++---- .../filepicker/AbstractFilePickerFragment.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java index ba6a3ae..c6a2f98 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java @@ -67,7 +67,7 @@ public abstract class AbstractFilePickerActivity extends Activity implements public static final String EXTRA_ALLOW_MULTIPLE = "android.intent.extra" + ".ALLOW_MULTIPLE"; public static final String EXTRA_PATHS = "nononsense.intent.PATHS"; - private static final String TAG = "filepicker_fragment"; + protected static final String TAG = "filepicker_fragment"; public static final int MODE_FILE = AbstractFilePickerFragment.MODE_FILE; public static final int MODE_FILE_AND_DIR = AbstractFilePickerFragment @@ -75,7 +75,7 @@ public abstract class AbstractFilePickerActivity extends Activity implements public static final int MODE_DIR = AbstractFilePickerFragment.MODE_DIR; - private String startPath = null; + protected String startPath = null; protected int mode = AbstractFilePickerFragment.MODE_FILE; protected boolean allowCreateDir = false; protected boolean allowMultiple = false; @@ -111,7 +111,7 @@ public abstract class AbstractFilePickerActivity extends Activity implements setResult(Activity.RESULT_CANCELED); } - private void setupFauxDialog() { + protected void setupFauxDialog() { // Check if this should be a dialog TypedValue tv = new TypedValue(); if (!getTheme().resolveAttribute(R.attr.isDialog, tv, true) || tv.data == 0) { @@ -131,7 +131,7 @@ public abstract class AbstractFilePickerActivity extends Activity implements getWindow().setAttributes(params); } - private void setupActionBar() { + protected void setupActionBar() { getActionBar().setTitle(getWindowTitle()); } diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java index 889acca..9b821f8 100644 --- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java +++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java @@ -67,7 +67,7 @@ public abstract class AbstractFilePickerFragment extends // Allow multiple items to be selected. public static final String KEY_ALLOW_MULTIPLE = "KEY_ALLOW_MULTIPLE"; // Used for saving state. - private static final String KEY_CURRENT_PATH = "KEY_CURRENT PATH"; + protected static final String KEY_CURRENT_PATH = "KEY_CURRENT PATH"; protected final DefaultHashMap checkedItems; protected T currentPath = null; protected boolean allowCreateDir = false; @@ -146,7 +146,7 @@ public abstract class AbstractFilePickerFragment extends setHasOptionsMenu(true); } - private boolean isCheckable(final T data) { + protected boolean isCheckable(final T data) { final boolean checkable; if (isDir(data)) { checkable = ((mode == MODE_DIR && allowMultiple) || @@ -248,7 +248,7 @@ public abstract class AbstractFilePickerFragment extends return view; } - private List toUri(List files) { + protected List toUri(List files) { ArrayList uris = new ArrayList(); for (T file : files) { uris.add(toUri(file)); @@ -302,7 +302,7 @@ public abstract class AbstractFilePickerFragment extends } } - private void toggleItemCheck(final CheckedTextView view, + protected void toggleItemCheck(final CheckedTextView view, final int position, final T data) { if (!isCheckable(data)) { return;