From 1c95abf999cad7e7fe76f16ccc1b9baebff8af82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Sun, 12 Nov 2023 23:54:15 +0400 Subject: [PATCH 01/12] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/.idea/.gitignore | 5 + Tank/.idea/misc.xml | 1 - Tank/Tank.iml | 11 -- Tank/src/CountWheels.java | 2 +- Tank/src/DrawingArmoVehicle.java | 42 +++--- Tank/src/DrawingTank.java | 45 +++---- Tank/src/EntityArmoVehicle.java | 5 +- Tank/src/FormTank.java | 6 +- Tank/src/FormTankCollection.java | 177 ++++++++++++++++++++++---- Tank/src/SetGeneric.java | 98 +++++++++----- Tank/src/TanksGenericCollections.java | 47 +++---- Tank/src/TanksGenericStorage.java | 49 +++++++ 12 files changed, 349 insertions(+), 139 deletions(-) delete mode 100644 Tank/Tank.iml create mode 100644 Tank/src/TanksGenericStorage.java diff --git a/Tank/.idea/.gitignore b/Tank/.idea/.gitignore index 26d3352..13566b8 100644 --- a/Tank/.idea/.gitignore +++ b/Tank/.idea/.gitignore @@ -1,3 +1,8 @@ # Default ignored files /shelf/ /workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Tank/.idea/misc.xml b/Tank/.idea/misc.xml index 5d30da4..1e4328b 100644 --- a/Tank/.idea/misc.xml +++ b/Tank/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/Tank/Tank.iml b/Tank/Tank.iml deleted file mode 100644 index c90834f..0000000 --- a/Tank/Tank.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Tank/src/CountWheels.java b/Tank/src/CountWheels.java index dfe3b65..b937e6d 100644 --- a/Tank/src/CountWheels.java +++ b/Tank/src/CountWheels.java @@ -5,7 +5,7 @@ public enum CountWheels { Five(5); private final int Value; CountWheels(int Count){ - Value = Count; + Value=Count; } public int getCountWheels(){ return Value; diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index 454adc1..a6ca84f 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -10,7 +10,9 @@ public class DrawingArmoVehicle { protected int _startPosY; protected int _TankWidth = 160; protected int _TankHeight = 55; - public IMoveableObject GetMoveableObject() { return new DrawingObjectTank(this);} + public IMoveableObject GetMoveableObject() { + return new DrawingObjectTank(this); + } public DrawingArmoVehicle(int speed, double weight, Color bodyColor, int _numWheel, int width, int height) { _pictureWidth = width; @@ -20,7 +22,7 @@ public class DrawingArmoVehicle { ArmoVehicle = new EntityArmoVehicle(speed, weight, bodyColor, _numWheel); Random random = new Random(); - switch(random.nextInt(0, 3)) { + switch (random.nextInt(0, 3)) { case 0: OrnamentsForm = new DrawingWheelsCombination(); break; @@ -52,10 +54,21 @@ public class DrawingArmoVehicle { _startPosY = Math.min(y, _pictureHeight - _TankHeight); } - public int GetPosX () { return _startPosX; } - public int GetPosY () { return _startPosY; } - public int GetWidth () { return _TankWidth; } - public int GetHeight () { return _TankHeight; } + public int GetPosX() { + return _startPosX; + } + + public int GetPosY() { + return _startPosY; + } + + public int GetWidth() { + return _TankWidth; + } + + public int GetHeight() { + return _TankHeight; + } public boolean CanMove(Direction direction) { if (ArmoVehicle == null) { @@ -82,19 +95,19 @@ public class DrawingArmoVehicle { switch (direction) { //влево case Left: - _startPosX -= (int)ArmoVehicle.Step; + _startPosX -= (int) ArmoVehicle.Step; break; //вверх case Up: - _startPosY -= (int)ArmoVehicle.Step; + _startPosY -= (int) ArmoVehicle.Step; break; // вправо case Right: - _startPosX += (int)ArmoVehicle.Step; + _startPosX += (int) ArmoVehicle.Step; break; //вниз case Down: - _startPosY += (int)ArmoVehicle.Step; + _startPosY += (int) ArmoVehicle.Step; break; } } @@ -104,13 +117,12 @@ public class DrawingArmoVehicle { return; } - // body g.setColor(ArmoVehicle.BodyColor); - int[] xPoints = {_startPosX + 5, _startPosX + 140, _startPosX + 130,_startPosX + 12}; + int[] xPoints = {_startPosX + 5, _startPosX + 140, _startPosX + 130, _startPosX + 12}; int[] yPoints = {_startPosY + 30, _startPosY + 30, _startPosY + 42, _startPosY + 42}; - int nPoints = xPoints.length; - g.drawPolygon(xPoints,yPoints,nPoints); - g.fillPolygon(xPoints,yPoints,nPoints); + int nPoints = 4; + g.drawPolygon(xPoints, yPoints, nPoints); + g.fillPolygon(xPoints, yPoints, nPoints); //wheels OrnamentsForm.Draw(g, _startPosX, _startPosY); diff --git a/Tank/src/DrawingTank.java b/Tank/src/DrawingTank.java index 6ced55e..edcc883 100644 --- a/Tank/src/DrawingTank.java +++ b/Tank/src/DrawingTank.java @@ -4,67 +4,64 @@ public class DrawingTank extends DrawingArmoVehicle { protected IOrnamentForm OrnamentsForm; private boolean OrnamentAdd; - // Конструктор (Инициализация характеристик) public DrawingTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower, int width, int height, boolean ornamentAdd) { super(speed, weight, bodyColor, _numWheel, width, height); ArmoVehicle = new EntityTank(speed, weight, bodyColor, _numWheel, additionalColor, bodyKit, caterpillar, tower); - _TankWidth = ((EntityTank)ArmoVehicle).BodyKit ? 169 : 83; + _TankWidth = ((EntityTank) ArmoVehicle).BodyKit ? 169 : 83; this.OrnamentAdd = ornamentAdd; } // Ещё один конструктор - public DrawingTank(EntityTank tank, IOrnamentForm _wheelDrawing, int width, int height ){ + public DrawingTank(EntityTank tank, IOrnamentForm _wheelDrawing, int width, int height) { super(tank, _wheelDrawing, width, height); if (height < _pictureHeight || width < _pictureWidth) return; } - // Установка позиции public void SetPosition(int x, int y) { - _startPosX = Math.min(x, _pictureWidth-_TankWidth); - _startPosY = Math.min(y, _pictureHeight-_TankHeight); + _startPosX = Math.min(x, _pictureWidth - _TankWidth); + _startPosY = Math.min(y, _pictureHeight - _TankHeight); } - private boolean setOrnamentAdd() { return OrnamentAdd; } + private boolean setOrnamentAdd() { + return OrnamentAdd; + } - // Прорисовка объекта public void DrawTransport(Graphics2D g) { if (ArmoVehicle == null) { return; } super.DrawTransport(g); + g.setColor(((EntityTank) ArmoVehicle).AdditionalColor); if (((EntityTank) ArmoVehicle).BodyKit) { - g.setColor(((EntityTank) ArmoVehicle).AdditionalColor); - int[] xPointsBody = {_startPosX + 52, _startPosX + 52, _startPosX + 40, _startPosX + 15,_startPosX + 15, _startPosX + 60,_startPosX + 90,_startPosX + 120,_startPosX + 100,_startPosX + 95, _startPosX + 90}; - int[] yPointsBody = {_startPosY + 30, _startPosY + 27, _startPosY + 23, _startPosY + 18,_startPosY + 15, _startPosY + 11,_startPosY + 11,_startPosY + 20,_startPosY + 25,_startPosY + 27,_startPosY + 30}; - int nPointsBody = xPointsBody.length; + int[] xPointsBody = {_startPosX + 52, _startPosX + 52, _startPosX + 40, _startPosX + 15, _startPosX + 15, _startPosX + 60, _startPosX + 90, _startPosX + 120, _startPosX + 100, _startPosX + 95, _startPosX + 90}; + int[] yPointsBody = {_startPosY + 30, _startPosY + 27, _startPosY + 23, _startPosY + 18, _startPosY + 15, _startPosY + 11, _startPosY + 11, _startPosY + 20, _startPosY + 25, _startPosY + 27, _startPosY + 30}; + int nPointsBody = 11; - g.drawPolygon(xPointsBody,yPointsBody,nPointsBody); - g.fillPolygon(xPointsBody,yPointsBody,nPointsBody); + g.drawPolygon(xPointsBody, yPointsBody, nPointsBody); + g.fillPolygon(xPointsBody, yPointsBody, nPointsBody); } if (((EntityTank) ArmoVehicle).Caterpillar) { - Color Gray = new Color(128, 128, 128); - g.setColor(Gray); + // Гусеница g.drawOval(_startPosX + 10, _startPosY + 30, 120, 30); } if (((EntityTank) ArmoVehicle).Tower) { - g.setColor(Color.DARK_GRAY); // Орудие - g.drawRect(_startPosX + 112, _startPosY + 17, 60, 5); - g.fillRect(_startPosX + 112, _startPosY + 17, 60, 5); + g.drawRect(_startPosX + 112, _startPosY + 17, 60, 4); + g.fillRect(_startPosX + 112, _startPosY + 17, 60, 4); // Зенитное орудие - int[] xPointsGun = {_startPosX + 45, _startPosX + 45, _startPosX + 41, _startPosX + 41, _startPosX + 42, _startPosX + 41, _startPosX + 44,_startPosX + 50 ,_startPosX + 52,_startPosX + 53, _startPosX + 58}; - int[] yPointsGun = {_startPosY + 12, _startPosY + 10, _startPosY + 8, _startPosY + 7, _startPosY + 5, _startPosY + 4,_startPosY + 3,_startPosY + 3,_startPosY + 5,_startPosY + 7,_startPosY + 10}; - int nPointsGun = xPointsGun.length; + int[] xPointsGun = {_startPosX + 45, _startPosX + 45, _startPosX + 41, _startPosX + 41, _startPosX + 42, _startPosX + 41, _startPosX + 44, _startPosX + 50, _startPosX + 52, _startPosX + 53, _startPosX + 58}; + int[] yPointsGun = {_startPosY + 12, _startPosY + 10, _startPosY + 8, _startPosY + 7, _startPosY + 5, _startPosY + 4, _startPosY + 3, _startPosY + 3, _startPosY + 5, _startPosY + 7, _startPosY + 10}; + int nPointsGun = 11; g.fillRect(_startPosX + 50, _startPosY + 5, 20, 2); - g.drawPolygon(xPointsGun,yPointsGun,nPointsGun); - g.fillPolygon(xPointsGun,yPointsGun,nPointsGun); + g.drawPolygon(xPointsGun, yPointsGun, nPointsGun); + g.fillPolygon(xPointsGun, yPointsGun, nPointsGun); } } } \ No newline at end of file diff --git a/Tank/src/EntityArmoVehicle.java b/Tank/src/EntityArmoVehicle.java index f8e09c8..b7029a2 100644 --- a/Tank/src/EntityArmoVehicle.java +++ b/Tank/src/EntityArmoVehicle.java @@ -3,6 +3,9 @@ import java.awt.*; public class EntityArmoVehicle { public int Speed; public double Weight; + public double getWeight() { + return Weight; + } public Color BodyColor; public double Step; public int numWheel; @@ -12,6 +15,6 @@ public class EntityArmoVehicle { Weight = weight; BodyColor = bodyColor; numWheel = _numWheel; - Step = (double) Speed * 200 / Weight; + Step = (double) Speed * 300 / Weight; } } \ No newline at end of file diff --git a/Tank/src/FormTank.java b/Tank/src/FormTank.java index 8697c92..6db54c9 100644 --- a/Tank/src/FormTank.java +++ b/Tank/src/FormTank.java @@ -58,12 +58,11 @@ public class FormTank { down.setIcon(iconDown); JButton left = new JButton(); - left.setName("left"); ImageIcon iconLeft = new ImageIcon("Resources//KeyLeft.png"); left.setIcon(iconLeft); - JButton right = new JButton(); + JButton right = new JButton(); right.setName("right"); ImageIcon iconRight = new ImageIcon("Resources//KeyRight.png"); right.setIcon(iconRight); @@ -105,6 +104,7 @@ public class FormTank { } } ); + buttonCreateTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -139,6 +139,7 @@ public class FormTank { } } ); + buttonCreateArmoVehicle.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -186,6 +187,7 @@ public class FormTank { Draw(); } }; + up.addActionListener(actioListener); down.addActionListener(actioListener); left.addActionListener(actioListener); diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java index b25c7d1..d902c7f 100644 --- a/Tank/src/FormTankCollection.java +++ b/Tank/src/FormTankCollection.java @@ -1,44 +1,84 @@ import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.LinkedList; +import java.util.Queue; + public class FormTankCollection { private class Canvas extends JComponent { - public TanksGenericCollections _tank; public Canvas() { } - public void paintComponent (Graphics g) { + + public void paintComponent(Graphics g) { super.paintComponent(g); - if (_tank.ShowTanks() != null) { - g.drawImage(_tank.ShowTanks(), 0, 10, this); + if (jListStorage.getSelectedIndex() == -1) { + return; + } + var obj = _storage.get(jListStorage.getSelectedValue()); + if (obj == null) { + return; + } + if (obj.ShowTank() != null) { + g.drawImage(obj.ShowTank(), 0, 0, this); } super.repaint(); } } + Canvas canv; static int pictureBoxWidth = 700; static int pictureBoxHeight = 480; - private TanksGenericCollections _tank; - public void Draw(){ + private TanksGenericStorage _storage; + + public void Draw() { canv.repaint(); } + + private Queue Queue; + private JList jListStorage; + private DefaultListModel listModel; + + private void ReloadObjects() { + int index = jListStorage.getSelectedIndex(); + listModel.clear(); + for (String key : _storage.Keys()) { + listModel.addElement(key); + } + if (listModel.size() > 0 && (index == -1 || index >= listModel.size())) { + jListStorage.setSelectedIndex(0); + } else if (listModel.size() > 0 && index > -1 && index < listModel.size()) { + jListStorage.setSelectedIndex(index); + } + } + FormTankCollection() { + listModel = new DefaultListModel(); + jListStorage = new JList(listModel); canv = new Canvas(); - JFrame Frame = new JFrame ("TanksCollecltion"); - _tank = new TanksGenericCollections(pictureBoxWidth, pictureBoxHeight); - canv._tank = _tank; + JFrame Frame = new JFrame("TankCollecltion"); + _storage = new TanksGenericStorage(pictureBoxWidth, pictureBoxHeight); - JButton ButtonAddTank = new JButton("Добавить технику"); - - ButtonAddTank.addActionListener( + JButton ButtonAddVehicle = new JButton("Добавить технику"); + ButtonAddVehicle.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { + if (jListStorage.getSelectedIndex() == -1) { + return; + } + var obj = _storage.get(jListStorage.getSelectedValue()); + if (obj == null) { + return; + } + FormTank form = new FormTank(); form.buttonSelectTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - if (_tank.Add(form._drawingVehicle) != -1) { + if (obj.Add(form._drawingVehicle) != -1) { JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE); Draw(); } else { @@ -52,11 +92,21 @@ public class FormTankCollection { } ); + Queue = new LinkedList(); + JTextField TextBoxNumber = new JTextField(); JButton ButtonRemoveTank = new JButton("Удалить технику"); ButtonRemoveTank.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { + if (jListStorage.getSelectedIndex() == -1) { + return; + } + var obj = _storage.get(jListStorage.getSelectedValue()); + if (obj == null) { + return; + } + if (JOptionPane.showConfirmDialog(null, "Удалить объект?", "Удаление", JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) { return; } @@ -71,7 +121,9 @@ public class FormTankCollection { } int pos = Integer.parseInt(TextBoxNumber.getText()); - if (_tank.remove(pos) != null) { + var removed = obj.remove(pos); + if (removed != null) { + Queue.add(removed); JOptionPane.showMessageDialog(null, "Объект удален", "Информация", JOptionPane.INFORMATION_MESSAGE); Draw(); } else { @@ -81,39 +133,110 @@ public class FormTankCollection { } ); + JButton buttonGetRemoved = new JButton("Извлечь"); + buttonGetRemoved.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (Queue.size() == 0) { + JOptionPane.showMessageDialog(null, "Нет удалённых", "Информация", JOptionPane.INFORMATION_MESSAGE); + return; + } + FormTank form = new FormTank(); + form._drawingVehicle = Queue.peek(); + Queue.remove(); + form.Draw(); + } + } + ); + JButton ButtonRefreshCollection = new JButton("Обновить коллекцию"); ButtonRefreshCollection.addActionListener( new ActionListener() { - public void actionPerformed(ActionEvent e){ + public void actionPerformed(ActionEvent e) { Draw(); } } ); - JButton toFormTankGenerate = new JButton("Генерировать технику"); - toFormTankGenerate.addActionListener( + JButton toForm4GenericDopClass = new JButton("Генерация"); + toForm4GenericDopClass.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { - FormTankGenerate formTankGenerate = new FormTankGenerate(); + FormTankGenerate formTankGenerate = new FormTankGenerate(); } } ); - Frame.setSize (880, 520); - Frame.setDefaultCloseOperation (JFrame.EXIT_ON_CLOSE); + JTextField textBoxSetName = new JTextField(); + JButton buttonAddSet = new JButton("Добавить набор"); + buttonAddSet.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (textBoxSetName.getText().length() == 0) { + JOptionPane.showMessageDialog(null, "Не все данные заполнены", "Информация", JOptionPane.INFORMATION_MESSAGE); + return; + } + _storage.AddSet(textBoxSetName.getText()); + ReloadObjects(); + } + } + ); + + jListStorage.addListSelectionListener( + new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + Draw(); + } + } + ); + + JButton buttonRemoveSet = new JButton("Удалить набор"); + buttonRemoveSet.addActionListener( + new ActionListener() { + public void actionPerformed(ActionEvent e) { + if (jListStorage.getSelectedIndex() == -1) { + return; + } + if (JOptionPane.showConfirmDialog(null, "Удалить объект " + jListStorage.getSelectedValue() + "?", "Удаление", JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) { + return; + } + _storage.DelSet(jListStorage.getSelectedValue()); + ReloadObjects(); + } + } + ); + + Frame.setSize(880, 520); + Frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); Frame.setLayout(null); canv.setBounds(0, 0, pictureBoxWidth, pictureBoxHeight); - ButtonAddTank.setBounds(pictureBoxWidth - 50, 10, 170, 30); - TextBoxNumber.setBounds(pictureBoxWidth - 50, 50, 170, 20); - ButtonRemoveTank.setBounds(pictureBoxWidth - 50, 80, 170, 30); - ButtonRefreshCollection.setBounds(pictureBoxWidth - 50, 120, 170, 30); - toFormTankGenerate.setBounds(pictureBoxWidth - 50, 160, 170, 30); + ButtonAddVehicle.setBounds(pictureBoxWidth - 10, 10, 170, 30); + TextBoxNumber.setBounds(pictureBoxWidth - 10, 50, 170, 30); + ButtonRemoveTank.setBounds(pictureBoxWidth - 10, 90, 170, 30); + ButtonRefreshCollection.setBounds(pictureBoxWidth - 10, 130, 170, 30); + toForm4GenericDopClass.setBounds(pictureBoxWidth - 10, 170, 170, 30); + + buttonAddSet.setBounds(pictureBoxWidth - 10, 210, 170, 20); + textBoxSetName.setBounds(pictureBoxWidth - 10, 240, 170, 20); + jListStorage.setBounds(pictureBoxWidth - 10, 270, 170, 80); + buttonRemoveSet.setBounds(pictureBoxWidth - 10, 360, 170, 20); + + buttonGetRemoved.setBounds(pictureBoxWidth - 10, 390, 170, 20); + Frame.add(canv); - Frame.add(ButtonAddTank); + Frame.add(ButtonAddVehicle); Frame.add(ButtonRemoveTank); Frame.add(ButtonRefreshCollection); Frame.add(TextBoxNumber); - Frame.add(toFormTankGenerate); + Frame.add(toForm4GenericDopClass); + + Frame.add(buttonAddSet); + Frame.add(textBoxSetName); + Frame.add(jListStorage); + Frame.add(buttonRemoveSet); + + Frame.add(buttonGetRemoved); + Frame.setVisible(true); } } \ No newline at end of file diff --git a/Tank/src/SetGeneric.java b/Tank/src/SetGeneric.java index 4b98a8f..5877684 100644 --- a/Tank/src/SetGeneric.java +++ b/Tank/src/SetGeneric.java @@ -1,61 +1,89 @@ -public class SetGeneric { +import java.util.*; + +public class SetGeneric { // Массив объектов, которые храним - private Object[] _places; - + private final ArrayList _places; // Количество объектов в массиве - public int Count; + public int Count() { return _places.size(); } + // Максимальное количество объектов в списке + private final int _maxCount; - // Конструктор + // Конструктор public SetGeneric(int count) { - _places = new Object[count]; - Count = _places.length; + _maxCount = count; + _places = new ArrayList(count); } - // Добавление объекта в набор + // Добавление объектов в набор public int Insert(T tank) { - int i = 0; - for (; i < _places.length; i++) { - if (_places[i] == null) - break; - } - if (i == _places.length) + if(_places.size() >= _maxCount) return -1; - for (; i > 0; i--) { - _places[i] = _places[i - 1]; - } - _places[i] = tank; - return i; + _places.add(0,tank); + return 0; } - // Добавление объекта в набор на конкретную позицию public boolean Insert(T tank, int position) { - if (position < 0 || position >= _places.length) + // Проверка позиции + if (position < 0 || position > _places.size()) return false; - for (; position < _places.length; position++) { - if (_places[position] == null) - break; - } - if (position == _places.length) + + if (_places.size() >= _maxCount) return false; - for (; position > 0; position--) { - _places[position] = _places[position - 1]; - } - _places[position] = tank; + + if (position == _places.size()) + _places.add(tank); + else + _places.add(position, tank); + return true; } // Удаление объекта из набора с конкретной позиции public boolean Remove(int position) { - if (position < 0 || position >= _places.length) + // Проверка позиции + if (position < 0 || position >= _places.size()) return false; - _places[position] = null; - return true; + _places.remove(position); + return true; } // Получение объекта из набора по позиции public T Get(int position) { - if (position < 0 || position >= _places.length) + // Проверка позиции + if (position < 0 || position >= _places.size()) return null; - return (T)_places[position]; + return _places.get(position); + } + + // Проход по списку + public Iterable GetTanks(final Integer maxTanks) { + return new Iterable() { + @Override + public Iterator iterator() { + return new Iterator() { + private int currentIndex = 0; + private int count = 0; + + @Override + public boolean hasNext() { + return currentIndex < _places.size() && (maxTanks == null || count < maxTanks); + } + + @Override + public T next() { + if (hasNext()) { + count++; + return _places.get(currentIndex++); + } + throw new NoSuchElementException(); + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + }; + } + }; } } \ No newline at end of file diff --git a/Tank/src/TanksGenericCollections.java b/Tank/src/TanksGenericCollections.java index c454621..ef95d9a 100644 --- a/Tank/src/TanksGenericCollections.java +++ b/Tank/src/TanksGenericCollections.java @@ -1,24 +1,25 @@ import java.awt.*; import java.awt.image.BufferedImage; + public class TanksGenericCollections { - // Высота и Ширина окна прорисовки + // Ширина и высота окна прорисовки private int _pictureWidth; private int _pictureHeight; - // Размер занимаемого объектом места (ширина и высота) + // Размеры занимаемого объектом места (ширина и высота) private int _placeSizeWidth = 180; private int _placeSizeHeight = 90; // Набор объектов private SetGeneric _collection; - // Конструктор - public TanksGenericCollections(int pictureWidth, int pictureHeight) { - int width = pictureWidth / _placeSizeWidth; - int height = pictureHeight / _placeSizeHeight; - _pictureWidth = pictureWidth; - _pictureHeight = pictureHeight; + // Конструтор + public TanksGenericCollections(int picWidth, int picHeight) { + int width = picWidth / _placeSizeWidth; + int height = picHeight / _placeSizeHeight; + _pictureWidth = picWidth; + _pictureHeight = picHeight; _collection = new SetGeneric(width * height); } @@ -40,24 +41,24 @@ public class TanksGenericCollections> _tankStorages; + + // Возвращение списка названий наборов + public List Keys() { + return _tankStorages.keySet().stream().collect(Collectors.toList()); + } + // Ширина и высота отрисовки + private int _pictureWidth; + private int _pictureHeight; + + // Конструктор + public TanksGenericStorage(int pictureWidth, int pictureHeight) { + _tankStorages = new HashMap>(); + _pictureWidth = pictureWidth; + _pictureHeight = pictureHeight; + } + + // Добавление набора + public void AddSet(String name) { + if (_tankStorages.containsKey(name)) + return; + _tankStorages.put(name, new TanksGenericCollections(_pictureWidth, _pictureHeight)); + } + + // Удаление набора + public void DelSet(String name) { + if (!_tankStorages.containsKey(name)) + return; + _tankStorages.remove(name); + } + + // Доступ к набору + public TanksGenericCollections get(String ind) { + if (_tankStorages.containsKey(ind)) + return _tankStorages.get(ind); + return null; + } + + public DrawingObjectTank get(String ind1, int ind2){ + if (!_tankStorages.containsKey(ind1)) + return null; + return _tankStorages.get(ind1).GetU(ind2); + } +} \ No newline at end of file -- 2.25.1 From 729aeaaed7985b0e2f05ca977005c3ef64335aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 00:16:29 +0400 Subject: [PATCH 02/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/.idea/misc.xml | 1 + Tank/Tank.iml | 11 +++++++++++ Tank/src/CountWheels.java | 2 +- Tank/src/DrawingArmoVehicle.java | 18 +++++++++--------- 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 Tank/Tank.iml diff --git a/Tank/.idea/misc.xml b/Tank/.idea/misc.xml index 1e4328b..5d30da4 100644 --- a/Tank/.idea/misc.xml +++ b/Tank/.idea/misc.xml @@ -1,3 +1,4 @@ + diff --git a/Tank/Tank.iml b/Tank/Tank.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Tank/Tank.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Tank/src/CountWheels.java b/Tank/src/CountWheels.java index b937e6d..dfe3b65 100644 --- a/Tank/src/CountWheels.java +++ b/Tank/src/CountWheels.java @@ -5,7 +5,7 @@ public enum CountWheels { Five(5); private final int Value; CountWheels(int Count){ - Value=Count; + Value = Count; } public int getCountWheels(){ return Value; diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index a6ca84f..dc9a434 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -22,7 +22,7 @@ public class DrawingArmoVehicle { ArmoVehicle = new EntityArmoVehicle(speed, weight, bodyColor, _numWheel); Random random = new Random(); - switch (random.nextInt(0, 3)) { + switch(random.nextInt(0, 3)) { case 0: OrnamentsForm = new DrawingWheelsCombination(); break; @@ -54,19 +54,19 @@ public class DrawingArmoVehicle { _startPosY = Math.min(y, _pictureHeight - _TankHeight); } - public int GetPosX() { + public int GetPosX () { return _startPosX; } - public int GetPosY() { + public int GetPosY () { return _startPosY; } - public int GetWidth() { + public int GetWidth () { return _TankWidth; } - public int GetHeight() { + public int GetHeight () { return _TankHeight; } @@ -95,19 +95,19 @@ public class DrawingArmoVehicle { switch (direction) { //влево case Left: - _startPosX -= (int) ArmoVehicle.Step; + _startPosX -= (int)ArmoVehicle.Step; break; //вверх case Up: - _startPosY -= (int) ArmoVehicle.Step; + _startPosY -= (int)ArmoVehicle.Step; break; // вправо case Right: - _startPosX += (int) ArmoVehicle.Step; + _startPosX += (int)ArmoVehicle.Step; break; //вниз case Down: - _startPosY += (int) ArmoVehicle.Step; + _startPosY += (int)ArmoVehicle.Step; break; } } -- 2.25.1 From 0667fc1a0a49b05d42ea0b6b3d274001f1328de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 00:21:09 +0400 Subject: [PATCH 03/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingArmoVehicle.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index dc9a434..b445fe1 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -117,10 +117,11 @@ public class DrawingArmoVehicle { return; } + // body g.setColor(ArmoVehicle.BodyColor); int[] xPoints = {_startPosX + 5, _startPosX + 140, _startPosX + 130, _startPosX + 12}; int[] yPoints = {_startPosY + 30, _startPosY + 30, _startPosY + 42, _startPosY + 42}; - int nPoints = 4; + int nPoints = xPoints.length; g.drawPolygon(xPoints, yPoints, nPoints); g.fillPolygon(xPoints, yPoints, nPoints); -- 2.25.1 From 15fad249f537fa859e06451c9c308b4ff969ca4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 00:36:16 +0400 Subject: [PATCH 04/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingTank.java | 7 ++++--- Tank/src/FormTankCollection.java | 11 ++++------- Tank/src/SetGeneric.java | 2 +- Tank/src/TanksGenericCollections.java | 12 ++++++------ 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Tank/src/DrawingTank.java b/Tank/src/DrawingTank.java index edcc883..1dffe39 100644 --- a/Tank/src/DrawingTank.java +++ b/Tank/src/DrawingTank.java @@ -4,10 +4,11 @@ public class DrawingTank extends DrawingArmoVehicle { protected IOrnamentForm OrnamentsForm; private boolean OrnamentAdd; + // Конструктор (Инициализация характеристик) public DrawingTank(int speed, double weight, Color bodyColor, int _numWheel, Color additionalColor, boolean bodyKit, boolean caterpillar, boolean tower, int width, int height, boolean ornamentAdd) { super(speed, weight, bodyColor, _numWheel, width, height); ArmoVehicle = new EntityTank(speed, weight, bodyColor, _numWheel, additionalColor, bodyKit, caterpillar, tower); - _TankWidth = ((EntityTank) ArmoVehicle).BodyKit ? 169 : 83; + _TankWidth = ((EntityTank)ArmoVehicle).BodyKit ? 169 : 83; this.OrnamentAdd = ornamentAdd; } @@ -20,8 +21,8 @@ public class DrawingTank extends DrawingArmoVehicle { } public void SetPosition(int x, int y) { - _startPosX = Math.min(x, _pictureWidth - _TankWidth); - _startPosY = Math.min(y, _pictureHeight - _TankHeight); + _startPosX = Math.min(x, _pictureWidth-_TankWidth); + _startPosY = Math.min(y, _pictureHeight-_TankHeight); } private boolean setOrnamentAdd() { diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java index d902c7f..3c893fd 100644 --- a/Tank/src/FormTankCollection.java +++ b/Tank/src/FormTankCollection.java @@ -158,8 +158,8 @@ public class FormTankCollection { } ); - JButton toForm4GenericDopClass = new JButton("Генерация"); - toForm4GenericDopClass.addActionListener( + JButton toFormTankGenerate = new JButton("Генерация"); + toFormTankGenerate.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { FormTankGenerate formTankGenerate = new FormTankGenerate(); @@ -214,7 +214,7 @@ public class FormTankCollection { TextBoxNumber.setBounds(pictureBoxWidth - 10, 50, 170, 30); ButtonRemoveTank.setBounds(pictureBoxWidth - 10, 90, 170, 30); ButtonRefreshCollection.setBounds(pictureBoxWidth - 10, 130, 170, 30); - toForm4GenericDopClass.setBounds(pictureBoxWidth - 10, 170, 170, 30); + toFormTankGenerate.setBounds(pictureBoxWidth - 10, 170, 170, 30); buttonAddSet.setBounds(pictureBoxWidth - 10, 210, 170, 20); textBoxSetName.setBounds(pictureBoxWidth - 10, 240, 170, 20); @@ -228,15 +228,12 @@ public class FormTankCollection { Frame.add(ButtonRemoveTank); Frame.add(ButtonRefreshCollection); Frame.add(TextBoxNumber); - Frame.add(toForm4GenericDopClass); - + Frame.add(toFormTankGenerate); Frame.add(buttonAddSet); Frame.add(textBoxSetName); Frame.add(jListStorage); Frame.add(buttonRemoveSet); - Frame.add(buttonGetRemoved); - Frame.setVisible(true); } } \ No newline at end of file diff --git a/Tank/src/SetGeneric.java b/Tank/src/SetGeneric.java index 5877684..7ab88d6 100644 --- a/Tank/src/SetGeneric.java +++ b/Tank/src/SetGeneric.java @@ -8,7 +8,7 @@ public class SetGeneric { // Максимальное количество объектов в списке private final int _maxCount; - // Конструктор + // Конструктор public SetGeneric(int count) { _maxCount = count; _places = new ArrayList(count); diff --git a/Tank/src/TanksGenericCollections.java b/Tank/src/TanksGenericCollections.java index ef95d9a..427d83d 100644 --- a/Tank/src/TanksGenericCollections.java +++ b/Tank/src/TanksGenericCollections.java @@ -3,7 +3,7 @@ import java.awt.image.BufferedImage; public class TanksGenericCollections { - // Ширина и высота окна прорисовки + // Высота и ширина окна прорисовки private int _pictureWidth; private int _pictureHeight; @@ -15,11 +15,11 @@ public class TanksGenericCollections _collection; // Конструтор - public TanksGenericCollections(int picWidth, int picHeight) { - int width = picWidth / _placeSizeWidth; - int height = picHeight / _placeSizeHeight; - _pictureWidth = picWidth; - _pictureHeight = picHeight; + public TanksGenericCollections(int pictureWidth, int pictureHeight) { + int width = pictureWidth / _placeSizeWidth; + int height = pictureHeight / _placeSizeHeight; + _pictureWidth = pictureWidth; + _pictureHeight = pictureHeight; _collection = new SetGeneric(width * height); } -- 2.25.1 From 0eeb3a421a2ad532b6b35720eb6ae2bd5d72e911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:06:48 +0400 Subject: [PATCH 05/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingArmoVehicle.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Tank/src/DrawingArmoVehicle.java b/Tank/src/DrawingArmoVehicle.java index b445fe1..dd6d6d8 100644 --- a/Tank/src/DrawingArmoVehicle.java +++ b/Tank/src/DrawingArmoVehicle.java @@ -112,6 +112,7 @@ public class DrawingArmoVehicle { } } + // Прорисовка объекта public void DrawTransport(Graphics2D g) { if (ArmoVehicle == null) { return; -- 2.25.1 From 3f1e52e587ddaff48466f159b670bcd7736f5ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:12:40 +0400 Subject: [PATCH 06/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/TanksGenericCollections.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Tank/src/TanksGenericCollections.java b/Tank/src/TanksGenericCollections.java index 427d83d..b9aecb3 100644 --- a/Tank/src/TanksGenericCollections.java +++ b/Tank/src/TanksGenericCollections.java @@ -3,7 +3,7 @@ import java.awt.image.BufferedImage; public class TanksGenericCollections { - // Высота и ширина окна прорисовки + // Высота и Ширина окна прорисовки private int _pictureWidth; private int _pictureHeight; @@ -14,7 +14,7 @@ public class TanksGenericCollections _collection; - // Конструтор + // Конструктор public TanksGenericCollections(int pictureWidth, int pictureHeight) { int width = pictureWidth / _placeSizeWidth; int height = pictureHeight / _placeSizeHeight; @@ -47,18 +47,17 @@ public class TanksGenericCollections Date: Mon, 13 Nov 2023 01:14:42 +0400 Subject: [PATCH 07/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTankCollection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java index 3c893fd..5a38b27 100644 --- a/Tank/src/FormTankCollection.java +++ b/Tank/src/FormTankCollection.java @@ -158,7 +158,7 @@ public class FormTankCollection { } ); - JButton toFormTankGenerate = new JButton("Генерация"); + JButton toFormTankGenerate = new JButton("Генерировать"); toFormTankGenerate.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { -- 2.25.1 From 53eb16ffd53606838aa0326cc356dd900f58ebed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:15:17 +0400 Subject: [PATCH 08/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/EntityArmoVehicle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/EntityArmoVehicle.java b/Tank/src/EntityArmoVehicle.java index b7029a2..a7c2b0d 100644 --- a/Tank/src/EntityArmoVehicle.java +++ b/Tank/src/EntityArmoVehicle.java @@ -15,6 +15,6 @@ public class EntityArmoVehicle { Weight = weight; BodyColor = bodyColor; numWheel = _numWheel; - Step = (double) Speed * 300 / Weight; + Step = (double) Speed * 200 / Weight; } } \ No newline at end of file -- 2.25.1 From d0c318b85d5a27b1b5d0289d404ee04901b7b6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:16:39 +0400 Subject: [PATCH 09/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingTank.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Tank/src/DrawingTank.java b/Tank/src/DrawingTank.java index 1dffe39..714a946 100644 --- a/Tank/src/DrawingTank.java +++ b/Tank/src/DrawingTank.java @@ -20,6 +20,7 @@ public class DrawingTank extends DrawingArmoVehicle { return; } + // Установка позиций public void SetPosition(int x, int y) { _startPosX = Math.min(x, _pictureWidth-_TankWidth); _startPosY = Math.min(y, _pictureHeight-_TankHeight); -- 2.25.1 From 541f65376197a5004e8fcc7d82b6bbe58207952c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:22:52 +0400 Subject: [PATCH 10/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/DrawingTank.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tank/src/DrawingTank.java b/Tank/src/DrawingTank.java index 714a946..bd27a18 100644 --- a/Tank/src/DrawingTank.java +++ b/Tank/src/DrawingTank.java @@ -20,7 +20,7 @@ public class DrawingTank extends DrawingArmoVehicle { return; } - // Установка позиций + // Установка позиции public void SetPosition(int x, int y) { _startPosX = Math.min(x, _pictureWidth-_TankWidth); _startPosY = Math.min(y, _pictureHeight-_TankHeight); @@ -30,6 +30,7 @@ public class DrawingTank extends DrawingArmoVehicle { return OrnamentAdd; } + // Прорисовка объекта public void DrawTransport(Graphics2D g) { if (ArmoVehicle == null) { return; -- 2.25.1 From 80872fdf8739789cfe9acaf86f78647ca4b7f478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:29:20 +0400 Subject: [PATCH 11/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/FormTankCollection.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tank/src/FormTankCollection.java b/Tank/src/FormTankCollection.java index 5a38b27..01919ff 100644 --- a/Tank/src/FormTankCollection.java +++ b/Tank/src/FormTankCollection.java @@ -152,13 +152,13 @@ public class FormTankCollection { JButton ButtonRefreshCollection = new JButton("Обновить коллекцию"); ButtonRefreshCollection.addActionListener( new ActionListener() { - public void actionPerformed(ActionEvent e) { + public void actionPerformed(ActionEvent e){ Draw(); } } ); - JButton toFormTankGenerate = new JButton("Генерировать"); + JButton toFormTankGenerate = new JButton("Генерировать технику"); toFormTankGenerate.addActionListener( new ActionListener() { public void actionPerformed(ActionEvent e) { -- 2.25.1 From 43ca461d3d2b34a9abda66c95e9712dd70bf60cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=91=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D0=BD?= Date: Mon, 13 Nov 2023 01:35:16 +0400 Subject: [PATCH 12/12] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tank/src/TanksGenericCollections.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tank/src/TanksGenericCollections.java b/Tank/src/TanksGenericCollections.java index b9aecb3..4c6d961 100644 --- a/Tank/src/TanksGenericCollections.java +++ b/Tank/src/TanksGenericCollections.java @@ -46,7 +46,7 @@ public class TanksGenericCollections