pyzhov.egor/Pibd-12_Pyzhov_E.A._Catamaran_Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Сделал очищение, а не создание новой коллекции

Browse Source
This commit is contained in:
Егор Пыжов 2024-05-07 14:28:19 +04:00
parent 239f4bdec8
commit f2b0279b17
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ProjectCatamaran/src/CollectionGenericObjects/StorageCollection.java
View File

@ -186,16 +186,22 @@ public class StorageCollection<T extends DrawningBoat> {
String s = fs.readLine(); String s = fs.readLine();
if (s == null || !s.startsWith(_collectionSingleKey)) if (s == null || !s.startsWith(_collectionSingleKey))
return false; return false;
if (keys.contains(s)) { ICollectionGenericObjects<DrawningBoat> collection;
_storages.get(s).ClearCollection();
}
s = fs.readLine(); s = fs.readLine();
String[] record = s.split(_separatorForKeyValue); String[] record = s.split(_separatorForKeyValue);
if (record.length != 4) { if (record.length != 4) {
return false; return false;
} }
if (keys.contains(s)) {
_storages.get(s).ClearCollection();
collection = (ICollectionGenericObjects<DrawningBoat>) _storages.get(s);
}
else {
CollectionType collectionType = Enum.valueOf(CollectionType.class, record[1]); CollectionType collectionType = Enum.valueOf(CollectionType.class, record[1]);
ICollectionGenericObjects<DrawningBoat> collection = CreateCollection(collectionType); collection = CreateCollection(collectionType);
}
if (collection == null) if (collection == null)
{ {
return false; return false;