From 7fb34d7482960bfffc77bc11cd6d2d736b7f8ec2 Mon Sep 17 00:00:00 2001
From: Zakharov_Rostislav <r.z.8102.80@gmail.com>
Date: Sat, 9 Dec 2023 09:55:52 +0400
Subject: [PATCH] lab5 preparations for pull request p.2

---
 src/drawing_objects/DrawingShip.java         | 4 ++--
 src/frames/FrameShipConfig.java              | 4 ++--
 src/frames/HardFrame.java                    | 2 +-
 src/movement_strategy/DrawingObjectShip.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/drawing_objects/DrawingShip.java b/src/drawing_objects/DrawingShip.java
index b2f0b1a..64c2448 100644
--- a/src/drawing_objects/DrawingShip.java
+++ b/src/drawing_objects/DrawingShip.java
@@ -25,11 +25,11 @@ public class DrawingShip {
         return startPosY;
     }
     private int shipWidth = 150;
-    public int getShipWidth() {
+    public int getWidth() {
         return shipWidth;
     }
     private int shipHeight = 50;
-    public int getShipHeight() {
+    public int getHeight() {
         return shipHeight;
     }
     public IMoveableObject getMoveableObject() {return new DrawingObjectShip(this);}
diff --git a/src/frames/FrameShipConfig.java b/src/frames/FrameShipConfig.java
index 1103ba4..052a0ae 100644
--- a/src/frames/FrameShipConfig.java
+++ b/src/frames/FrameShipConfig.java
@@ -244,8 +244,8 @@ public class FrameShipConfig extends JFrame {
                                     drawingShip.setBlocksNumber(blocksNumber);
                                 }
                             }
-                            drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getShipWidth() / 2,
-                                    pictureBoxHeight / 2 - drawingShip.getShipHeight() / 2);
+                            drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getWidth() / 2,
+                                    pictureBoxHeight / 2 - drawingShip.getHeight() / 2);
                             pictureBox.repaint();
                             return true;
                         } catch (UnsupportedFlavorException | IOException e) {
diff --git a/src/frames/HardFrame.java b/src/frames/HardFrame.java
index 6154d8e..41fd58f 100644
--- a/src/frames/HardFrame.java
+++ b/src/frames/HardFrame.java
@@ -37,7 +37,7 @@ public class HardFrame extends JFrame {
         }while(check);
         buttonMakeObject.addActionListener(e -> {
                     DrawingShip drawingShip = generic.makeObject();
-                    drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getShipWidth()/2, pictureBoxHeight / 2 - drawingShip.getShipHeight()/2);
+                    drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getWidth()/2, pictureBoxHeight / 2 - drawingShip.getHeight()/2);
                     drawing = drawingShip;
                     draw();
                 });
diff --git a/src/movement_strategy/DrawingObjectShip.java b/src/movement_strategy/DrawingObjectShip.java
index fc222a9..2cbc33a 100644
--- a/src/movement_strategy/DrawingObjectShip.java
+++ b/src/movement_strategy/DrawingObjectShip.java
@@ -13,7 +13,7 @@ public class DrawingObjectShip implements IMoveableObject{
         if(drawingShip == null || drawingShip.getEntityShip() == null)
             return null;
         return new ObjectParameters(drawingShip.getPosX(), drawingShip.getPosY(),
-                drawingShip.getShipWidth(), drawingShip.getShipHeight());
+                drawingShip.getWidth(), drawingShip.getHeight());
     }
     @Override
     public int getStep(){