From 3967fc1571bcf93e402568ed2e46e61b6e5c7cbf Mon Sep 17 00:00:00 2001 From: lodici Date: Wed, 12 Jul 2017 14:12:00 +0100 Subject: [PATCH] make get/set methods static in GeneralConfig. --- src/magic/data/GeneralConfig.java | 24 +++++++++---------- src/magic/ui/MagicSound.java | 2 +- src/magic/ui/MagicStickyFrame.java | 4 ++-- src/magic/ui/dialog/prefs/AudioPanel.java | 2 +- .../ui/screen/keywords/KeywordsScreen.java | 3 +-- .../ui/screen/keywords/ScreenLayout.java | 2 +- src/magic/utility/DeckParser.java | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/magic/data/GeneralConfig.java b/src/magic/data/GeneralConfig.java index 0fe2343e5c..0743effc06 100644 --- a/src/magic/data/GeneralConfig.java +++ b/src/magic/data/GeneralConfig.java @@ -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); } //--------------------------------------------------------------------- diff --git a/src/magic/ui/MagicSound.java b/src/magic/ui/MagicSound.java index 77c237bd0e..8583795c60 100644 --- a/src/magic/ui/MagicSound.java +++ b/src/magic/ui/MagicSound.java @@ -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(); } } diff --git a/src/magic/ui/MagicStickyFrame.java b/src/magic/ui/MagicStickyFrame.java index 5f773d1b7e..62f2f2973f 100644 --- a/src/magic/ui/MagicStickyFrame.java +++ b/src/magic/ui/MagicStickyFrame.java @@ -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) { diff --git a/src/magic/ui/dialog/prefs/AudioPanel.java b/src/magic/ui/dialog/prefs/AudioPanel.java index 2fb6ef4543..4976a75f4f 100644 --- a/src/magic/ui/dialog/prefs/AudioPanel.java +++ b/src/magic/ui/dialog/prefs/AudioPanel.java @@ -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()); } diff --git a/src/magic/ui/screen/keywords/KeywordsScreen.java b/src/magic/ui/screen/keywords/KeywordsScreen.java index 6a9abaee54..e2edafb35d 100644 --- a/src/magic/ui/screen/keywords/KeywordsScreen.java +++ b/src/magic/ui/screen/keywords/KeywordsScreen.java @@ -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() { diff --git a/src/magic/ui/screen/keywords/ScreenLayout.java b/src/magic/ui/screen/keywords/ScreenLayout.java index a96ee9558e..f1b5f7ff60 100644 --- a/src/magic/ui/screen/keywords/ScreenLayout.java +++ b/src/magic/ui/screen/keywords/ScreenLayout.java @@ -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); diff --git a/src/magic/utility/DeckParser.java b/src/magic/utility/DeckParser.java index 7c133d2e19..44cae8f931 100644 --- a/src/magic/utility/DeckParser.java +++ b/src/magic/utility/DeckParser.java @@ -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;