diff --git a/ProjectMonorail/.idea/workspace.xml b/ProjectMonorail/.idea/workspace.xml
index 4a9346c..41c53d4 100644
--- a/ProjectMonorail/.idea/workspace.xml
+++ b/ProjectMonorail/.idea/workspace.xml
@@ -5,14 +5,10 @@
-
-
-
-
-
-
-
+
+
+
@@ -47,7 +43,7 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "LabWorking__4",
"kotlin-language-version-configured": "true",
- "last_opened_file_path": "D:/Учеба/PIbd-11_Tarasov_V.D._Hard/ProjectMonorail"
+ "last_opened_file_path": "C:/Учеба/AgarioGame"
}
}]]>
@@ -59,6 +55,13 @@
+
+
+
+
+
+
+
diff --git a/ProjectMonorail/src/Scripts/CollectionGenericObjects/AdditionalCollection.java b/ProjectMonorail/src/Scripts/CollectionGenericObjects/AdditionalCollection.java
index bbccf28..08d51c1 100644
--- a/ProjectMonorail/src/Scripts/CollectionGenericObjects/AdditionalCollection.java
+++ b/ProjectMonorail/src/Scripts/CollectionGenericObjects/AdditionalCollection.java
@@ -4,18 +4,17 @@ import Scripts.Drawing.DrawingModernMonorail;
import Scripts.Drawing.DrawingMonorail;
import Scripts.Entities.EntityModernMonorail;
import Scripts.Entities.EntityMonorail;
-import Scripts.Wheels.DrawingWheels;
import Scripts.Wheels.IDrawingWheels;
import java.lang.reflect.Array;
import java.util.Random;
public class AdditionalCollection {
- public T[] _collectionEntity;
- public U[] _collectionWheels;
+ public T[] CollectionEntity;
+ public U[] CollectionWheels;
public AdditionalCollection(int size, Class type1, Class type2) {
- _collectionEntity = (T[]) Array.newInstance(type1, size);
- _collectionWheels = (U[]) Array.newInstance(type2, size);
+ CollectionEntity = (T[]) Array.newInstance(type1, size);
+ CollectionWheels = (U[]) Array.newInstance(type2, size);
CountEntities = size;
CountWheels = size;
}
@@ -24,9 +23,9 @@ public class AdditionalCollection {
Set keys = _storages.keySet();
return keys;
}
- public void AddCollection(String name, CollectionType collectionType)
+ public void SetCollectionObject(String name, CollectionType collectionType)
{
if (_storages.containsKey(name)) return;
if (collectionType == CollectionType.None) return;
@@ -26,18 +26,12 @@ public class StorageCollection {
if (_storages.containsKey(name))
_storages.remove(name);
}
- public ICollectionGenericObjects getCollectionObject(String name) {
+ public ICollectionGenericObjects GetCollectionObject(String name) {
if (_storages.containsKey(name))
return _storages.get(name);
return null;
}
- public T getObject(String name, int position) {
- if(_storages.containsKey(name))
- return _storages.get(name).Get(position);
- return null;
- }
-
public T remove(String name, int position){
if(_storages.containsKey(name))
return _storages.get(name).Remove(position);
diff --git a/ProjectMonorail/src/Scripts/Forms/FormAdditionalCollection.java b/ProjectMonorail/src/Scripts/Forms/FormAdditionalCollection.java
index 34605cd..87fe1d1 100644
--- a/ProjectMonorail/src/Scripts/Forms/FormAdditionalCollection.java
+++ b/ProjectMonorail/src/Scripts/Forms/FormAdditionalCollection.java
@@ -105,7 +105,7 @@ public class FormAdditionalCollection extends JFrame {
public void AddWheels() {
for (int i = 0; i < _additionalCollection.CountWheels; i++) {
random = new Random();
- EntityMonorail entity = _additionalCollection._collectionEntity[i];
+ EntityMonorail entity = _additionalCollection.CollectionEntity[i];
DrawingWheels drawingWheels = null;
drawingWheels = new DrawingWheels();
drawingWheels.SetCountWheels((int) ((Math.random() * 3) + 1) * 2);
@@ -119,12 +119,12 @@ public class FormAdditionalCollection extends JFrame {
this._company = company;
String[] data1 = new String[_additionalCollection.CountEntities];
for (int i = 0; i < _additionalCollection.CountEntities; i++) {
- EntityMonorail entity = _additionalCollection._collectionEntity[i];
+ EntityMonorail entity = _additionalCollection.CollectionEntity[i];
data1[i] = ToString(entity);
}
String[] data2 = new String[_additionalCollection.CountWheels];
for (int i = 0; i < _additionalCollection.CountWheels; i++) {
- DrawingWheels wheels = _additionalCollection._collectionWheels[i];
+ DrawingWheels wheels = _additionalCollection.CollectionWheels[i];
data2[i] = ToString(wheels);
}
listEntity.setListData(data1);
diff --git a/ProjectMonorail/src/Scripts/Forms/FormMonorailCollection.java b/ProjectMonorail/src/Scripts/Forms/FormMonorailCollection.java
index eac3e3f..9294270 100644
--- a/ProjectMonorail/src/Scripts/Forms/FormMonorailCollection.java
+++ b/ProjectMonorail/src/Scripts/Forms/FormMonorailCollection.java
@@ -200,7 +200,7 @@ public class FormMonorailCollection extends JFrame{
} else if (radioButtonList.isSelected()) {
collectionType = CollectionType.List;
}
- _storageCollection.AddCollection(textBoxCollection.getText(), collectionType);
+ _storageCollection.SetCollectionObject(textBoxCollection.getText(), collectionType);
RerfreshListBoxItems();
}
});
@@ -229,7 +229,7 @@ public class FormMonorailCollection extends JFrame{
return;
}
ICollectionGenericObjects collection =
- _storageCollection.getCollectionObject(listBoxCollection.getSelectedValue().toString());
+ _storageCollection.GetCollectionObject(listBoxCollection.getSelectedValue().toString());
if (collection == null) {
JOptionPane.showMessageDialog(null, "Коллекция не проинициализирована");
return;