|
139 | 139 | import java.nio.file.Files; |
140 | 140 | import java.nio.file.Paths; |
141 | 141 | import java.text.DecimalFormat; |
142 | | -import java.util.ArrayList; |
143 | | -import java.util.HashSet; |
144 | | -import java.util.List; |
145 | | -import java.util.Map; |
146 | | -import java.util.Optional; |
147 | | -import java.util.Set; |
| 142 | +import java.util.*; |
148 | 143 | import java.util.concurrent.ConcurrentHashMap; |
149 | 144 | import java.util.concurrent.atomic.AtomicBoolean; |
150 | 145 | import java.util.function.BiConsumer; |
@@ -1058,9 +1053,11 @@ public void saveState(File stateFileIn) { |
1058 | 1053 |
|
1059 | 1054 | // Ok, let's save the view File |
1060 | 1055 |
|
1061 | | - //serializeView(viewFile); |
1062 | | - List<SliceGuiState.State> states = new ArrayList<>(); |
1063 | | - guiState.forEachSlice(sliceState -> states.add(new SliceGuiState.State(sliceState))); |
| 1056 | + List<SliceGuiState.State> states = new ArrayList<>(Collections.nCopies(msp.getSlices().size(), null)); |
| 1057 | + |
| 1058 | + guiState.forEachSlice(sliceState -> |
| 1059 | + states.set(sliceState.slice.getIndex(), new SliceGuiState.State(sliceState)) |
| 1060 | + ); |
1064 | 1061 | ViewState vs = new ViewState(); |
1065 | 1062 | vs.slicesStates = states; |
1066 | 1063 | vs.showInfo = showSliceInfo; |
@@ -2455,7 +2452,7 @@ void deleted(SliceSources slice) { |
2455 | 2452 |
|
2456 | 2453 | //synchronized |
2457 | 2454 | int nSlices() { |
2458 | | - return sliceGuiState.values().size(); |
| 2455 | + return sliceGuiState.size(); |
2459 | 2456 | } |
2460 | 2457 |
|
2461 | 2458 | //synchronized |
|
0 commit comments