SteamWar/BauSystem
Archiviert
13
0

Merge pull request 'Fix UnsupportedOperationException on addAll()' (#102) from FixTracer into master

Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
YoyoNow 2020-09-26 09:28:34 +02:00
Commit d6fa5cf5e7

Datei anzeigen

@ -81,7 +81,7 @@ public class ShowManager {
public void addSelection(int id) { public void addSelection(int id) {
if (showSelection == ShowSelection.ALL) return; if (showSelection == ShowSelection.ALL) return;
if (showSelection == ShowSelection.NONE) showSelection = ShowSelection.SELECTIVE; if (showSelection == ShowSelection.NONE) showSelection = ShowSelection.SELECTIVE;
selected.addAll(TraceManager.getFrame(id)); TraceManager.getFrame(id).forEach(i -> selected.add(i));
if (selected.size() == TraceManager.getAllTraces().size()) { if (selected.size() == TraceManager.getAllTraces().size()) {
showSelection = ShowSelection.ALL; showSelection = ShowSelection.ALL;
clear(); clear();
@ -91,7 +91,7 @@ public class ShowManager {
public void removeSelection(int id) { public void removeSelection(int id) {
if (showSelection == ShowSelection.NONE) return; if (showSelection == ShowSelection.NONE) return;
if (showSelection == ShowSelection.ALL) selected = TraceManager.getAllTraces(); if (showSelection == ShowSelection.ALL) selected = TraceManager.getAllTraces();
selected.removeAll(TraceManager.getFrame(id)); TraceManager.getFrame(id).forEach(i -> selected.remove(i));
showSelection = ShowSelection.SELECTIVE; showSelection = ShowSelection.SELECTIVE;
if (selected.isEmpty()) showSelection = ShowSelection.NONE; if (selected.isEmpty()) showSelection = ShowSelection.NONE;
} }