From d66ca977a5fdb975a2e40b30d6e532deb4545c0f Mon Sep 17 00:00:00 2001 From: Danila_Mochalov Date: Tue, 25 Oct 2022 16:59:53 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B1?= =?UTF-8?q?=D0=B5=D0=BB=D1=8B=20=D0=B8=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8.=20=D0=A1=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F=20=D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=9B=D0=B0=D0=B1=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FormEntityWithExtraGallery.java | 2 -- FormLocomotive.java | 1 - FormMapWithSetLocomotives.java | 10 ---------- MapWithSetLocomotivesGeneric.java | 2 -- 4 files changed, 15 deletions(-) diff --git a/FormEntityWithExtraGallery.java b/FormEntityWithExtraGallery.java index 6398dfc..d2b4dca 100644 --- a/FormEntityWithExtraGallery.java +++ b/FormEntityWithExtraGallery.java @@ -20,8 +20,6 @@ public class FormEntityWithExtraGallery extends JComponent { setLayout(new BorderLayout()); add(statusPanel, BorderLayout.SOUTH); - - JButton showRandomEntity = new JButton("Create entity from parts"); showRandomEntity.addActionListener(e -> { diff --git a/FormLocomotive.java b/FormLocomotive.java index bfdf5eb..8d7b5ee 100644 --- a/FormLocomotive.java +++ b/FormLocomotive.java @@ -56,7 +56,6 @@ public class FormLocomotive extends JComponent{ JButton selectLocomotiveButton = new JButton("Select"); selectLocomotiveButton.addActionListener(e -> { SelectedLocomotive = _locomotive; - //TODO caller.dispose(); }); diff --git a/FormMapWithSetLocomotives.java b/FormMapWithSetLocomotives.java index 197144d..d988495 100644 --- a/FormMapWithSetLocomotives.java +++ b/FormMapWithSetLocomotives.java @@ -16,7 +16,6 @@ public class FormMapWithSetLocomotives extends JComponent { formFrame.setSize(750, 500); formFrame.setLocationRelativeTo(null); - Panel statusPanel = new Panel(); statusPanel.setBackground(Color.WHITE); statusPanel.setLayout(new GridLayout(0, 1, 20, 20)); @@ -65,18 +64,13 @@ public class FormMapWithSetLocomotives extends JComponent { { return; } - // TODO - JDialog dialog = new JDialog(formFrame, "Dialog", true); FormLocomotive formLocomotive = new FormLocomotive(dialog); dialog.setSize(800, 500); dialog.setContentPane(formLocomotive); dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); dialog.setVisible(true); - - DrawningObjectLocomotive locomotive = new DrawningObjectLocomotive(formLocomotive.getSelectedLocomotive()); - //TODO if (_mapLocomotivesCollectionGeneric.Plus(locomotive) != -1) { JOptionPane.showMessageDialog(formFrame, "Object added", "Success", JOptionPane.OK_CANCEL_OPTION); bufferImg = _mapLocomotivesCollectionGeneric.ShowSet(); @@ -98,7 +92,6 @@ public class FormMapWithSetLocomotives extends JComponent { catch (ParseException e) { e.printStackTrace(); } - //Кнопка удаления локомотива JButton deleteLocomotiveButton = new JButton("Delete Locomotive"); JFormattedTextField finalMaskedTextFieldPosition = maskedTextFieldPosition; @@ -122,7 +115,6 @@ public class FormMapWithSetLocomotives extends JComponent { } }); statusPanel.add(deleteLocomotiveButton); - //Кнопка просмотра хранилища JButton showStorageButton = new JButton("Show Storage"); showStorageButton.addActionListener(e -> { @@ -135,7 +127,6 @@ public class FormMapWithSetLocomotives extends JComponent { repaint(); }); statusPanel.add(showStorageButton); - //Кнопка просмотра карты JButton showOnMapButton = new JButton("Show On Map"); showOnMapButton.addActionListener(e -> { @@ -202,7 +193,6 @@ public class FormMapWithSetLocomotives extends JComponent { formFrame.getContentPane().add(this); formFrame.setVisible(true); - //super.repaint(); } @Override diff --git a/MapWithSetLocomotivesGeneric.java b/MapWithSetLocomotivesGeneric.java index f92bf87..d6bd589 100644 --- a/MapWithSetLocomotivesGeneric.java +++ b/MapWithSetLocomotivesGeneric.java @@ -29,7 +29,6 @@ public class MapWithSetLocomotivesGeneric } /// Добавление - //TODO public int Plus(T locomotive) { return this._setLocomotives.Insert(locomotive); @@ -39,7 +38,6 @@ public class MapWithSetLocomotivesGeneric { return this._setLocomotives.Remove(position); } - /// Вывод всего набора объектов public BufferedImage ShowSet() {