Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make get/set methods static in GeneralConfig.

master
lodici 2017-07-12 14:12:00 +01:00
parent 048f251a13
commit 3967fc1571
7 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/magic/data/GeneralConfig.java
View File

@ -185,30 +185,30 @@ public class GeneralConfig {
//---------------------------------------------------------------------
// boolean
public boolean get(BooleanSetting setting) {
return getProperty(setting.getKey(), setting.getDefault());
public static boolean get(BooleanSetting setting) {
return INSTANCE.getProperty(setting.getKey(), setting.getDefault());
}
public void set(BooleanSetting setting, boolean value) {
setProperty(setting.getKey(), value);
public static void set(BooleanSetting setting, boolean value) {
INSTANCE.setProperty(setting.getKey(), value);
}
// integer
public int get(IntegerSetting setting) {
return getProperty(setting.getKey(), setting.getDefault());
public static int get(IntegerSetting setting) {
return INSTANCE.getProperty(setting.getKey(), setting.getDefault());
}
public void set(IntegerSetting setting, int value) {
setProperty(setting.getKey(), value);
public static void set(IntegerSetting setting, int value) {
INSTANCE.setProperty(setting.getKey(), value);
}
// string
public String get(StringSetting setting) {
return getProperty(setting.getKey(), setting.getDefault());
public static String get(StringSetting setting) {
return INSTANCE.getProperty(setting.getKey(), setting.getDefault());
}
public void set(StringSetting setting, String value) {
setProperty(setting.getKey(), value);
public static void set(StringSetting setting, String value) {
INSTANCE.setProperty(setting.getKey(), value);
}
//---------------------------------------------------------------------

2
src/magic/ui/MagicSound.java
View File

@ -127,7 +127,7 @@ public enum MagicSound {
System.err.println("WARNING. Unable to play clip " + url.toExternalForm() + ", " + ex.getMessage());
// turn off all sound permanently.
config.setGameVolume(0);
config.set(IntegerSetting.UI_VOLUME, 0);
GeneralConfig.set(IntegerSetting.UI_VOLUME, 0);
config.save();
}
}

4
src/magic/ui/MagicStickyFrame.java
View File

@ -112,7 +112,7 @@ class MagicStickyFrame extends JFrame {
setMinimumSize(MIN_SIZE);
setSizableFrameState();
if (config.get(BooleanSetting.MAXIMIZE_FRAME) == true) {
if (GeneralConfig.get(BooleanSetting.MAXIMIZE_FRAME) == true) {
setExtendedState(JFrame.MAXIMIZED_BOTH);
}
@ -129,7 +129,7 @@ class MagicStickyFrame extends JFrame {
protected void saveSizeAndPosition() {
config.set(BooleanSetting.MAXIMIZE_FRAME, isMaximized());
GeneralConfig.set(BooleanSetting.MAXIMIZE_FRAME, isMaximized());
config.setFullScreen(isFullScreen());
if (getExtendedState() == Frame.NORMAL) {

2
src/magic/ui/dialog/prefs/AudioPanel.java
View File

@ -44,7 +44,7 @@ class AudioPanel extends JPanel {
}
void saveSettings() {
config.set(IntegerSetting.UI_VOLUME, uiVolumeSlider.getValue());
GeneralConfig.set(IntegerSetting.UI_VOLUME, uiVolumeSlider.getValue());
config.setGameVolume(gameVolumeSlider.getValue());
}

3
src/magic/ui/screen/keywords/KeywordsScreen.java
View File

@ -22,8 +22,7 @@ public class KeywordsScreen extends HeaderFooterScreen {
}
private void doSaveSettings() {
final GeneralConfig config = GeneralConfig.getInstance();
config.set(StringSetting.KEYWORDS_SCREEN, ScreenLayout.getLayout().name());
GeneralConfig.set(StringSetting.KEYWORDS_SCREEN, ScreenLayout.getLayout().name());
}
private void setContent() {

2
src/magic/ui/screen/keywords/ScreenLayout.java
View File

@ -19,7 +19,7 @@ enum ScreenLayout {
private static ScreenLayout layout;
static {
try {
final String setting = GeneralConfig.getInstance().get(StringSetting.KEYWORDS_SCREEN);
final String setting = GeneralConfig.get(StringSetting.KEYWORDS_SCREEN);
layout = setting.isEmpty() ? Layout_A : valueOf(setting);
} catch (Exception ex) {
System.err.println(ex);

2
src/magic/utility/DeckParser.java
View File

@ -28,7 +28,7 @@ public final class DeckParser {
return deck;
}
final int MAX_LINES = GeneralConfig.getInstance().get(IntegerSetting.DECK_MAX_LINES);
final int MAX_LINES = GeneralConfig.get(IntegerSetting.DECK_MAX_LINES);
if (textLines.size() > MAX_LINES) {
deck.setInvalidDeck(MText.get(_S2, MAX_LINES));
return deck;