From 20701bee8ea51a5c5e85617dd8952f318145f013 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sat, 5 Nov 2022 20:52:21 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A3=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/.idea/uiDesigner.xml | 12 ++--- Project/src/.idea/workspace.xml | 49 +++++++++++++++++++ .../src/{FormAirbus.form => FormPlane.form} | 2 +- .../src/{FormAirbus.java => FormPlane.java} | 4 +- Project/src/Main.java | 2 +- 5 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 Project/src/.idea/workspace.xml rename Project/src/{FormAirbus.form => FormPlane.form} (99%) rename Project/src/{FormAirbus.java => FormPlane.java} (98%) diff --git a/Project/.idea/uiDesigner.xml b/Project/.idea/uiDesigner.xml index e96534f..013f18e 100644 --- a/Project/.idea/uiDesigner.xml +++ b/Project/.idea/uiDesigner.xml @@ -14,18 +14,18 @@ - - - - - - + + + + + + diff --git a/Project/src/.idea/workspace.xml b/Project/src/.idea/workspace.xml new file mode 100644 index 0000000..f0b5579 --- /dev/null +++ b/Project/src/.idea/workspace.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1667501112705 + + + + \ No newline at end of file diff --git a/Project/src/FormAirbus.form b/Project/src/FormPlane.form similarity index 99% rename from Project/src/FormAirbus.form rename to Project/src/FormPlane.form index b34deed..93521e4 100644 --- a/Project/src/FormAirbus.form +++ b/Project/src/FormPlane.form @@ -1,5 +1,5 @@ -
+ diff --git a/Project/src/FormAirbus.java b/Project/src/FormPlane.java similarity index 98% rename from Project/src/FormAirbus.java rename to Project/src/FormPlane.java index 3fbd8c3..28e1fce 100644 --- a/Project/src/FormAirbus.java +++ b/Project/src/FormPlane.java @@ -7,7 +7,7 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.util.Random; -public class FormAirbus +public class FormPlane { protected DrawingPlane plane = new DrawingPlane(); @@ -23,7 +23,7 @@ public class FormAirbus private JLabel LabelWeight = new JLabel(); private JLabel LabelColor = new JLabel(); - public FormAirbus() + public FormPlane() { //создание строки отображения скорости, веса и цвета объекта Box LableBox = Box.createHorizontalBox(); diff --git a/Project/src/Main.java b/Project/src/Main.java index 1d1f21a..9a6fc91 100644 --- a/Project/src/Main.java +++ b/Project/src/Main.java @@ -3,7 +3,7 @@ import javax.swing.*; public class Main { public static void main(String[] args) { JFrame frame = new JFrame("Airbus"); - frame.setContentPane(new FormAirbus().MainPanel); + frame.setContentPane(new FormPlane().MainPanel); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setLocation(500, 200); frame.pack(); From 7bd836461b1ed512c1400e13902bf454e413b9df Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Mon, 7 Nov 2022 10:41:30 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20?= =?UTF-8?q?=E2=84=962.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/src/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Project/src/Main.java b/Project/src/Main.java index 9a6fc91..de490d1 100644 --- a/Project/src/Main.java +++ b/Project/src/Main.java @@ -1,7 +1,8 @@ import javax.swing.*; public class Main { - public static void main(String[] args) { + public static void main(String[] args) + { JFrame frame = new JFrame("Airbus"); frame.setContentPane(new FormPlane().MainPanel); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);