Skip to content

Commit

Permalink
Merge pull request #194 from DecwLK/cut_copy_paste_rewrite
Browse files Browse the repository at this point in the history 
Cut copy paste rewrite
  • Loading branch information
@benjymin
benjymin authored Mar 10, 2024
2 parents 9bed177 + 855d7e8 commit 8c045cb
Show file tree
Hide file tree
Showing 27 changed files with 595 additions and 187 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/gecko/actions/ActionFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ public MoveSystemConnectionViewModelElementAction createMoveSystemConnectionView
elementScalerBlock, portViewModel, isVariableBlock);
}

public PastePositionableViewModelElementAction createPastePositionableViewModelElementAction() {
return new PastePositionableViewModelElementAction(geckoViewModel);
public PastePositionableViewModelElementAction createPastePositionableViewModelElementAction(Point2D center) {
return new PastePositionableViewModelElementAction(geckoViewModel, center);
}

public RenameViewModelElementAction createRenameViewModelElementAction(Renamable renamable, String name) {
Expand Down
37 changes: 33 additions & 4 deletions src/main/java/org/gecko/actions/CopyPositionableViewModelElementAction.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
package org.gecko.actions;

import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.gecko.exceptions.GeckoException;
import org.gecko.model.Edge;
import org.gecko.model.Element;
import org.gecko.model.System;
import org.gecko.model.SystemConnection;
import org.gecko.viewmodel.GeckoViewModel;
import org.gecko.viewmodel.PositionableViewModelElement;

public class CopyPositionableViewModelElementAction extends Action {
GeckoViewModel geckoViewModel;
Expand All @@ -14,10 +22,31 @@ public class CopyPositionableViewModelElementAction extends Action {
boolean run() throws GeckoException {
CopyPositionableViewModelElementVisitor visitor = new CopyPositionableViewModelElementVisitor(geckoViewModel);

geckoViewModel.getCurrentEditor()
.getSelectionManager()
.getCurrentSelection()
.forEach(element -> element.accept(visitor));
Set<PositionableViewModelElement<?>> copyQueue =
geckoViewModel.getCurrentEditor().getSelectionManager().getCurrentSelection();
Set<Element> elementToCopy =
copyQueue.stream().map(PositionableViewModelElement::getTarget).collect(Collectors.toSet());
for (Edge edge : geckoViewModel.getCurrentEditor().getCurrentSystem().getTarget().getAutomaton().getEdges()) {
if (elementToCopy.contains(edge.getSource()) && elementToCopy.contains(edge.getDestination())) {
copyQueue.add(geckoViewModel.getViewModelElement(edge));
}
}
for (SystemConnection connection : geckoViewModel.getCurrentEditor()
.getCurrentSystem()
.getTarget()
.getConnections()) {
System sourceSystem = geckoViewModel.getGeckoModel().getSystemWithVariable(connection.getSource());
System destinationSystem =
geckoViewModel.getGeckoModel().getSystemWithVariable(connection.getDestination());
if (elementToCopy.contains(sourceSystem) && elementToCopy.contains(destinationSystem)) {
copyQueue.add(geckoViewModel.getViewModelElement(connection));
}
}
do {
visitor.getFailedCopies().clear();
copyQueue.forEach(element -> element.accept(visitor));
copyQueue = new HashSet<>(visitor.getFailedCopies());
} while (!copyQueue.isEmpty());

geckoViewModel.getActionManager().setCopyVisitor(visitor);
return true;
Expand Down
152 changes: 104 additions & 48 deletions src/main/java/org/gecko/actions/CopyPositionableViewModelElementVisitor.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
package org.gecko.actions;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javafx.geometry.Point2D;
import javafx.util.Pair;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import org.gecko.exceptions.ModelException;
import org.gecko.model.Contract;
import org.gecko.model.Edge;
import org.gecko.model.Element;
Expand All @@ -17,6 +21,7 @@
import org.gecko.viewmodel.EdgeViewModel;
import org.gecko.viewmodel.GeckoViewModel;
import org.gecko.viewmodel.PortViewModel;
import org.gecko.viewmodel.PositionableViewModelElement;
import org.gecko.viewmodel.PositionableViewModelElementVisitor;
import org.gecko.viewmodel.RegionViewModel;
import org.gecko.viewmodel.StateViewModel;
Expand All @@ -29,90 +34,141 @@ public class CopyPositionableViewModelElementVisitor implements PositionableView
@Getter(AccessLevel.NONE)
private GeckoViewModel geckoViewModel;
private boolean isAutomatonCopy;
private HashMap<State, State> copiedStates;
private HashMap<System, System> copiedSystems;
private HashMap<Region, Region> copiedRegions;
private HashMap<Edge, Edge> copiedEdges;
private HashMap<SystemConnection, SystemConnection> copiedSystemConnections;
private HashMap<Variable, Variable> copiedPorts;
private HashMap<Contract, Contract> copiedContracts;
private HashMap<Element, Pair<Point2D, Point2D>> copiedPosAndSize;
private HashMap<Element, Element> originalToClipboard;
private HashMap<Element, Pair<Point2D, Point2D>> elementToPosAndSize;
@Getter
private Set<PositionableViewModelElement<?>> failedCopies;
private final Set<Element> copiedElements;

public CopyPositionableViewModelElementVisitor(GeckoViewModel geckoViewModel) {
this.geckoViewModel = geckoViewModel;
isAutomatonCopy = geckoViewModel.getCurrentEditor().isAutomatonEditor();
copiedStates = new HashMap<>();
copiedSystems = new HashMap<>();
copiedRegions = new HashMap<>();
copiedEdges = new HashMap<>();
copiedSystemConnections = new HashMap<>();
copiedPorts = new HashMap<>();
copiedContracts = new HashMap<>();
copiedPosAndSize = new HashMap<>();
originalToClipboard = new HashMap<>();
elementToPosAndSize = new HashMap<>();
copiedElements = new HashSet<>();
failedCopies = new HashSet<>();
}

@Override
public Void visit(SystemViewModel systemViewModel) {
copiedSystems.put(systemViewModel.getTarget(),
geckoViewModel.getGeckoModel().getModelFactory().copySystem(systemViewModel.getTarget()));
copiedPosAndSize.put(systemViewModel.getTarget(),
new Pair<>(systemViewModel.getPosition(), systemViewModel.getSize()));
for (PortViewModel p : systemViewModel.getPorts()) {
if (copiedPorts.get(p.getTarget()) == null) {
continue;
}
copiedPorts.put(p.getTarget(),
geckoViewModel.getGeckoModel().getModelFactory().copyVariable(p.getTarget()));
copiedPosAndSize.put(p.getTarget(), new Pair<>(p.getPosition(), p.getSize()));
System original = systemViewModel.getTarget();
Pair<System, Map<Element, Element>> copyResult;
System copy;
try {
copyResult = geckoViewModel.getGeckoModel().getModelFactory().copySystem(systemViewModel.getTarget());
} catch (ModelException e) {
failedCopies.add(systemViewModel);
return null;
}
copy = copyResult.getKey();
originalToClipboard.putAll(copyResult.getValue());
originalToClipboard.put(original, copy);
savePositionRecursively(original);
copiedElements.add(copy);
return null;
}

@Override
public Void visit(RegionViewModel regionViewModel) {
copiedRegions.put(regionViewModel.getTarget(),
geckoViewModel.getGeckoModel().getModelFactory().copyRegion(regionViewModel.getTarget()));
copiedPosAndSize.put(regionViewModel.getTarget(),
new Pair<>(regionViewModel.getPosition(), regionViewModel.getSize()));
Region original = regionViewModel.getTarget();
Region copy = geckoViewModel.getGeckoModel().getModelFactory().copyRegion(original);
originalToClipboard.put(original, copy);
savePositionAndSize(copy, regionViewModel);
copiedElements.add(copy);
return null;
}

@Override
public Void visit(EdgeViewModel edgeViewModel) {
var selection = geckoViewModel.getCurrentEditor().getSelectionManager().getCurrentSelection();
Set<PositionableViewModelElement<?>> selection =
geckoViewModel.getCurrentEditor().getSelectionManager().getCurrentSelection();
if (selection.contains(edgeViewModel.getSource()) && selection.contains(edgeViewModel.getDestination())) {
copiedEdges.put(edgeViewModel.getTarget(),
geckoViewModel.getGeckoModel().getModelFactory().copyEdge(edgeViewModel.getTarget()));
Edge original = edgeViewModel.getTarget();
Edge copy = geckoViewModel.getGeckoModel().getModelFactory().copyEdge(original);
State sourceOnClipboard = (State) originalToClipboard.get(original.getSource());
State destinationOnClipboard = (State) originalToClipboard.get(original.getDestination());
Contract contractOnClipboard = (Contract) originalToClipboard.get(original.getContract());
if (sourceOnClipboard == null || destinationOnClipboard == null) {
failedCopies.add(edgeViewModel);
return null;
}
copy.setSource(sourceOnClipboard);
copy.setDestination(destinationOnClipboard);
copy.setContract(contractOnClipboard);
originalToClipboard.put(original, copy);
copiedElements.add(copy);
}
return null;
}

@Override
public Void visit(StateViewModel stateViewModel) {
copiedStates.put(stateViewModel.getTarget(),
geckoViewModel.getGeckoModel().getModelFactory().copyState(stateViewModel.getTarget()));
copiedPosAndSize.put(stateViewModel.getTarget(),
new Pair<>(stateViewModel.getPosition(), stateViewModel.getSize()));
for (Contract c : stateViewModel.getTarget().getContracts()) {
copiedContracts.put(c, geckoViewModel.getGeckoModel().getModelFactory().copyContract(c));
}
for (EdgeViewModel evm : stateViewModel.getOutgoingEdges()) {
evm.accept(this);
}
State original = stateViewModel.getTarget();
Pair<State, Map<Contract, Contract>> copyResult =
geckoViewModel.getGeckoModel().getModelFactory().copyState(original);
State copy = copyResult.getKey();
originalToClipboard.putAll(copyResult.getValue());
originalToClipboard.put(original, copy);
savePositionAndSize(copy, stateViewModel);
copiedElements.add(copy);
return null;
}

@Override
public Void visit(PortViewModel portViewModel) {
copiedPorts.put(portViewModel.getTarget(),
geckoViewModel.getGeckoModel().getModelFactory().copyVariable(portViewModel.getTarget()));
copiedPosAndSize.put(portViewModel.getTarget(),
new Pair<>(portViewModel.getPosition(), portViewModel.getSize()));
return null;
}

@Override
public Void visit(SystemConnectionViewModel systemConnectionViewModel) {
Set<PositionableViewModelElement<?>> selection =
geckoViewModel.getCurrentEditor().getSelectionManager().getCurrentSelection();
SystemViewModel sourceSystemViewModel = (SystemViewModel) geckoViewModel.getViewModelElement(
geckoViewModel.getCurrentEditor()
.getCurrentSystem()
.getTarget()
.getChildSystemWithVariable(systemConnectionViewModel.getTarget().getSource()));
SystemViewModel destinationSystemViewModel = (SystemViewModel) geckoViewModel.getViewModelElement(
geckoViewModel.getCurrentEditor()
.getCurrentSystem()
.getTarget()
.getChildSystemWithVariable(systemConnectionViewModel.getTarget().getDestination()));
if (selection.contains(sourceSystemViewModel) && selection.contains(destinationSystemViewModel)) {
SystemConnection original = systemConnectionViewModel.getTarget();
SystemConnection copy = geckoViewModel.getGeckoModel().getModelFactory().copySystemConnection(original);
Variable sourceOnClipboard = (Variable) originalToClipboard.get(original.getSource());
Variable destinationOnClipboard = (Variable) originalToClipboard.get(original.getDestination());
if (sourceOnClipboard == null || destinationOnClipboard == null) {
failedCopies.add(systemConnectionViewModel);
return null;
}
try {
copy.setSource(sourceOnClipboard);
copy.setDestination(destinationOnClipboard);
} catch (ModelException e) {
throw new RuntimeException(e);
}
originalToClipboard.put(original, copy);
copiedElements.add(copy);
}
return null;
}

private void savePositionRecursively(System original) {
System copy = (System) originalToClipboard.get(original);
savePositionAndSize(copy, geckoViewModel.getViewModelElement(original));
for (State state : original.getAutomaton().getStates()) {
savePositionAndSize(originalToClipboard.get(state), geckoViewModel.getViewModelElement(state));
}
for (Region region : original.getAutomaton().getRegions()) {
savePositionAndSize(originalToClipboard.get(region), geckoViewModel.getViewModelElement(region));
}
for (System child : original.getChildren()) {
savePositionRecursively(child);
}
}

private void savePositionAndSize(Element key, PositionableViewModelElement<?> positionSource) {
elementToPosAndSize.put(key, new Pair<>(positionSource.getPosition(), positionSource.getSize()));
}
}
Loading

0 comments on commit 8c045cb

Please sign in to comment.