From 4e206defed20bb276f1f0be004167ce25618cda0 Mon Sep 17 00:00:00 2001
From: "DozorovaA.A" <Alena@DESKTOP-T89D4FU>
Date: Sat, 3 Dec 2022 15:32:22 +0400
Subject: [PATCH] add rewrite

---
 .vs/slnx.sqlite                               | Bin 118784 -> 118784 bytes
 .../src/MapWithSetMachineGeneric.java         |   4 +++-
 ArmoredVehicle/src/MapsCollection.java        |   3 +++
 ArmoredVehicle/src/SetArmoredCarsGeneric.java |   6 +++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 5fea80622102b61d7fdd92b923da2b004c02dc62..aebb9ab66c902c6dd442f9919bcc62068f5d69b4 100644
GIT binary patch
delta 2664
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
a<TO7f@6^H%xD@Rvl63-X(e@MYEBG&k{klW|

delta 2178
zcmZvde@qlt9>DiIGtRvCW_Jc;*JarsfGCzORgSizB~%3zw5+%b+S;Et$O_wq-RrX8
zd3Tj<O4?HY=>7m7Hc?PpY^)JllCCYW@p1_*h-j<VYfbCv<w$Cq^V)0DT(9Z%W_GTJ
zxte{O&-cfB-}meLeG?lIVk1J_4%URD2CQ%VvV9dpzL=O<^~^r2E&0R#U{)?~01UjF
zMOXf4_x^U{SE-g$W&GSdA2+=_HZgRn;}`5VxNJhWwi8k<*P9*Wc@iUgNrVJRD|w9U
zAdRG+Y`_O`67Nr4zP@zgAJ@wSi7<vuMP!YNbw#8iRd%Dc6gToLFmAk6het<)hEjA%
z$A>yTNR8YW?L`-L?ShUu9p`n->NuxkM#r>{_jSCdV@iV?@6fSbN3)J59X=gi9osY%
zb1<Bm`eMG68`afUb-beEn2w`5j_4Sf_|um|EW;h2c<S%*_;T)J!)n;Va%WK)VufqM
zq!8zx<?6W=9AW>)US!{9kFw8Da|{~O-7zq-K3D$=V!%$PdL00Ps6V1a!;znei@mw#
z{$jO5PEMvnlRv69T)ZXQ+`oLmT<4Ff4Hwr+dHu_%avpN|`&6-r(665b8<*F=G$UF0
z>?~J*A))R*aB^$<3kYrKg9^5yKcB9egNpQ-KByC2AzqdRhcJ&0k$U`Z;W*kT1jS`?
zkNl`<leCu>$6>j3t?4859eL2`5~lfSG>Tsk)}zN!7j22dL*?j-uo9Kw*Cd4xiZ`W|
zCWqvbDy3}X<sXp%J+G#X#iZ~D@HSk9ON2XwCF#%O(7A{aD(Hg;;Hrqdc+P-pBg!63
z*Hieqm(5|c4f;gZ#?<;dJj$=|Hcj5p+N#NoM%K=>`J)f`_jci}X4cJUV>d)P!x4XL
zjS}fX7jxK>jImnT6>N)yyF;z$f`z?H3+qvKwFg4}&7p=sR}{@4buy*36}^vHOJ)dn
zfQ}Erot);NSBKyuhC7me>mZbIY_q{Zug4&l!eMYaWwua@SF1!7byes?ZB_r((Fe5h
zFwDa`S~v`D$VqwrTtnl-@RWeZ41J4!Tuspk6yynu`EU78aUb4pY~z2=AHfKH&%YpD
zlV)l42t4{QdcwF7Ps?lNDIsXg5-*FN8DrvE@g!bmYLSNJchG*>BOBzGBqO;={z5(x
zIR1vQhrCOU$w7IZJVCsqhTLm9NbJ~3jQ9uBDE<`rP#En?|8oTXz|rsLK;p@2;YG-%
zg`;4z-YdLl_~uEEKh)h2R$4vb?k;~#M_?EI@m2V&R@-34tlq&6O=(hk{Mv<VH?hu)
zM>`ALtZAAnqcz>?LzmJ8$DtfHXGXUx!9b`D&1nbe3HSILTb}gqilXxpo6j`0hxasw
zv~!)+`-b<ZrGU<9X%O*us=d*)ldWRta9B-$^xpqu22G_ey#{XqRMGGW^{$SdfINm9
zNyRVO7;cz;asqZ^gXjyiwMTPUTK_tfSPmOVrxFO^yS3<>LtXwzlsihFdmX;YWI_5j
zC!vsG<mc$2Q?TkDEw|K#b=8DBI@I+B!XfOrjjiF9V8>F0m+jO(28Sf>xMufdw!pnY
zr^cX?GZ+jz>7sF1QEw8AQ^ql4(x@1#jrrog#4F-S@ps~5VuffS^W-GyB|dUD$--aa
zvv@!5z;)P;ZlVk5O*Dx1p*FM$Ekm5}S6V#|b?M1*C=obkatEQGr@^60+X+RdRVhE&
zOz0h_!Ns|fO@wYa4bF0N()Y7B#vOE+lir`3TdMPt+X(I42i8U2?7U<nEt>&5liW%@
zGvH*B9@;SjZZ_FK()n-0x4`8m)M;#!>V!oJAEA|#u#|Hoyo4%~VCU{isKH{BP|CRz
zjf9R*s`ckgY$f#SBskcm2@lQcf_%QTa!Em=fnGQVF1~z;Bk=&Cg)Qp!mzFG9nb<<J
zXQ7lYUYwWMtlGn1%QGkH7nZITx!Q24!+d|DjwWVd9h=xh(&8ETj&WgWw?UqjUy^;Y
zEX_)9N<&gi+ATRvN7P^QL}5X>sn?o%SdC_}00IWI7bo*#6)|UsCAIUXc^HUvht!6P
znA0|E>LGmuR!3+VmdUar=5VgnI&j}@gAEePz}njci`#mw18Z&@ttZzyP_f|ADoOjR
zD+pw-A6Tt=s;bnl4Fj3F)(X=)xLEK1e>-`aSO&9IPv-M;%T9i6vkqpN7p7R)N_zJk
HybS*V9u_sz

diff --git a/ArmoredVehicle/src/MapWithSetMachineGeneric.java b/ArmoredVehicle/src/MapWithSetMachineGeneric.java
index 9e0a9bb..8360b21 100644
--- a/ArmoredVehicle/src/MapWithSetMachineGeneric.java
+++ b/ArmoredVehicle/src/MapWithSetMachineGeneric.java
@@ -24,7 +24,9 @@ public class MapWithSetMachineGeneric<T extends IDrawingObject, U extends Abstra
             _pictureHeight = picHeight;
             _map = map;
         }
-
+        public void Clear() {
+                _setCars.Clear();
+            }
         public int add(T car)
         {
             return _setCars.Insert(car);
diff --git a/ArmoredVehicle/src/MapsCollection.java b/ArmoredVehicle/src/MapsCollection.java
index 9ab8e08..e695427 100644
--- a/ArmoredVehicle/src/MapsCollection.java
+++ b/ArmoredVehicle/src/MapsCollection.java
@@ -218,6 +218,9 @@ public class MapsCollection {
                         break;
                 }
                 _mapStorages.put(elem[0], new MapWithSetMachineGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                if(_mapStorages.containsKey(elem[0])){
+                    _mapStorages.get(elem[0]).Clear();
+                }
                 while((str = br.readLine()) != null) {
                     _mapStorages.get(elem[0]).LoadData(str.split(separatorData + "\n?"));
                 }
diff --git a/ArmoredVehicle/src/SetArmoredCarsGeneric.java b/ArmoredVehicle/src/SetArmoredCarsGeneric.java
index 7eed845..98d1f8b 100644
--- a/ArmoredVehicle/src/SetArmoredCarsGeneric.java
+++ b/ArmoredVehicle/src/SetArmoredCarsGeneric.java
@@ -13,7 +13,11 @@ public class SetArmoredCarsGeneric<T> implements  Iterable<T>{
     public int getCount() {
         return _places.isEmpty() ? 0 : _places.size();
     }
-
+    
+    public void Clear() {
+        _places.clear();
+    }
+    
     public int Insert(T armoredCar)
     {
         if(_places.size()+1 <= _MaxCount)  return Insert(armoredCar, 0);