From af8b91a1a4f3f27149a31573e19a9a28707e005d Mon Sep 17 00:00:00 2001 From: ksenianeva <95441235+ksenianeva@users.noreply.github.com> Date: Wed, 21 Dec 2022 19:35:02 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BD=D0=B0=D0=B7?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ContainerShip/src/containership/DrawingShip.java | 4 ++-- ContainerShip/src/containership/JFrame_Ship.form | 7 +++---- ContainerShip/src/containership/JFrame_Ship.java | 13 ++++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ContainerShip/src/containership/DrawingShip.java b/ContainerShip/src/containership/DrawingShip.java index e9a2fdb..d5057ec 100644 --- a/ContainerShip/src/containership/DrawingShip.java +++ b/ContainerShip/src/containership/DrawingShip.java @@ -20,12 +20,12 @@ public class DrawingShip { private static final int _shipWidth = 135; private static final int _shipHeight = 40; - public void Init(int speed, float weight, Color bodyColor, int numberOfDeks){ + public void Init(int speed, float weight, Color bodyColor, int numberOfDecks){ Ship = new EntityShip(); // мметод прорисовки палуб drawingDecks = new DrawingDecks(); Ship.Init(speed, weight, bodyColor); - drawingDecks.setNumberOfDecks(numberOfDeks);/////// палубы + drawingDecks.setNumberOfDecks(numberOfDecks);/////// палубы } public EntityShip getShip() { diff --git a/ContainerShip/src/containership/JFrame_Ship.form b/ContainerShip/src/containership/JFrame_Ship.form index 772a7aa..07daf13 100644 --- a/ContainerShip/src/containership/JFrame_Ship.form +++ b/ContainerShip/src/containership/JFrame_Ship.form @@ -34,7 +34,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -163,7 +163,6 @@ - diff --git a/ContainerShip/src/containership/JFrame_Ship.java b/ContainerShip/src/containership/JFrame_Ship.java index 4652f93..37873bf 100644 --- a/ContainerShip/src/containership/JFrame_Ship.java +++ b/ContainerShip/src/containership/JFrame_Ship.java @@ -30,7 +30,7 @@ public class JFrame_Ship extends javax.swing.JFrame { private void initComponents() { ShipCanvas = new containership.MyCanvas(); - labelAmountOfDeks = new javax.swing.JLabel(); + labelAmountOfDecks = new javax.swing.JLabel(); comboBoxAmountOfDecks = new javax.swing.JComboBox<>(); buttonCreate = new javax.swing.JButton(); statusLabel = new javax.swing.JLabel(); @@ -47,7 +47,7 @@ public class JFrame_Ship extends javax.swing.JFrame { } }); - labelAmountOfDeks.setText("Количество палуб"); + labelAmountOfDecks.setText("Количество палуб"); comboBoxAmountOfDecks.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "Одна", "Две", "Три" })); @@ -77,7 +77,6 @@ public class JFrame_Ship extends javax.swing.JFrame { }); buttonRight.setIcon(new javax.swing.ImageIcon(getClass().getResource("/containership/Rightarrow.png"))); // NOI18N - buttonRight.setActionCommand(""); buttonRight.setName("buttonRight"); // NOI18N buttonRight.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -108,7 +107,7 @@ public class JFrame_Ship extends javax.swing.JFrame { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 381, Short.MAX_VALUE) .addComponent(buttonLeft, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(layout.createSequentialGroup() - .addComponent(labelAmountOfDeks) + .addComponent(labelAmountOfDecks) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(comboBoxAmountOfDecks, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -133,7 +132,7 @@ public class JFrame_Ship extends javax.swing.JFrame { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(labelAmountOfDeks) + .addComponent(labelAmountOfDecks) .addComponent(comboBoxAmountOfDecks, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(buttonCreate)) @@ -149,7 +148,7 @@ public class JFrame_Ship extends javax.swing.JFrame { .addContainerGap()) ); - labelAmountOfDeks.getAccessibleContext().setAccessibleName(""); + labelAmountOfDecks.getAccessibleContext().setAccessibleName(""); pack(); }// //GEN-END:initComponents @@ -236,7 +235,7 @@ public class JFrame_Ship extends javax.swing.JFrame { private javax.swing.JButton buttonRight; private javax.swing.JButton buttonUp; private javax.swing.JComboBox comboBoxAmountOfDecks; - private javax.swing.JLabel labelAmountOfDeks; + private javax.swing.JLabel labelAmountOfDecks; private javax.swing.JLabel statusLabel; // End of variables declaration//GEN-END:variables }