Oleja123/PIbd-23-Salin-O.A.-Monorail-Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-23 Салин Олег Алексеевич Лабораторная работа №5 (усложненная) #6

Closed
Oleja123 wants to merge 2 commits from Lab5 into Lab4
pull from: Lab5
merge into: Oleja123:Lab4
Conversation 1 Commits 2 Files Changed 11 +29 -7
6 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a398df5403 - Show all commits

11
.idea/PIbd-23-Salin-O.A.-Monorail-Hard.iml generated Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

3
.idea/misc.xml generated
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" default="true"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

8
.idea/modules.xml generated Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/PIbd-23-Salin-O.A.-Monorail-Hard.iml" filepath="$PROJECT_DIR$/.idea/PIbd-23-Salin-O.A.-Monorail-Hard.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

2
src/MonorailHard/FormMonorailCollection.java
View File

@ -99,7 +99,7 @@ public class FormMonorailCollection {
if(listBoxStorages.getSelectedIndex() == -1) { if(listBoxStorages.getSelectedIndex() == -1) {
return; return;
} }
_storage.DelSet(listBoxStorages.getSelectedValue(), _trashCollection); _storage.DelSet(listBoxStorages.getSelectedValue());
ReloadObjects(); ReloadObjects();
} }
}); });

6
src/MonorailHard/Generics/MonorailGenericStorage.java
View File

@ -31,13 +31,9 @@ public class MonorailGenericStorage {
_monorailStorages.put(name, new MonorailGenericCollection<>(_pictureWidth, _pictureHeight)); _monorailStorages.put(name, new MonorailGenericCollection<>(_pictureWidth, _pictureHeight));
} }
public void DelSet(String name, MonorailTrashCollection<DrawningMonorail> trashBox){ public void DelSet(String name){
if(!_monorailStorages.containsKey(name)) if(!_monorailStorages.containsKey(name))
return; return;
MonorailGenericCollection<DrawningMonorail, DrawningObjectMonorail> cur = _monorailStorages.get(name);
for(int i = 0; i < cur.Size(); i++)
trashBox.Push(cur.Get(i));
_monorailStorages.remove(name); _monorailStorages.remove(name);
} }