From 99a1110f68c9abaeb04925b33518193c9eae90c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1niel?= <Dániel@kovax-pc>
Date: Wed, 27 Nov 2013 16:24:21 +0100
Subject: [PATCH] =?UTF-8?q?PostLoad=20Input=20Negative=20Assigment=20(PINA?=
=?UTF-8?q?)=20patch=20Jav=C3=ADtott=20usekrezel=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
settings2.dat | Bin 411 -> 440 bytes
src/GUI/settings/Controller.java | 1 +
src/GUI/settings/Model.java | 10 +++++++++-
src/Program/Settings.java | 17 +++++++++++++++--
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/settings2.dat b/settings2.dat
index 131979d294d0adc57b10ac0fb8627e0b547e2ad2..f3f84bafa0f4e45428da95d31d7f559fca04ee25 100644
GIT binary patch
delta 96
zcmbQuyn}gy1jm%FUwmTTM|~zL{N|m;qr<?!U{=DwY?4|uS(7o;nyH+Hfq{XkxR9Za
ufh`CkZ(PE_8=9Awn46jskds)MS_G10uP9;QElw>d$;?YHHquK;ECB!z*c%rB
delta 67
zcmdnNJezrf1jm^JLFwGnr*ckI_{}%<#|H)mhPo04mh_CQ^vN2Gp|XtSEDQ_`jD-w!
X4D1yp47|muB_)}8>BUBRDTyTj`hXPx
diff --git a/src/GUI/settings/Controller.java b/src/GUI/settings/Controller.java
index b395f24..b452fbd 100644
--- a/src/GUI/settings/Controller.java
+++ b/src/GUI/settings/Controller.java
@@ -23,6 +23,7 @@ public class Controller
{
this.settings = settings;
this.progSettings = progsettings;
+
}
void setModel(Model settingsModel)
diff --git a/src/GUI/settings/Model.java b/src/GUI/settings/Model.java
index a47e26c..6d069e1 100644
--- a/src/GUI/settings/Model.java
+++ b/src/GUI/settings/Model.java
@@ -69,7 +69,15 @@ public class Model
void setPlayerName(String text) {
// this.tempSettings.playerName=text;
- this.tempSettings.actualPlayer.name = text;
+ //this.tempSettings.actualPlayer.name = text;
+ Player player = new Player();
+ player.date = this.tempSettings.actualPlayer.date;
+ player.maxScore = this.tempSettings.actualPlayer.maxScore;
+ player.name = text;
+
+ this.tempSettings.actualPlayer = player;
+
+ //this.tempSettings.setActualPlayer(player);
}
int getSettingsDiff() {
diff --git a/src/Program/Settings.java b/src/Program/Settings.java
index 5b7745a..59f5098 100644
--- a/src/Program/Settings.java
+++ b/src/Program/Settings.java
@@ -29,7 +29,10 @@ public class Settings implements Serializable
public String saveFileName;
public ArrayList<Player> players;
-
+ public void setActualPlayer(Player actualPlayer)
+ {
+ this.actualPlayer = actualPlayer;
+ }
public Settings(Settings progSettings)
{
this.size = progSettings.size;
@@ -66,6 +69,16 @@ public class Settings implements Serializable
this.saveFileName = "settings2.dat";
}
+
+ public void postLoadPatch()
+ {
+ Player player = new Player();
+ player.date = this.actualPlayer.date;
+ player.maxScore = this.actualPlayer.maxScore;
+ player.name = this.actualPlayer.name;
+
+ this.actualPlayer = player;
+ }
public void setBoardSize(int newSize) {
this.size = newSize;
@@ -100,7 +113,7 @@ public class Settings implements Serializable
in.close();
fileIn.close();
-
+ this.postLoadPatch();
}
catch(IOException i)
{
--
GitLab