yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Nikolay Pultsin 2014-05-03 02:21:58 +01:00
parent 471cef831c
commit 9f9b0ce63a
3 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserPreference.java
View file

@ -25,7 +25,6 @@ import android.content.Intent;
import android.preference.Preference; import android.preference.Preference;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.util.MiscUtil;
import org.geometerplus.android.util.FileChooserUtil; import org.geometerplus.android.util.FileChooserUtil;
@ -58,20 +57,5 @@ abstract class FileChooserPreference extends Preference {
} }
protected abstract String getStringValue(); protected abstract String getStringValue();
protected abstract void setValueFromIntent(Intent data); protected abstract void setValueFromIntent(Intent data);
protected final void setValue(String value) {
if (MiscUtil.isEmptyString(value)) {
return;
}
setValueInternal(value);
if (myOnValueSetAction != null) {
myOnValueSetAction.run();
}
}
protected abstract void setValueInternal(String value);
} }

12
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringListPreference.java
View file

@ -49,15 +49,19 @@ class FileChooserStringListPreference extends FileChooserPreference {
@Override @Override
protected void setValueFromIntent(Intent data) { protected void setValueFromIntent(Intent data) {
setValue(FileChooserUtil.pathFromData(data)); final String value = FileChooserUtil.pathFromData(data);
} if (MiscUtil.isEmptyString(value)) {
return;
}
@Override
protected void setValueInternal(String value) {
final List<String> currentValues = myOption.getValue(); final List<String> currentValues = myOption.getValue();
if (currentValues.size() != 1 || !currentValues.get(0).equals(value)) { if (currentValues.size() != 1 || !currentValues.get(0).equals(value)) {
myOption.setValue(Collections.singletonList(value)); myOption.setValue(Collections.singletonList(value));
setSummary(getStringValue()); setSummary(getStringValue());
} }
if (myOnValueSetAction != null) {
myOnValueSetAction.run();
}
} }
} }

13
src/org/geometerplus/android/fbreader/preferences/fileChooser/FileChooserStringPreference.java
View file

@ -24,6 +24,7 @@ import android.content.Intent;
import org.geometerplus.zlibrary.core.options.ZLStringOption; import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.util.MiscUtil;
import org.geometerplus.android.util.FileChooserUtil; import org.geometerplus.android.util.FileChooserUtil;
@ -44,15 +45,19 @@ class FileChooserStringPreference extends FileChooserPreference {
@Override @Override
protected void setValueFromIntent(Intent data) { protected void setValueFromIntent(Intent data) {
setValue(FileChooserUtil.pathFromData(data)); final String value = FileChooserUtil.pathFromData(data);
} if (MiscUtil.isEmptyString(value)) {
return;
}
@Override
protected void setValueInternal(String value) {
final String currentValue = myOption.getValue(); final String currentValue = myOption.getValue();
if (!currentValue.equals(value)) { if (!currentValue.equals(value)) {
myOption.setValue(value); myOption.setValue(value);
setSummary(value); setSummary(value);
} }
if (myOnValueSetAction != null) {
myOnValueSetAction.run();
}
} }
} }