From ec3813fb137eb3a6cf9c2a95396042fe2f05196c Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 21 Jan 2014 14:31:53 +0000 Subject: [PATCH] - Fix getCbRandomArtInPools returning the wrong checkbox. - Some more renaming. --- .../java/forge/gui/home/settings/CSubmenuPreferences.java | 2 +- .../java/forge/gui/home/settings/VSubmenuPreferences.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java index 494a4c68854..d550bd640c4 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java @@ -67,7 +67,7 @@ public enum CSubmenuPreferences implements ICDoc { lstControls.add(Pair.of(view.getCbAnte(), FPref.UI_ANTE)); lstControls.add(Pair.of(view.getCbManaBurn(), FPref.UI_MANABURN)); lstControls.add(Pair.of(view.getCbScaleLarger(), FPref.UI_SCALE_LARGER)); - lstControls.add(Pair.of(view.getCbRandomArtPools(), FPref.UI_RANDOM_ART_IN_POOLS)); + lstControls.add(Pair.of(view.getCbRandomArtInPools(), FPref.UI_RANDOM_ART_IN_POOLS)); lstControls.add(Pair.of(view.getCbEnforceDeckLegality(), FPref.ENFORCE_DECK_LEGALITY)); lstControls.add(Pair.of(view.getCbCloneImgSource(), FPref.UI_CLONE_MODE_SOURCE)); lstControls.add(Pair.of(view.getCbRemoveSmall(), FPref.DECKGEN_NOSMALL)); diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java index f7cc08ac841..a155916e71d 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java @@ -79,7 +79,7 @@ public enum VSubmenuPreferences implements IVSubmenu { private final JCheckBox cbCloneImgSource = new OptionsCheckBox("Clones Use Original Card Art"); private final JCheckBox cbScaleLarger = new OptionsCheckBox("Scale Image Larger"); private final JCheckBox cbRandomFoil = new OptionsCheckBox("Random Foil"); - private final JCheckBox cbRandomArtPools = new OptionsCheckBox("Randomize Card Art in Generated Card Pools"); + private final JCheckBox cbRandomArtInPools = new OptionsCheckBox("Randomize Card Art in Generated Card Pools"); private final JCheckBox cbEnableSounds = new OptionsCheckBox("Enable Sounds"); private final JCheckBox cbAltSoundSystem = new OptionsCheckBox("Use Alternate Sound System"); private final JCheckBox cbUiForTouchScreen = new OptionsCheckBox("Enchance UI for Touchscreens"); @@ -193,7 +193,7 @@ public enum VSubmenuPreferences implements IVSubmenu { pnlPrefs.add(cbScaleLarger, regularConstraints); pnlPrefs.add(new NoteLabel("Allows card pictures to be expanded larger than their original size."), regularConstraints); - pnlPrefs.add(cbRandomArtPools, regularConstraints); + pnlPrefs.add(cbRandomArtInPools, regularConstraints); pnlPrefs.add(new NoteLabel("Generates cards with random art in generated limited mode card pools."), regularConstraints); pnlPrefs.add(cbUiForTouchScreen, regularConstraints); @@ -446,8 +446,8 @@ public enum VSubmenuPreferences implements IVSubmenu { } /** @return {@link javax.swing.JCheckBox} */ - public JCheckBox getCbRandomArtPools() { - return cbScaleLarger; + public JCheckBox getCbRandomArtInPools() { + return cbRandomArtInPools; } /** @return {@link javax.swing.JCheckBox} */