diff --git a/.idea/PIbd-23-Salin-O.A.-Monorail-Hard.iml b/.idea/PIbd-23-Salin-O.A.-Monorail-Hard.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/.idea/PIbd-23-Salin-O.A.-Monorail-Hard.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 86f4913..07115cd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,6 @@ + - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..060cff4 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/MonorailHard/FormMonorailCollection.java b/src/MonorailHard/FormMonorailCollection.java index 42cb559..9a12af7 100644 --- a/src/MonorailHard/FormMonorailCollection.java +++ b/src/MonorailHard/FormMonorailCollection.java @@ -99,7 +99,7 @@ public class FormMonorailCollection { if(listBoxStorages.getSelectedIndex() == -1) { return; } - _storage.DelSet(listBoxStorages.getSelectedValue(), _trashCollection); + _storage.DelSet(listBoxStorages.getSelectedValue()); ReloadObjects(); } }); diff --git a/src/MonorailHard/Generics/MonorailGenericStorage.java b/src/MonorailHard/Generics/MonorailGenericStorage.java index 3ac1069..0508e68 100644 --- a/src/MonorailHard/Generics/MonorailGenericStorage.java +++ b/src/MonorailHard/Generics/MonorailGenericStorage.java @@ -31,13 +31,9 @@ public class MonorailGenericStorage { _monorailStorages.put(name, new MonorailGenericCollection<>(_pictureWidth, _pictureHeight)); } - public void DelSet(String name, MonorailTrashCollection trashBox){ + public void DelSet(String name){ if(!_monorailStorages.containsKey(name)) return; - MonorailGenericCollection cur = _monorailStorages.get(name); - for(int i = 0; i < cur.Size(); i++) - trashBox.Push(cur.Get(i)); - _monorailStorages.remove(name); }