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

move session-only isStatsVisible out of GeneralConfig.

master
lodici 2017-07-10 12:13:05 +01:00
parent 10a7db2c4e
commit 3a7536d6f4
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,6 @@ public class GeneralConfig {
private Properties settings;
private boolean isMissingFiles = false;
private boolean isStatsVisible = true;
private GeneralConfig() { }
@ -561,14 +560,6 @@ public class GeneralConfig {
setProperty(GAME_VOLUME, value);
}
public boolean isStatsVisible() {
return isStatsVisible;
}
public void setStatsVisible(boolean b) {
isStatsVisible = b;
}
public boolean getImagesOnDemand() {
return getBoolean(IMAGES_ON_DEMAND, false);
}

10
src/magic/ui/widget/deck/stats/DeckStatisticsViewer.java
View File

@ -11,7 +11,6 @@ import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import magic.data.CardStatistics;
import magic.data.GeneralConfig;
import magic.data.MagicIcon;
import magic.model.DuelPlayerConfig;
import magic.model.MagicDeck;
@ -31,6 +30,8 @@ public class DeckStatisticsViewer extends JPanel implements ChangeListener {
private static final String _S1 = "Deck Statistics";
private static final String _S2 = "%d card deck";
private static boolean isStatsVisible = true;
private final ActionButtonTitleBar titleBar;
private final ManaCurvePanel manaCurvePanel;
private final ActionBarButton titlebarButton;
@ -48,7 +49,7 @@ public class DeckStatisticsViewer extends JPanel implements ChangeListener {
statsTable = new StatsTable();
manaCurvePanel = new ManaCurvePanel();
setStatsVisible(GeneralConfig.getInstance().isStatsVisible());
setStatsVisible(isStatsVisible);
setDeck(new MagicDeck());
@ -77,9 +78,8 @@ public class DeckStatisticsViewer extends JPanel implements ChangeListener {
}
private void switchStatsVisibility() {
GeneralConfig config = GeneralConfig.getInstance();
config.setStatsVisible(!config.isStatsVisible());
setStatsVisible(config.isStatsVisible());
isStatsVisible = !isStatsVisible;
setStatsVisible(isStatsVisible);
refreshLayout();
firePropertyChange(CP_LAYOUT_CHANGED, true, false);
}