4. Исправление ошибок
This commit is contained in:
parent
2f6bbea7ba
commit
c09d2a3764
@ -14,10 +14,12 @@ public class ExtensionArmoredClass {
|
||||
}
|
||||
if (strs.length == 9)
|
||||
{
|
||||
return new DrawingTank(Integer.parseInt(strs[0]),
|
||||
var armoredCar = new DrawingTank(Integer.parseInt(strs[0]),
|
||||
Integer.parseInt(strs[1]), Color.decode(strs[2]),
|
||||
Color.decode(strs[3]), Boolean.parseBoolean((strs[4])),
|
||||
Boolean.parseBoolean(strs[5]));
|
||||
armoredCar.drawingCaterpillar = CreateIDrawingCaterpillar(String.join(_separatorForObject, Arrays.copyOfRange(strs, 6, strs.length)));
|
||||
return armoredCar;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
@ -1,5 +1,7 @@
|
||||
import java.awt.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
|
||||
public class MapWithSetArmoredCarsGeneric<T extends IDrawingObject, U extends AbstractMap> {
|
||||
|
||||
@ -147,7 +149,10 @@ public class MapWithSetArmoredCarsGeneric<T extends IDrawingObject, U extends Ab
|
||||
public String GetData(char separatorType, char separatorData)
|
||||
{
|
||||
String data = String.format("%s%s", _map.getClass().getName(), separatorType);
|
||||
for (var armoredCar : _setCars.GetArmoredCars())
|
||||
ArrayList<T> reverse = new ArrayList<T>();
|
||||
_setCars.GetArmoredCars().forEach(reverse::add);
|
||||
Collections.reverse(reverse);
|
||||
for (var armoredCar : reverse)
|
||||
{
|
||||
data += String.format("%s%s", armoredCar.GetInfo(), separatorData);
|
||||
}
|
||||
|
@ -62,6 +62,7 @@ public class MapsCollection {
|
||||
for (var key : _mapStorages.keySet())
|
||||
{
|
||||
writter.write(String.format("%s%s%s", key, separatorDict, _mapStorages.get(key).GetData(separatorDict, separatorData)));
|
||||
writter.newLine();
|
||||
}
|
||||
}
|
||||
catch (IOException e) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user