Yunusov_Niyaz/PIbd-23_Yunusov.N.N_Trolleybus_Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-23. Yunusov N.N. Lab work 06 Hard #6

Closed
Yunusov_Niyaz wants to merge 5 commits from Lab6 into Lab5
pull from: Lab6
merge into: Yunusov_Niyaz:Lab5
Conversation 0 Commits 5 Files Changed 6 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f6383ed44 - Show all commits

2
src/BusesGenericCollection.java
View File

@ -82,7 +82,7 @@ public class BusesGenericCollection<T extends DrawingBus, U extends IMoveableObj
}
f.createNewFile();
StringBuilder data = new StringBuilder();
data.append("MonorailCollection\n");
data.append("BusCollection\n");
data.append(String.format("%s\n", name));
StringBuilder records = new StringBuilder();
for(DrawingBus elem : GetBuses())

8
src/BusesGenericStorage.java
View File

@ -85,7 +85,7 @@ public class BusesGenericStorage {
var strs = bufferTextFromFile.toString().split("\n");
if(strs == null || strs.length == 0)
return false;
if (!strs[0].startsWith("MonorailCollection"))
if (!strs[0].startsWith("BusCollection"))
return false;
String collectionName = strs[1];
BusesGenericCollection<DrawingBus, DrawingObjectBus> collection = getCollection(collectionName);
@ -93,9 +93,9 @@ public class BusesGenericStorage {
collection = new BusesGenericCollection<>(_pictureWidth, _pictureHeight);
else
collection.Clear();
String[] monorailsInfo = strs[2].split(Character.toString(BusesGenericCollection._separatorRecords));
for(int i = monorailsInfo.length-1; i >= 0; i--){
String data = monorailsInfo[i];
String[] busesInfo = strs[2].split(Character.toString(BusesGenericCollection._separatorRecords));
for(int i = busesInfo.length-1; i >= 0; i--){
String data = busesInfo[i];
DrawingBus bus = ExtentionDrawingBus.CreateDrawingBus(data,
BusesGenericCollection._separatorForObject, _pictureWidth, _pictureHeight);
if (bus != null)