zero commit

This commit is contained in:
antoc0der 2023-11-23 16:15:37 +03:00
parent 48bd006597
commit a70ce74c29
5 changed files with 184 additions and 14 deletions

View File

@ -3,15 +3,20 @@ package src;
import src.DrawningObjects.DrawningAirplane;
import src.Generics.AirplaneGenericCollection;
import src.MovementStrategy.DrawningObjectAirplane;
import src.Generics.AirplaneGenericStorage;
import src.Generics.AirplaneTrashCollection;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.List;
public class FormAirplaneCollection {
private final AirplaneGenericCollection<DrawningAirplane, DrawningObjectAirplane> _airplanes;
private final AirplaneGenericStorage _storage;
private JList<String> listBoxStorages;
private DefaultListModel<String> listBoxModel;
private int pictureBoxWidth = 630;
private int pictureBoxHeight = 426;
CollectionCanvas canv;
@ -20,49 +25,110 @@ public class FormAirplaneCollection {
return;
canv.repaint();
}
private void ReloadObjects(){
int index = listBoxStorages.getSelectedIndex();
listBoxModel.clear();
List<String> keys = _storage.Keys();
for(int i = 0; i < keys.size(); i++){
listBoxModel.addElement(keys.get(i));
}
if(listBoxModel.size() > 0 && (index == -1 || index >= listBoxModel.size()))
listBoxStorages.setSelectedIndex(0);
else if(listBoxModel.size() > 0)
listBoxStorages.setSelectedIndex(index);
}
public FormAirplaneCollection(){
_airplanes = new AirplaneGenericCollection<>(pictureBoxWidth, pictureBoxHeight);
AirplaneTrashCollection<DrawningAirplane> _trashCollection = new AirplaneTrashCollection<>();
JButton callTrashButton = new JButton("Мусор");
_storage = new AirplaneGenericStorage(pictureBoxWidth, pictureBoxHeight);
JScrollPane scrollPane = new JScrollPane();
canv = new CollectionCanvas();
JPanel toolBox = new JPanel();
JTextField storageName = new JTextField();
JButton addStorageButton = new JButton("Добавить набор");
listBoxModel = new DefaultListModel<>();
listBoxStorages= new JList<>(listBoxModel);
scrollPane.setViewportView(listBoxStorages);
JButton delStorageButton = new JButton("Удалить набор");
toolBox.setBounds(623,12, 227, 80);
JFrame collectionFrame = new JFrame();
collectionFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
collectionFrame.setSize(880,497);
toolBox.setBounds(623, 12, 227, 426);
//toolBox.setBounds(623, 12, 227, 426);
canv.setBounds(12,12,pictureBoxWidth,pictureBoxHeight);
JButton addButton = new JButton("Добавить");
JButton removeButton = new JButton("Удалить");
JButton refreshButton = new JButton("Обновить");
JTextField airplaneNumb = new JTextField();
GridLayout lay = new GridLayout(4,1);
GridLayout lay = new GridLayout(9,1);
toolBox.add(storageName);
toolBox.add(addStorageButton);
toolBox.add(scrollPane);
toolBox.add(delStorageButton);
toolBox.setLayout(lay);
toolBox.add(addButton);
toolBox.add(airplaneNumb);
toolBox.add(removeButton);
toolBox.add(callTrashButton);
toolBox.add(refreshButton);
collectionFrame.add(toolBox);
collectionFrame.add(canv);
collectionFrame.setVisible(true);
canv._storage = _storage;
canv.listBoxStorages = listBoxStorages;
addStorageButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(storageName.getText() == null)
return;
_storage.AddSet(storageName.getText());
ReloadObjects();
}
});
delStorageButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(listBoxStorages.getSelectedIndex() == -1) {
return;
}
_storage.DelSet(listBoxStorages.getSelectedValue());
ReloadObjects();
}
});
callTrashButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(_trashCollection.GetSize() == 0)
return;
FormAirplaneWithRadar form = new FormAirplaneWithRadar();
form.ChangeAirplane(_trashCollection.GetTop());
_trashCollection.Pop();
}
});
addButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(_airplanes == null) {
if(listBoxStorages.getSelectedIndex() == -1) {
return;
}
AirplaneGenericStorage<DrawningAirplane, DrawningObjectAirplane> _airplanes = _storage.Get(listBoxStorages.getSelectedValue());
FormAirplaneWithRadar form = new FormAirplaneWithRadar();
form.buttonSelect.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (_airplanes.Insert(form.SelectedAirplane()) != -1)
if (_airplanes.Insert(form.SelectedAirplane()))
{
JOptionPane.showMessageDialog(null, "Объект добавлен", "Информация", JOptionPane.INFORMATION_MESSAGE);
Draw();
}
else
{
else {
JOptionPane.showMessageDialog(null, "Не удалось добавить объект", "Информация", JOptionPane.INFORMATION_MESSAGE);
}
canv._airplanes = _airplanes;
form.AirplaneFrame.dispose();
Draw();
}
@ -72,6 +138,10 @@ public class FormAirplaneCollection {
removeButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(listBoxStorages.getSelectedIndex() == -1) {
return;
}
AirplaneGenericCollection<DrawningAirplane, DrawningObjectAirplane> _airplanes = _storage.Get(listBoxStorages.getSelectedValue());
if(_airplanes == null) {
return;
}
@ -85,6 +155,8 @@ public class FormAirplaneCollection {
JOptionPane.showMessageDialog(null, "Введите число", "Информация", JOptionPane.INFORMATION_MESSAGE);
return;
}
DrawningAirplane curAirplane = _airplanes.Get(numb);
_trashCollection.Push(curAirplane);
_airplanes.Remove(numb);
_airplanes.ShowAirplanes();
JOptionPane.showMessageDialog(null, "Объект удален", "Информация", JOptionPane.INFORMATION_MESSAGE);
@ -95,6 +167,10 @@ public class FormAirplaneCollection {
refreshButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if(listBoxStorages.getSelectedIndex() == -1) {
return;
}
AirplaneGenericStorage<DrawningAirplane, DrawningObjectAirplane> _monorails = _storage.Get(listBoxStorages.getSelectedValue());
if(_airplanes == null) {
return;
}
@ -106,17 +182,18 @@ public class FormAirplaneCollection {
}
class CollectionCanvas extends JComponent {
public AirplaneGenericCollection<DrawningAirplane, DrawningObjectAirplane> _airplanes;
public AirplaneGenericStorage _storage;
public JList<String> listBoxStorages;
public CollectionCanvas(){
}
@Override
public void paintComponent (Graphics g){
if (_airplanes == null){
if (listBoxStorages == null || listBoxStorages.getSelectedIndex() == -1){
return;
}
super.paintComponents (g) ;
Graphics2D g2d = (Graphics2D)g;
g2d.drawImage(_airplanes.ShowAirplanes(), 0, 0, this);
g2d.drawImage(_storage.Get(listBoxStorages.getSelectedValue()).ShowAirplanes(), 0, 0, this);
super.repaint();
}
}

View File

@ -29,6 +29,12 @@ public class FormAirplaneWithRadar {
public DrawningAirplane SelectedAirplane(){
return DrawningAirplane;
}
public void ChangeAirplane(DrawningAirplane newAirplane){
newAirplane.SetPosition(0,0);
DrawningAirplane = newAirplane;
canv.DrawningAirplane = DrawningAirplane;
}
public FormAirplaneWithRadar(){
AirplaneFrame =new JFrame ();
JButton buttonCreate = new JButton("Создать");

View File

@ -18,16 +18,24 @@ public class AirplaneGenericCollection<T extends DrawningAirplane, U extends IMo
_pictureHeight = picHeight;
_collection = new SetGeneric<T>(width * height);
}
public int Insert(T obj){
public int Size(){
return _collection.Count;
}
public boolean Insert(T obj){
if (obj == null)
{
return -1;
return false;
}
return _collection.Insert(obj);
}
public boolean Remove(int position){
return _collection.Remove(position);
}
public T Get(int position){
if(position < 0 || position >= _collection.Count)
return null;
return _collection.Get(position);
}
public U GetU(int pos){
T ans = _collection.Get(pos);
if(ans == null)

View File

@ -0,0 +1,48 @@
package src.Generics;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.List;
import java.util.Queue;
import java.util.stream.Collectors;
import src.MovementStrategy.DrawningObjectAirplane;
import src.DrawningObjects.DrawningAirplane;
public class AirplaneGenericStorage {
final HashMap<String, AirplaneGenericCollection<DrawningAirplane, DrawningObjectAirplane>> _airplaneStorages;
public List<String> Keys(){
if(_airplaneStorages == null)
return null;
return _airplaneStorages.keySet().stream().collect(Collectors.toList());
}
private final int _pictureWidth;
private final int _pictureHeight;
public AirplaneGenericStorage(int pictureWidth, int pictureHeight){
_airplaneStorages = new HashMap<>();
_pictureWidth = pictureWidth;
_pictureHeight = pictureHeight;
}
public void AddSet(String name){
if(_airplaneStorages.containsKey(name))
return;
_airplaneStorages.put(name, new AirplaneGenericCollection<>(_pictureWidth, _pictureHeight));
}
public void DelSet(String name){
if(!_airplaneStorages.containsKey(name))
return;
_airplaneStorages.remove(name);
}
public AirplaneGenericCollection<DrawningAirplane, DrawningObjectAirplane> Get(String name){
if(!_airplaneStorages.containsKey(name))
return null;
return _airplaneStorages.get(name);
}
public DrawningAirplane Get(String collectionName, int position){
return _airplaneStorages.get(collectionName).Get(position);
}
}

View File

@ -0,0 +1,31 @@
package src.Generics;
import src.DrawningObjects.DrawningAirplane;
import java.util.ArrayDeque;
import java.util.Queue;
public class AirplaneTrashCollection <T extends DrawningAirplane>{
Queue <T> _queue;
public AirplaneTrashCollection(){
_queue = new ArrayDeque<>();
}
public void Push(T monorail){
_queue.add(monorail);
}
public int GetSize(){
return _queue.size();
}
public void Pop(){
if(_queue.size() ==0)
return;
_queue.remove();
}
public T GetTop(){
return _queue.peek();
}
}