Browse Source

Update summary page correctly on Level Up

Sam Jaffe 8 years ago
parent
commit
3a7ee2ba37

+ 3 - 1
src/main/lombok/org/leumasjaffe/charsheet/view/D20Sheet.java

@@ -202,6 +202,7 @@ public class D20Sheet extends JFrame {
 	}
 	}
 	
 	
 	private void reloadModel() {
 	private void reloadModel() {
+		this.summaryTab.setModel(this.model);
 		int i = -1;
 		int i = -1;
 		for (DDCharacterClass cc : this.model.getClasses()) {
 		for (DDCharacterClass cc : this.model.getClasses()) {
 			++i;
 			++i;
@@ -210,8 +211,9 @@ public class D20Sheet extends JFrame {
 			classTabs.add(ct);
 			classTabs.add(ct);
 			tabbedPane.insertTab(ct.getName(), null, ct, null, TABS_BEFORE_CLASSES + i);
 			tabbedPane.insertTab(ct.getName(), null, ct, null, TABS_BEFORE_CLASSES + i);
 		}
 		}
+		this.listener.notifySubscribers(this.model);
 	}
 	}
-
+	
 	private boolean checkIfClassExistsAndOverwrite(DDCharacterClass cc) {
 	private boolean checkIfClassExistsAndOverwrite(DDCharacterClass cc) {
 		for (int j = 0; j < classTabs.size(); ++j) {
 		for (int j = 0; j < classTabs.size(); ++j) {
 			final DDCharacterClass dclass = classTabs.get(j).getModel();
 			final DDCharacterClass dclass = classTabs.get(j).getModel();

+ 1 - 1
src/main/lombok/org/leumasjaffe/charsheet/view/summary/AttackLine.java

@@ -242,7 +242,7 @@ public class AttackLine extends JPanel {
 		final int misc = 0;
 		final int misc = 0;
 		this.baseAttack.setText(StringHelper.toString(bab));
 		this.baseAttack.setText(StringHelper.toString(bab));
 		final Ability.Scores str = model.getAbilities().getStr();
 		final Ability.Scores str = model.getAbilities().getStr();
-		gTtlObserver.setObserved(model, str);
+		gTtlObserver.setObserved(model, model, str);
 		gStrObserver.setObserved(str);
 		gStrObserver.setObserved(str);
 		this.grappleSize.setText(StringHelper.toString(size));
 		this.grappleSize.setText(StringHelper.toString(size));
 		this.grappleMisc.setText(StringHelper.toString(misc));
 		this.grappleMisc.setText(StringHelper.toString(misc));

+ 2 - 2
src/main/lombok/org/leumasjaffe/charsheet/view/summary/ResistanceLine.java

@@ -236,8 +236,8 @@ public class ResistanceLine extends JPanel {
 	
 	
 	public void setModel(DDCharacter model) {
 	public void setModel(DDCharacter model) {
 		final Ability.Scores abil = access.apply(model.getAbilities());
 		final Ability.Scores abil = access.apply(model.getAbilities());
-		totalObserver.setObserved(model, abil);
-		baseObserver.setObserved(model, abil);
+		totalObserver.setObserved(model, model, abil);
+		baseObserver.setObserved(model, model, abil);
 		abilObserver.setObserved(abil);
 		abilObserver.setObserved(abil);
 	}
 	}