|
|
@@ -16,7 +16,7 @@ import org.leumasjaffe.charsheet.model.observable.BoolGate;
|
|
|
import org.leumasjaffe.charsheet.model.observable.IntValue;
|
|
|
import org.leumasjaffe.event.SelectTableRowPopupMenuListener;
|
|
|
import org.leumasjaffe.format.StringHelper;
|
|
|
-import org.leumasjaffe.observer.ObservableListener;
|
|
|
+import org.leumasjaffe.observer.IndirectObservableListener;
|
|
|
import org.leumasjaffe.observer.ObserverDispatch;
|
|
|
|
|
|
import lombok.AccessLevel;
|
|
|
@@ -86,7 +86,7 @@ public class SelectSpellsPanel extends JPanel {
|
|
|
BoolGate.Handle gate;
|
|
|
JTable tablePrepared, tableKnown;
|
|
|
|
|
|
- ObservableListener<JTable, SpellPicker> listener;
|
|
|
+ IndirectObservableListener<JTable, SpellPicker> listener;
|
|
|
|
|
|
public SelectSpellsPanel(SpellPicker pick, BoolGate.Handle gate, int level,
|
|
|
Collection<DDSpell> prepared, IntValue sharedValue) {
|
|
|
@@ -191,12 +191,12 @@ public class SelectSpellsPanel extends JPanel {
|
|
|
|
|
|
button_1.addActionListener(e -> insertSpell());
|
|
|
|
|
|
- listener = new ObservableListener<>(tableKnown, (c, v) -> {
|
|
|
+ listener = new IndirectObservableListener<>(tableKnown, (c, v) -> {
|
|
|
known.clear();
|
|
|
known.addAll(v.getAvailableSpells(level));
|
|
|
this.modelKnown.data = createModel(known);
|
|
|
});
|
|
|
- listener.setObserved(pick);
|
|
|
+ listener.setObserved(pick, pick, pick.getInfo().spellBook);
|
|
|
}
|
|
|
|
|
|
private void removeSpell() {
|