X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Feditor%2Fhandles%2FHandleManager.java;h=0a33509c3a72613b509016589ec4213289e76abb;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=f3ef9a88f1df491ec37253d0539e4ad6136724c2;hpb=a47c9b1f38bbb6d2f5a3c482f3b09d1f42270401;p=Mograsim.git diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java index f3ef9a88..0a33509c 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java @@ -15,10 +15,11 @@ import java.util.stream.Collectors; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.editor.Editor; import net.mograsim.logic.model.editor.states.EditorState; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.editor.util.PrioritySet; +import net.mograsim.logic.model.model.LogicModelModifiable; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; @@ -26,19 +27,17 @@ public class HandleManager { private final Map handlePerPin; private final Map handlePerInterfacePin; - private final Map> pointHandlesPerWire; - private final Map handlePerWire; + private final Map> pointHandlesPerWire; + private final Map handlePerWire; private final Set handles; private final Set wirePointHandles; - private final Map handlePerComp; + private final Map handlePerComp; private final Collection> handleAddedListeners; private final Collection> handleRemovedListeners; private final Editor editor; private boolean initialized = false; - private CornerHandle cornerHandle; - public HandleManager(Editor editor) { this.editor = editor; @@ -46,14 +45,14 @@ public class HandleManager handlePerInterfacePin = new HashMap<>(); pointHandlesPerWire = new HashMap<>(); handlePerComp = new HashMap<>(); - handles = new HashSet<>(); + handles = new PrioritySet<>((a, b) -> Integer.compare(a.getPriority(), b.getPriority())); wirePointHandles = new HashSet<>(); handlePerWire = new HashMap<>(); handleAddedListeners = new ArrayList<>(); handleRemovedListeners = new ArrayList<>(); - ViewModelModifiable model = editor.getSubmodel(); + LogicModelModifiable model = editor.getSubmodel(); model.addComponentAddedListener(c -> registerComponent(c)); @@ -84,27 +83,27 @@ public class HandleManager System.err.println("Warning! HandleManager was already initialized."); else { - ViewModelModifiable model = editor.getSubmodel(); - Map compsByName = model.getComponentsByName(); - Set comps = new HashSet<>(compsByName.values()); - GUIComponent interfaceComp = compsByName.get(SubmodelComponent.SUBMODEL_INTERFACE_NAME); + LogicModelModifiable model = editor.getSubmodel(); + Map compsByName = model.getComponentsByName(); + Set comps = new HashSet<>(compsByName.values()); + ModelComponent interfaceComp = compsByName.get(SubmodelComponent.SUBMODEL_INTERFACE_NAME); comps.remove(interfaceComp); registerInterfaceComponent(interfaceComp); comps.forEach(c -> registerComponent(c)); model.getWiresByName().values().forEach(w -> registerWire(w)); - addHandle(cornerHandle = new CornerHandle(editor.toBeEdited)); + addHandle(new CornerHandle(editor.toBeEdited)); } } - private void registerInterfaceComponent(GUIComponent c) + private void registerInterfaceComponent(ModelComponent c) { c.getPins().values().forEach(p -> addInterfacePinHandle(p)); c.addPinAddedListener(p -> addInterfacePinHandle(p)); c.addPinRemovedListener(p -> removeInterfacePinHandle(p)); } - private void registerComponent(GUIComponent c) + private void registerComponent(ModelComponent c) { addComponentHandle(c); @@ -114,7 +113,7 @@ public class HandleManager c.addPinRemovedListener(p -> removePinHandle(p)); } - private void registerWire(GUIWire wire) + private void registerWire(ModelWire wire) { Point[] path = wire.getPath(); AtomicInteger oldLength = new AtomicInteger(path == null ? 0 : path.length); @@ -153,14 +152,14 @@ public class HandleManager // -- Adding/Removing handles -- /// /////////////////////////////////// - private void addComponentHandle(GUIComponent c) + private void addComponentHandle(ModelComponent c) { - ComponentHandle h = new ComponentHandle(c); + ComponentHandle h = new ComponentHandle(editor.getSubmodel(), c); handlePerComp.put(c, h); addHandle(h); } - private void removeComponentHandle(GUIComponent c) + private void removeComponentHandle(ModelComponent c) { ComponentHandle h = handlePerComp.get(c); handlePerComp.remove(c); @@ -198,7 +197,7 @@ public class HandleManager removeHandle(h); } - private void addWirePointHandle(GUIWire w) + private void addWirePointHandle(ModelWire w) { List wireHandles = pointHandlesPerWire.get(w); WirePointHandle h; @@ -215,7 +214,7 @@ public class HandleManager addHandle(h); } - void destroyWirePointHandle(GUIWire owner, WirePointHandle h) + void destroyWirePointHandle(ModelWire owner, WirePointHandle h) { if (pointHandlesPerWire.containsKey(owner)) { @@ -227,7 +226,7 @@ public class HandleManager } } - private void removeWirePointHandles(GUIWire owner) + private void removeWirePointHandles(ModelWire owner) { if (!pointHandlesPerWire.containsKey(owner)) return; @@ -239,14 +238,14 @@ public class HandleManager pointHandlesPerWire.remove(owner); } - private void addWireHandle(GUIWire w) + private void addWireHandle(ModelWire w) { - WireHandle h = new WireHandle(w); + WireHandle h = new WireHandle(editor.getSubmodel(), w); handlePerWire.put(w, h); addHandle(h); } - private void removeWireHandle(GUIWire w) + private void removeWireHandle(ModelWire w) { WireHandle h = handlePerWire.get(w); handlePerWire.remove(w); @@ -271,12 +270,12 @@ public class HandleManager return handlePerPin.get(parent); } - public ComponentHandle getHandle(GUIComponent parent) + public ComponentHandle getHandle(ModelComponent parent) { return handlePerComp.get(parent); } - public WireHandle getHandle(GUIWire parent) + public WireHandle getHandle(ModelWire parent) { return handlePerWire.get(parent); } @@ -289,7 +288,7 @@ public class HandleManager /** * @return A Collection of the registered {@link WirePointHandle}s of the specified wire */ - public Collection getWirePointHandles(GUIWire parent) + public Collection getWirePointHandles(ModelWire parent) { return pointHandlesPerWire.get(parent).stream().collect(Collectors.toSet()); } @@ -345,15 +344,9 @@ public class HandleManager public void click(Point clicked, int stateMask) { EditorState entryState = editor.stateManager.getState(); - - // TODO: As soon as wires connected to a component being removed also are removed, change priority - if (!cornerHandle.click(clicked.x, clicked.y, stateMask, entryState)) - if (!click(handlePerPin.values(), clicked, entryState, stateMask)) - if (!click(handlePerInterfacePin.values(), clicked, entryState, stateMask)) - if (!click(getWirePointHandles(), clicked, entryState, stateMask)) - if (!click(getWireHandles(), clicked, entryState, stateMask)) - if (!click(handlePerComp.values(), clicked, entryState, stateMask)) - entryState.clickedEmpty(clicked, stateMask); + // TODO: As soon as wires connected to a component being removed also are removed, change priority) + if (!click(handles, clicked, entryState, stateMask)) + entryState.clickedEmpty(clicked, stateMask); entryState.clicked(clicked, stateMask); }