From a01445c3f64971a15830bd192ea6af9ebe141bd7 Mon Sep 17 00:00:00 2001 From: slapshot5 Date: Sat, 7 Jan 2012 07:13:59 +0000 Subject: [PATCH] remove references to OldGuiNewGame --- .../java/forge/properties/ForgePreferences.java | 4 ++-- .../java/forge/view/swing/ApplicationView.java | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/forge/properties/ForgePreferences.java b/src/main/java/forge/properties/ForgePreferences.java index 726753494c8..eb4ec4a5850 100644 --- a/src/main/java/forge/properties/ForgePreferences.java +++ b/src/main/java/forge/properties/ForgePreferences.java @@ -146,10 +146,10 @@ public class ForgePreferences extends Preferences { this.setPlayForAnte(this.getBoolean("play.for.ante", false)); this.setUILayout(this.get("gui.layout", "")); this.setStackAiLand(this.getBoolean("AI.stack.land", false)); - this.setMillingLossCondition(this.getBoolean("loss.condition.milling", true)); + this.setMillingLossCondition(this.getBoolean("loss.condition.milling", false)); this.setHandView(this.getBoolean("developer.handview", true)); this.setLibraryView(this.getBoolean("developer.libraryview", true)); - this.setUnlimitedLand(this.getBoolean("developer.unlimitedland", true)); + this.setUnlimitedLand(this.getBoolean("developer.unlimitedland", false)); this.setDeveloperMode(this.getBoolean("developer.mode", false)); this.setUploadDraftAI(this.getBoolean("upload.Draft.AI", true)); diff --git a/src/main/java/forge/view/swing/ApplicationView.java b/src/main/java/forge/view/swing/ApplicationView.java index 0f235e4873d..268138e1089 100644 --- a/src/main/java/forge/view/swing/ApplicationView.java +++ b/src/main/java/forge/view/swing/ApplicationView.java @@ -39,9 +39,6 @@ import forge.properties.ForgePreferences; import forge.view.FView; import forge.view.GuiTopLevel; import forge.view.home.SplashFrame; -import forge.view.swing.OldGuiNewGame.CardSizesAction; -import forge.view.swing.OldGuiNewGame.CardStackAction; -import forge.view.swing.OldGuiNewGame.CardStackOffsetAction; import forge.view.toolbox.FSkin; /** @@ -116,20 +113,9 @@ public class ApplicationView implements FView { final ForgePreferences preferences = model.getPreferences(); - OldGuiNewGame.getSmoothLandCheckBox().setSelected(preferences.isStackAiLand()); - OldGuiNewGame.getDevModeCheckBox().setSelected(preferences.isDeveloperMode()); - OldGuiNewGame.getCardOverlay().setSelected(preferences.isCardOverlay()); - // FindBugs doesn't like the next line. ImageCache.setScaleLargerThanOriginal(preferences.isScaleLargerThanOriginal()); - OldGuiNewGame.getCardScale().setSelected(preferences.isScaleLargerThanOriginal()); - CardStackOffsetAction.set(preferences.getStackOffset()); - CardStackAction.setVal(preferences.getMaxStackSize()); - CardSizesAction.set(preferences.getCardSize()); - OldGuiNewGame.getUpldDrftCheckBox().setSelected(preferences.isUploadDraftAI()); - OldGuiNewGame.getFoilRandomCheckBox().setSelected(preferences.isRandCFoil()); - } catch (final Exception exn) { Log.error("Error loading preferences: " + exn); }