ENDORFIT/PIbd-11_Tarasov_V.D._Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some Changes

Browse Source
This commit is contained in:
ENDORFIT
2024-06-08 10:54:54 +04:00
parent d54c889431
commit 3d04c1e674
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ProjectMonorail/.idea/workspace.xml generated
View File

@@ -5,19 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="39e7c520-e505-4e53-a269-c949d7c9f5d1" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/Scripts/CollectionAdditionalObjects/AdditionalCollections.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/Scripts/Drawing/ExtentionDrawningMonorail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/ICollectionGenericObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/ICollectionGenericObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/ListGenericObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/ListGenericObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/MassiveGenericObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/MassiveGenericObjects.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/StorageCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/StorageCollection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Drawing/DrawingMonorail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Drawing/DrawingMonorail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Entities/EntityModernMonorail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Entities/EntityModernMonorail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Entities/EntityMonorail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Entities/EntityMonorail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailCollection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Wheels/DrawingWheels.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Wheels/DrawingWheels.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Wheels/IDrawingWheels.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Wheels/IDrawingWheels.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

22
ProjectMonorail/src/Scripts/CollectionGenericObjects/StorageCollection.java
View File

@@ -153,19 +153,26 @@ public class StorageCollection<T extends DrawingMonorail> {
String s = fs.readLine();
if (s == null || s.isEmpty() || !s.startsWith(_collectionName))
return false;
if (_storages.containsKey(s)) {
_storages.get(s).ClearCollection();
}
s = fs.readLine();
String[] record = s.split(_separatorForKeyValue);
if (record.length != 4) {
return false;
}
ICollectionGenericObjects<T> collection = CreateCollection(record[1]);
if (collection == null)
{
return false;
ICollectionGenericObjects<T> collection;
if (_storages.containsKey(s)) {
_storages.get(s).ClearCollection();
collection = _storages.get(s);
if (record[1] == "Massive" && collection instanceof ListGenericObjects<T> || record[1] == "List" && collection instanceof MassiveGenericObjects<T>) collection = CreateCollection(record[1]);
}
else {
collection = CreateCollection(record[1]);
_storages.put(record[0], collection);
}
collection.SetMaxCount(Integer.parseInt(record[2]));
String[] set = record[3].split(_separatorItems);
for (String elem : set) {
@@ -175,7 +182,6 @@ public class StorageCollection<T extends DrawingMonorail> {
return false;
}
}
_storages.put(record[0], collection);
return true;
}
catch (IOException e) {