Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Ebola16 committed Jan 17, 2020
1 parent aca3d39 commit 6a4923a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@ public class Settings
static
{
configFileSectionsMap.put(SettingsFile.FILE_NAME_DOLPHIN,
Arrays.asList(SECTION_INI_GENERAL, SECTION_INI_CORE, SECTION_INI_INTERFACE, SECTION_INI_DSP,
SECTION_BINDINGS, SECTION_ANALYTICS, SECTION_DEBUG));
Arrays.asList(SECTION_INI_GENERAL, SECTION_INI_CORE, SECTION_INI_INTERFACE,
SECTION_INI_DSP,
SECTION_BINDINGS, SECTION_ANALYTICS, SECTION_DEBUG));
configFileSectionsMap.put(SettingsFile.FILE_NAME_GFX,
Arrays.asList(SECTION_GFX_SETTINGS, SECTION_GFX_ENHANCEMENTS, SECTION_GFX_HACKS,
SECTION_STEREOSCOPY));
Arrays.asList(SECTION_GFX_SETTINGS, SECTION_GFX_ENHANCEMENTS, SECTION_GFX_HACKS,
SECTION_STEREOSCOPY));
configFileSectionsMap.put(SettingsFile.FILE_NAME_WIIMOTE,
Arrays.asList(SECTION_WIIMOTE + 1, SECTION_WIIMOTE + 2, SECTION_WIIMOTE + 3,
SECTION_WIIMOTE + 4));
Arrays.asList(SECTION_WIIMOTE + 1, SECTION_WIIMOTE + 2, SECTION_WIIMOTE + 3,
SECTION_WIIMOTE + 4));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public final class FilePicker extends SettingsItem
private boolean mIsDirectory;

public FilePicker(String key, String section, int titleId, int descriptionId,
String defaultVault, boolean isDirectory, Setting setting)
String defaultVault, boolean isDirectory, Setting setting)
{
super(key, section, setting, titleId, descriptionId);
mDefaultValue = defaultVault;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ public void onFilePickerSingleFileClick(SettingsItem item)
public static void onFilePickerConfirmation(String file)
{
NativeLibrary
.SetConfig(SettingsFile.FILE_NAME_DOLPHIN + ".ini", mItem.getSection(), mItem.getKey(), file);
.SetConfig(SettingsFile.FILE_NAME_DOLPHIN + ".ini", mItem.getSection(), mItem.getKey(),
file);
NativeLibrary.ReloadConfig();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,17 +330,17 @@ private void addPathsSettings(ArrayList<SettingsItem> sl)
wiiSDCardPath = generalSection.getSetting(SettingsFile.KEY_WII_SD_CARD_PATH);

sl.add(new FilePicker(SettingsFile.KEY_DEFAULT_ISO, Settings.SECTION_INI_CORE,
R.string.default_ISO, 0, null, false, defaultISO));
R.string.default_ISO, 0, null, false, defaultISO));
sl.add(new FilePicker(SettingsFile.KEY_NAND_ROOT_PATH, Settings.SECTION_INI_GENERAL,
R.string.wii_NAND_root, 0, getDefaultNANDRootPath(), true, NANDRootPath));
R.string.wii_NAND_root, 0, getDefaultNANDRootPath(), true, NANDRootPath));
sl.add(new FilePicker(SettingsFile.KEY_DUMP_PATH, Settings.SECTION_INI_GENERAL,
R.string.dump_path, 0, getDefaultDumpPath(), true, dumpPath));
R.string.dump_path, 0, getDefaultDumpPath(), true, dumpPath));
sl.add(new FilePicker(SettingsFile.KEY_LOAD_PATH, Settings.SECTION_INI_GENERAL,
R.string.load_path, 0, getDefaultLoadPath(), true, loadPath));
R.string.load_path, 0, getDefaultLoadPath(), true, loadPath));
sl.add(new FilePicker(SettingsFile.KEY_RESOURCE_PACK_PATH, Settings.SECTION_INI_GENERAL,
R.string.resource_pack_path, 0, getDefaultResourcePackPath(), true, resourcePackPath));
R.string.resource_pack_path, 0, getDefaultResourcePackPath(), true, resourcePackPath));
sl.add(new FilePicker(SettingsFile.KEY_WII_SD_CARD_PATH, Settings.SECTION_INI_GENERAL,
R.string.SD_card_path, 0, getDefaultSDPath(), false, wiiSDCardPath));
R.string.SD_card_path, 0, getDefaultSDPath(), false, wiiSDCardPath));
}

private void addGameCubeSettings(ArrayList<SettingsItem> sl)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public void bind(SettingsItem item)
else
{
mTextSettingDescription.setText(NativeLibrary
.GetConfig(SettingsFile.FILE_NAME_DOLPHIN + ".ini", item.getSection(), item.getKey(),
((FilePicker) item).getSelectedValue()));
.GetConfig(SettingsFile.FILE_NAME_DOLPHIN + ".ini", item.getSection(), item.getKey(),
((FilePicker) item).getSelectedValue()));
}
}

Expand Down

0 comments on commit 6a4923a

Please sign in to comment.