mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Revert "Fix direction of command undo/redo" 

This reverts commit 6ddc12ce9d.
pull/1/head
Taylor Smock 2019-10-30 16:16:53 -06:00
rodzic 3c6e69c631
commit a181a4d446
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
2 zmienionych plików z 17 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysAction.java
Wyświetl plik

@ -15,6 +15,7 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.gui.MainApplication;
import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
import org.openstreetmap.josm.plugins.mapwithai.commands.MergeDuplicateWays;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Shortcut;
/**
@ -37,16 +38,21 @@ public class MergeDuplicateWaysAction extends JosmAction {
public void actionPerformed(ActionEvent e) {
final List<Way> ways = new ArrayList<>(MainApplication.getLayerManager().getActiveDataSet().getSelectedWays());
Command command = null;
if (ways.size() == 2) {
command = new MergeDuplicateWays(ways.get(0), ways.get(1));
} else if (ways.size() == 1) {
command = new MergeDuplicateWays(ways.get(0));
} else if (ways.isEmpty()) {
command = new MergeDuplicateWays(MainApplication.getLayerManager().getActiveDataSet());
}
if (command != null) {
UndoRedoHandler.getInstance().add(command);
}
int i = 0;
do {
if (ways.size() == 2) {
command = new MergeDuplicateWays(ways.get(0), ways.get(1));
} else if (ways.size() == 1) {
command = new MergeDuplicateWays(ways.get(0));
} else if (ways.isEmpty()) {
command = new MergeDuplicateWays(MainApplication.getLayerManager().getActiveDataSet());
}
if (command != null) {
UndoRedoHandler.getInstance().add(command);
i++;
Logging.error(Integer.toString(i));
}
} while (command != null && i < 10);
}
}

6
src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWays.java
Wyświetl plik

@ -17,7 +17,6 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.ChangePropertyCommand;
import org.openstreetmap.josm.command.Command;
import org.openstreetmap.josm.command.DeleteCommand;
import org.openstreetmap.josm.command.SequenceCommand;
@ -86,9 +85,7 @@ public class MergeDuplicateWays extends Command {
@Override
public void undoCommand() {
List<Command> reversedCommands = new ArrayList<>(commands);
Collections.reverse(reversedCommands);
for (final Command tCommand : reversedCommands) {
for (final Command tCommand : commands) {
tCommand.undoCommand();
}
}
@ -212,7 +209,6 @@ public class MergeDuplicateWays extends Command {
if (newWay.getNodesCount() > 0) {
commands.add(new DeleteCommand(way2));
commands.add(new ChangeCommand(way1, newWay));
commands.add(new ChangePropertyCommand(way1.getDataSet(), Collections.singleton(newWay), way2.getKeys()));
}
if (commands.contains(null)) {
commands = commands.stream().filter(Objects::nonNull).collect(Collectors.toList());