WarmlyShip/.idea/.name

@@ -1 +0,0 @@
-Main.java

WarmlyShip/src/DiffetentsDrawingDecks/DrawingDecksType1.java

@@ -1,28 +0,0 @@
-package DiffetentsDrawingDecks;
-
-import java.awt.*;
-
-public class DrawingDecksType1 implements IDifferentDecks {
-    private NumberOfDecks numberOfDecks;
-    @Override
-    public void setNumberOfDecks(int numberofdeck) {
-        for (NumberOfDecks numofenum : NumberOfDecks.values()) {
-            if (numofenum.getNumdecks() == numberofdeck) {
-                numberOfDecks = numofenum;
-                return;
-            }
-        }
-    }
-    @Override
-    public NumberOfDecks getNumberOfDecks() {
-        return numberOfDecks;
-    }
-    @Override
-    public void DrawDecks(Graphics2D g, int x, int y, int width, int height, Color bodyColor) {
-        g.setColor(bodyColor);
-        g.fillRect(x, y, width, height);
-        g.setColor(Color.BLACK);
-        g.drawRect(x, y, width, height);
-        g.setColor(bodyColor);
-    }
-}

WarmlyShip/src/DiffetentsDrawingDecks/DrawingDecksType2.java

@@ -1,34 +0,0 @@
-package DiffetentsDrawingDecks;
-
-import java.awt.*;
-
-public class DrawingDecksType2 implements IDifferentDecks {
-    private NumberOfDecks numberOfDecks;
-    @Override
-    public void setNumberOfDecks(int numberofdeck) {
-        for (NumberOfDecks numofenum : NumberOfDecks.values()) {
-            if (numofenum.getNumdecks() == numberofdeck) {
-                numberOfDecks = numofenum;
-                return;
-            }
-        }
-    }
-    @Override
-    public NumberOfDecks getNumberOfDecks() {
-        return numberOfDecks;
-    }
-    @Override
-    public void DrawDecks(Graphics2D g, int x, int y, int width, int height, Color bodyColor) {
-        g.setStroke(new BasicStroke(3.0F));
-        g.setColor(bodyColor);
-        //верхняя часть полубы
-        g.drawLine(x, y, x + width, y);
-        //опорные балки
-        int countBalks = 4;
-        int wayBetweenBalks = width / countBalks;
-        for (int i = 0; i <= countBalks; i++) {
-            int nowX = x + wayBetweenBalks * i;
-            g.drawLine(nowX, y, nowX, y + height);
-        }
-    }
-}

WarmlyShip/src/DiffetentsDrawingDecks/DrawingDecksType3.java

@@ -1,28 +0,0 @@
-package DiffetentsDrawingDecks;
-
-import java.awt.*;
-
-public class DrawingDecksType3 implements IDifferentDecks{
-    private NumberOfDecks numberOfDecks;
-    @Override
-    public void setNumberOfDecks(int numberofdeck) {
-        for (NumberOfDecks numofenum : NumberOfDecks.values()) {
-            if (numofenum.getNumdecks() == numberofdeck) {
-                numberOfDecks = numofenum;
-                return;
-            }
-        }
-    }
-    @Override
-    public NumberOfDecks getNumberOfDecks() {
-        return numberOfDecks;
-    }
-    @Override
-    public void DrawDecks(Graphics2D g, int x, int y, int width, int height, Color bodyColor) {
-        g.setColor(bodyColor);
-        g.fillRect(x, y, width, height);
-        g.setColor(Color.BLACK);
-        g.fillRect(x+ 10, y+5, width - 20, height-5);
-        g.setColor(bodyColor);
-    }
-}

WarmlyShip/src/DiffetentsDrawingDecks/IDifferentDecks.java

@@ -1,9 +0,0 @@
-package DiffetentsDrawingDecks;
-
-import java.awt.*;
-
-public interface IDifferentDecks {
-    void setNumberOfDecks(int numberofdeck);
-    NumberOfDecks getNumberOfDecks();
-    void DrawDecks(Graphics2D g, int x, int y, int width, int height, Color bodyColor);
-}

WarmlyShip/src/DiffetentsDrawingDecks/NumberOfDecks.java

@@ -1,12 +0,0 @@
-package DiffetentsDrawingDecks;
-
-public enum NumberOfDecks {
-    OneDeck(1),
-    TwoDecks(2),
-    ThreeDecks(3);
-    private int numberofdecks;
-    NumberOfDecks(int numberofdecks) {
-        this.numberofdecks = numberofdecks;
-    }
-    public int getNumdecks() {return numberofdecks;}
-}

WarmlyShip/src/DrawingShip/CanvasWarmlyShip.java

@@ -1,18 +0,0 @@
-package DrawingShip;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class CanvasWarmlyShip extends JComponent {
-    public DrawingShip _drawingShip;
-    public CanvasWarmlyShip(){}
-    public void paintComponent(Graphics g) {
-        if (_drawingShip == null) {
-            return;
-        }
-        super.paintComponents(g);
-        Graphics2D g2d = (Graphics2D) g;
-        _drawingShip.DrawTransport(g2d);
-        super.repaint();
-    }
-}

WarmlyShip/src/DrawingShip/DirectionType.java

@@ -1,9 +0,0 @@
-package DrawingShip;
-
-public enum DirectionType {
-    Unknow,
-    Up,
-    Down,
-    Left,
-    Right
-}

WarmlyShip/src/DrawingShip/DrawingShip.java

@@ -1,146 +0,0 @@
-package DrawingShip;
-import DiffetentsDrawingDecks.DrawingDecksType2;
-import DiffetentsDrawingDecks.DrawingDecksType3;
-import DiffetentsDrawingDecks.IDifferentDecks;
-import Entities.EntityShip;
-
-import DiffetentsDrawingDecks.DrawingDecksType1;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class DrawingShip extends JPanel {
-    public Entities.EntityShip EntityShip;
-    public IDifferentDecks drawingDecks;
-    private Integer picture_width;
-    private Integer picture_height;
-    public Integer _StartPosX;
-    public Integer _StartPosY;
-    private int drawingShipWidth = 150;
-    protected int drawingShipHeight = 50;
-    public Integer GetPosX() {return _StartPosX;}
-    public Integer GetPosY() {return _StartPosY;}
-    public Integer GetWidth() {return drawingShipWidth;}
-    public Integer GetHeight() {return drawingShipHeight;}
-    protected DrawingShip() {
-        picture_width = null;
-        picture_height = null;
-        _StartPosX = null;
-        _StartPosY = null;
-    }
-    protected void SetAmountandTypeDecks() {
-        int numberOfDecks = (int)(Math.random() * 4 + 0);
-        switch ((int)(Math.random() * 3 + 1)) {
-            case 1:
-                drawingDecks = new DrawingDecksType1();
-                break;
-            case 2:
-                drawingDecks = new DrawingDecksType2();
-                break;
-            case 3:
-                drawingDecks = new DrawingDecksType3();
-                break;
-            default:
-                numberOfDecks = 0;
-                break;
-        }
-        drawingDecks.setNumberOfDecks(numberOfDecks);
-    }
-    public DrawingShip(int speed, double weight, Color bodycolor)  {
-        super();
-        EntityShip = new EntityShip(speed, weight, bodycolor);
-        SetAmountandTypeDecks();
-    }
-    public boolean SetPictureSize(int width, int height) {
-        if (width < drawingShipWidth || height < drawingShipHeight) return false;
-        picture_width = width;
-        picture_height = height;
-        if (_StartPosX != null || _StartPosY != null) {
-            if (_StartPosX + drawingShipWidth > picture_width)
-            {
-                _StartPosX = _StartPosX - (_StartPosX + drawingShipWidth - picture_width);
-            }
-            else if (_StartPosX < 0) _StartPosX = 0;
-            if (_StartPosY + drawingShipHeight > picture_height)
-            {
-                _StartPosY = _StartPosY - (_StartPosY + drawingShipHeight - picture_height);
-            }
-            else if (_StartPosY < 0) _StartPosY = 0;
-        }
-        return true;
-    }
-    public void SetPosition(int x, int y) {
-        if (!(picture_width != null && picture_height != null)) return;
-        if (x + drawingShipWidth > picture_width)
-        {
-            _StartPosX = x - (x + drawingShipWidth - picture_width);
-        }
-        else if (x < 0) _StartPosX = 0;
-        else _StartPosX = x;
-        if (y + drawingShipHeight > picture_height)
-        {
-            _StartPosY = y - (y + drawingShipHeight - picture_height);
-        }
-        else if (y < 0) _StartPosY = 0;
-        else _StartPosY = y;
-    }
-    public boolean MoveTransport(DirectionType direction) {
-        if (EntityShip == null || _StartPosX == null || _StartPosY == null) return false;
-        switch (direction) {
-            case DirectionType.Left:
-                if (_StartPosX - EntityShip.Step > 0) {
-                    _StartPosX -= (int)EntityShip.Step;
-                }
-                return true;
-            case DirectionType.Up:
-                if (_StartPosY - EntityShip.Step > 0)
-                {
-                    _StartPosY -= (int)EntityShip.Step;
-                }
-                return true;
-            case DirectionType.Right:
-                if (_StartPosX + drawingShipWidth + (int)EntityShip.Step < picture_width - EntityShip.Step)
-                {
-                    _StartPosX += (int)EntityShip.Step;
-                }
-                return true;
-            case DirectionType.Down:
-                if (_StartPosY + drawingShipHeight + (int)EntityShip.Step < picture_height - EntityShip.Step)
-                {
-                    _StartPosY += (int)EntityShip.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-    public void DrawTransport(Graphics2D g) {
-        if (EntityShip == null || _StartPosX == null || _StartPosY == null) return;
-        int y = _StartPosY;
-        g.setColor(EntityShip.getBodyColor());
-        if (drawingDecks.getNumberOfDecks() != null) {
-            switch (drawingDecks.getNumberOfDecks()) {
-                case OneDeck:
-                    drawingDecks.DrawDecks(g, _StartPosX + 30, y, 100, 15, EntityShip.getBodyColor());
-                    y += 15;
-                    break;
-                case TwoDecks:
-                    drawingDecks.DrawDecks(g, _StartPosX + 30, y, 100, 15, EntityShip.getBodyColor());
-                    drawingDecks.DrawDecks(g, _StartPosX + 30, y + 15, 100, 15, EntityShip.getBodyColor());
-                    y += 30;
-                    break;
-                case ThreeDecks:
-                    drawingDecks.DrawDecks(g, _StartPosX + 30, y, 100, 15, EntityShip.getBodyColor());
-                    drawingDecks.DrawDecks(g, _StartPosX + 30, y + 15, 100, 15, EntityShip.getBodyColor());
-                    drawingDecks.DrawDecks(g, _StartPosX + 30, y + 30, 100, 15, EntityShip.getBodyColor());
-                    y += 45;
-                    break;
-            }
-        }
-        int[] arrayX = {_StartPosX, _StartPosX+150, _StartPosX+150, _StartPosX+120, _StartPosX+120, _StartPosX+30, _StartPosX+30, _StartPosX};
-        int[] arrayY = {y, y, y, y + 50, y + 50, y + 50, y + 50, y};
-        Polygon poly = new Polygon(arrayX, arrayY, 8);
-        g.fillPolygon(poly);
-        drawingShipHeight = y + 50 - _StartPosY;
-    }
-}

WarmlyShip/src/DrawingShip/DrawingWarmlyShip.java

@@ -1,47 +0,0 @@
-package DrawingShip;
-import Entities.EntityWarmlyShip;
-
-import java.awt.*;
-
-public class DrawingWarmlyShip extends DrawingShip {
-    public DrawingWarmlyShip(int speed, double weight, Color bodycolor, Color additionalcolor, boolean sheeppipes, boolean fueltank) {
-        EntityShip = new EntityWarmlyShip(speed, weight, bodycolor, additionalcolor, sheeppipes, fueltank);
-        SetAmountandTypeDecks();
-    }
-    @Override
-    public void DrawTransport(Graphics2D g) {
-        if (EntityShip == null || !(EntityShip instanceof EntityWarmlyShip warmlyship) || _StartPosX == null || _StartPosY == null)
-            return;
-        int y = _StartPosY;
-        if (warmlyship.ShipPipes) {
-            //трубы
-            g.setColor(warmlyship.getAdditionalColor());
-            g.fillRect(_StartPosX + 70, _StartPosY, 12, 30);
-            g.fillRect(_StartPosX + 90, _StartPosY, 12, 30);
-            _StartPosY += 30;
-        }
-        super.DrawTransport(g);
-        int count_decks = 0;
-        if (drawingDecks.getNumberOfDecks() != null) {
-            switch (drawingDecks.getNumberOfDecks()) {
-                case OneDeck:
-                    count_decks = 1;
-                    break;
-                case TwoDecks:
-                    count_decks = 2;
-                    break;
-                case ThreeDecks:
-                    count_decks = 3;
-                    break;
-            }
-        }
-        if (warmlyship.FuelTank) {
-            g.setColor(warmlyship.getAdditionalColor());
-            g.fillRect(_StartPosX + 40, _StartPosY + count_decks * 15 + 30, 70, 10);
-        }
-        if (warmlyship.ShipPipes) {
-            _StartPosY -= 30;
-            drawingShipHeight += 30;
-        }
-    }
-}

WarmlyShip/src/Entities/EntityShip.java

@@ -1,18 +0,0 @@
-package Entities;
-
-import java.awt.*;
-
-public class EntityShip {
-    private int Speed;
-    private double Weight;
-    private Color BodyColor;
-    public Color getBodyColor() {return BodyColor;}
-    public double Step;
-    public EntityShip(int speed, double weight, Color bodycolor)
-    {
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodycolor;
-        Step = Speed * 100 / Weight;
-    }
-}

WarmlyShip/src/Entities/EntityWarmlyShip.java

@@ -1,16 +0,0 @@
-package Entities;
-
-import java.awt.*;
-public class EntityWarmlyShip extends EntityShip{
-    public Color AdditionalColor;
-    public  Color getAdditionalColor() {return AdditionalColor;}
-    public  boolean ShipPipes;
-    public  boolean FuelTank;
-    public EntityWarmlyShip(int speed, double weight, Color bodyColor, Color additionalcolor, boolean sheeppipes, boolean fueltank)
-    {
-        super(speed, weight, bodyColor);
-        AdditionalColor = additionalcolor;
-        ShipPipes = sheeppipes;
-        FuelTank = fueltank;
-    }
-}

WarmlyShip/src/FormWarmlyShip.java

@@ -1,207 +0,0 @@
-import DrawingShip.CanvasWarmlyShip;
-import DrawingShip.DirectionType;
-import DrawingShip.DrawingShip;
-import DrawingShip.DrawingWarmlyShip;
-import MovementStrategy.*;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.util.Random;
-
-public class FormWarmlyShip extends JFrame {
-    private String title;
-    private Dimension dimension;
-    private int Width, Height;
-    public CanvasWarmlyShip canvasWarmlyShip = new CanvasWarmlyShip();
-    private JButton CreateButton = new JButton("Create warmlyship");;
-    private JButton CreateShipButton = new JButton("Create ship");
-    private JButton UpButton = new JButton();
-    private JButton DownButton = new JButton();;
-    private JButton LeftButton = new JButton();;
-    private JButton RightButton = new JButton();
-    private AbstractStrategy _strategy;
-    private JComboBox ComboBoxStrategy = new JComboBox(new String[]{"К центру", "К краю"});
-    private JButton ButtonStrategy = new JButton("Шаг");
-    public FormWarmlyShip(String title, Dimension dimension) {
-        this.title = title;
-        this.dimension = dimension;
-    }
-    private void CreateObject(String typeOfClass) {
-        int StartPositionX = (int)(Math.random() * 90 + 10);
-        int StartPositionY = (int)(Math.random() * 90 + 10);
-        int speed = (int)(Math.random() * 300 + 100);
-        double weight = (double)(Math.random() * 3000 + 1000);
-        Color bodyColor = new Color((int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0));
-        switch (typeOfClass) {
-            case "DrawingShip":
-                canvasWarmlyShip._drawingShip = new DrawingShip(speed, weight, bodyColor);
-                canvasWarmlyShip._drawingShip.SetPictureSize(Width, Height);
-                canvasWarmlyShip._drawingShip.SetPosition(StartPositionX, StartPositionY);
-                canvasWarmlyShip.repaint();
-                break;
-            case "DrawingWarmlyShip":
-                Color additionalColor = new Color((int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0),(int)(Math.random() * 255 + 0));;
-                boolean sheepPipes = new Random().nextBoolean();
-                boolean fuelTank = new Random().nextBoolean();;
-                canvasWarmlyShip._drawingShip = new DrawingWarmlyShip(speed, weight, bodyColor, additionalColor, sheepPipes, fuelTank);
-                canvasWarmlyShip._drawingShip.SetPictureSize(Width, Height);
-                canvasWarmlyShip._drawingShip.SetPosition(StartPositionX, StartPositionY);
-                canvasWarmlyShip.repaint();
-                break;
-            default: return;
-        }
-        _strategy = null;
-        ComboBoxStrategy.setEnabled(true);
-    }
-    public void Init() {
-        setTitle(title);
-        setMinimumSize(dimension);
-        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-
-        Width = getWidth() - 10;
-        Height = getHeight() - 34;
-        _strategy = null;
-
-        CreateButton.setName("CREATE");
-        CreateShipButton.setName("CREATESHIPBUTTON");
-        Icon iconUp = new ImageIcon("src\\images\\up.jpg");
-        UpButton.setIcon(iconUp);
-        UpButton.setName("UP");
-        DownButton.setName("DOWN");
-        Icon iconDown = new ImageIcon("src\\images\\down.jpg");
-        DownButton.setIcon(iconDown);
-        LeftButton.setName("LEFT");
-        Icon iconLeft = new ImageIcon("src\\images\\left.jpg");
-        LeftButton.setIcon(iconLeft);
-        RightButton.setName("RIGHT");
-        Icon iconRight = new ImageIcon("src\\images\\right.jpg");
-        RightButton.setIcon(iconRight);
-
-        CreateButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CreateObject("DrawingWarmlyShip");
-            }
-        });
-
-        CreateShipButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                CreateObject("DrawingShip");
-            }
-        });
-
-        ButtonStrategy.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (canvasWarmlyShip._drawingShip == null) return;
-                if (ComboBoxStrategy.isEnabled())
-                {
-                    int index = ComboBoxStrategy.getSelectedIndex();
-                    switch(index)
-                    {
-                        case 0:
-                            _strategy = new MoveToCenter();
-                            break;
-                        case 1:
-                            _strategy = new MoveToBorder();
-                            break;
-                        default:
-                            _strategy = null;
-                            break;
-                    };
-                    if (_strategy == null)
-                    {
-                        return;
-                    }
-                    _strategy.SetData(new MoveableShip(canvasWarmlyShip._drawingShip), Width, Height);
-                }
-                if (_strategy == null)
-                {
-                    return;
-                }
-                ComboBoxStrategy.setEnabled(false);
-                _strategy.MakeStep();
-                if (_strategy.GetStatus() == StrategyStatus.Finish)
-                {
-                    ComboBoxStrategy.setEnabled(true);
-                    _strategy = null;
-                }
-            }
-        });
-
-        ActionListener actionListener = new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                if (canvasWarmlyShip._drawingShip == null) return;
-                boolean result = false;
-                switch ((((JButton)(event.getSource())).getName())) {
-                    case "UP":
-                        System.out.println("Кнопка UP нажата");
-                        result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Up);
-                        break;
-                    case "DOWN":
-                        result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Down);
-                        break;
-                    case "LEFT":
-                        result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Left);
-                        break;
-                    case "RIGHT":
-                        result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Right);
-                        break;
-                }
-                if (result) {
-                    canvasWarmlyShip.repaint();
-                }
-            }
-        };
-        UpButton.addActionListener(actionListener);
-        DownButton.addActionListener(actionListener);
-        LeftButton.addActionListener(actionListener);
-        RightButton.addActionListener(actionListener);
-
-        setSize(dimension.width,dimension.height);
-        setLayout(null);
-        canvasWarmlyShip.setBounds(0,0, getWidth(), getHeight());
-        CreateButton.setBounds(10, getHeight() - 90, 140, 40);
-        CreateShipButton.setBounds(160, getHeight() - 90, 140, 40);
-        UpButton.setBounds(getWidth() - 140, getHeight() - 160, 50, 50);
-        DownButton.setBounds(getWidth() - 140, getHeight() - 100, 50, 50);
-        RightButton.setBounds(getWidth() - 80, getHeight() - 100, 50, 50);
-        LeftButton.setBounds(getWidth() - 200, getHeight() - 100, 50, 50);
-        ComboBoxStrategy.setBounds(getWidth() - 170, 10, 140, 35);
-        ButtonStrategy.setBounds(getWidth() - 130, 55, 100, 25);
-        add(CreateButton);
-        add(CreateShipButton);
-        add(UpButton);
-        add(DownButton);
-        add(RightButton);
-        add(LeftButton);
-        add(ComboBoxStrategy);
-        add(ButtonStrategy);
-        add(canvasWarmlyShip);
-        setVisible(true);
-        //обработка события изменения размеров окна
-        addComponentListener(new ComponentAdapter() {
-            public void componentResized(ComponentEvent e) {
-                Width = getWidth() - 10;
-                Height = getHeight() - 34;
-                if (canvasWarmlyShip._drawingShip != null)
-                    canvasWarmlyShip._drawingShip.SetPictureSize(Width, Height);
-                canvasWarmlyShip.setBounds(0,0, getWidth(), getHeight());
-                CreateButton.setBounds(10, getHeight() - 90, 140, 40);
-                CreateShipButton.setBounds(160, getHeight() - 90, 140, 40);
-                UpButton.setBounds(getWidth() - 140, getHeight() - 160, 50, 50);
-                DownButton.setBounds(getWidth() - 140, getHeight() - 100, 50, 50);
-                RightButton.setBounds(getWidth() - 80, getHeight() - 100, 50, 50);
-                LeftButton.setBounds(getWidth() - 200, getHeight() - 100, 50, 50);
-                ComboBoxStrategy.setBounds(getWidth() - 170, 10, 140, 35);
-                ButtonStrategy.setBounds(getWidth() - 130, 55, 100, 25);
-            }
-        });
-    }
-}

WarmlyShip/src/Main.java

@@ -1,7 +1,5 @@
-import java.awt.*;
 public class Main {
     public static void main(String[] args) {
-        FormWarmlyShip form = new FormWarmlyShip("Теплоход", new Dimension(700,500));
+        System.out.println("Hello world!");
-        form.Init();
     }
 }

WarmlyShip/src/MovementStrategy/AbstractStrategy.java

@@ -1,56 +0,0 @@
-package MovementStrategy;
-
-public abstract class AbstractStrategy {
-    private IMoveableObjects _moveableObject;
-    private StrategyStatus _state = StrategyStatus.NotInit;
-    public int FieldWidth;
-    public int FieldHeight;
-    public StrategyStatus GetStatus() {return _state;}
-    public void SetData(IMoveableObjects moveableObjects, int width, int height)
-    {
-        if (moveableObjects == null)
-        {
-            _state = StrategyStatus.NotInit;
-            return;
-        }
-        _state = StrategyStatus.InProgress;
-        _moveableObject = moveableObjects;
-        FieldWidth = width;
-        FieldHeight = height;
-    }
-    public void MakeStep()
-    {
-        if (_state != StrategyStatus.InProgress) return;
-        if (IsTargetDestinaion())
-        {
-            _state = StrategyStatus.Finish;
-            return;
-        }
-        MoveToTarget();
-    }
-    protected boolean MoveLeft() {return MoveTo(MovementDirection.Left);};
-    protected boolean MoveRight() {return MoveTo(MovementDirection.Right);};
-    protected boolean MoveUp() {return MoveTo(MovementDirection.Up);};
-    protected boolean MoveDown() {return MoveTo(MovementDirection.Down);};
-    protected ObjectParameters GetObjectParameters() {return _moveableObject.GetObjectPosition();};
-    protected Integer GetStep()
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return null;
-        }
-        return _moveableObject.GetStep();
-    }
-    protected abstract void MoveToTarget();
-    protected abstract boolean IsTargetDestinaion();
-    private boolean MoveTo(MovementDirection movementDirection)
-    {
-        if (_state != StrategyStatus.InProgress)
-        {
-            return false;
-        }
-        boolean stateTryMoveObject = _moveableObject.TryMoveObject(movementDirection);
-        if (stateTryMoveObject) return stateTryMoveObject;
-        return false;
-    }
-}

WarmlyShip/src/MovementStrategy/IMoveableObjects.java

@@ -1,7 +0,0 @@
-package MovementStrategy;
-
-public interface IMoveableObjects {
-    ObjectParameters GetObjectPosition();
-    int GetStep();
-    boolean TryMoveObject(MovementDirection direction);
-}

WarmlyShip/src/MovementStrategy/MoveToBorder.java

@@ -1,27 +0,0 @@
-package MovementStrategy;
-
-public class MoveToBorder extends AbstractStrategy{
-    @Override
-    protected boolean IsTargetDestinaion() {
-        ObjectParameters objParams = GetObjectParameters();
-        if (objParams == null)
-        {
-            return false;
-        }
-        return objParams.RightBorder + GetStep() >= FieldWidth-GetStep() &&
-                objParams.DownBorder + GetStep() >= FieldHeight-GetStep();
-    }
-    @Override
-    protected void MoveToTarget() {
-        ObjectParameters objParams = GetObjectParameters();
-        if (objParams == null)
-        {
-            return;
-        }
-        //реализация в правый нижний угол
-        int x = objParams.RightBorder;
-        if (x + GetStep() < FieldWidth) MoveRight();
-        int y = objParams.DownBorder;
-        if (y + GetStep() < FieldHeight) MoveDown();
-    }
-}

WarmlyShip/src/MovementStrategy/MoveToCenter.java

@@ -1,48 +0,0 @@
-package MovementStrategy;
-
-public class MoveToCenter extends AbstractStrategy{
-    @Override
-    protected boolean IsTargetDestinaion() {
-        ObjectParameters objParams = GetObjectParameters();
-        if (objParams == null)
-        {
-            return false;
-        }
-        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2  &&
-                objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2  &&
-                objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 &&
-                objParams.ObjectMiddleVertical + GetStep()  >= FieldHeight /2;
-    }
-    @Override
-    protected void MoveToTarget() {
-        ObjectParameters objParams = GetObjectParameters();
-        if (objParams == null)
-        {
-            return;
-        }
-        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
-        if (Math.abs(diffX) > GetStep())
-        {
-            if (diffX > 0)
-            {
-                MoveLeft();
-            }
-            else
-            {
-                MoveRight();
-            }
-        }
-        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
-        if (Math.abs(diffY) > GetStep())
-        {
-            if (diffY > 0)
-            {
-                MoveUp();
-            }
-            else
-            {
-                MoveDown();
-            }
-        }
-    }
-}

WarmlyShip/src/MovementStrategy/MoveableShip.java

@@ -1,45 +0,0 @@
-package MovementStrategy;
-
-import DrawingShip.CanvasWarmlyShip;
-import DrawingShip.DirectionType;
-import DrawingShip.DrawingShip;
-
-public class MoveableShip implements IMoveableObjects{
-    private CanvasWarmlyShip canvas = new CanvasWarmlyShip();
-    public MoveableShip(DrawingShip drawningship)
-    {
-        canvas._drawingShip = drawningship;
-    }
-    @Override
-    public ObjectParameters GetObjectPosition() {
-      if (canvas._drawingShip == null || canvas._drawingShip.EntityShip == null ||
-              canvas._drawingShip.GetPosX() == null || canvas._drawingShip.GetPosY() == null)
-      {
-          return null;
-      }
-      return new ObjectParameters(canvas._drawingShip.GetPosX(), canvas._drawingShip.GetPosY(),
-                canvas._drawingShip.GetWidth(), canvas._drawingShip.GetHeight());
-    }
-    @Override
-    public int GetStep() {
-        return (int)(canvas._drawingShip.EntityShip.Step);
-    }
-    @Override
-    public boolean TryMoveObject(MovementDirection direction) {
-      if (canvas._drawingShip == null || canvas._drawingShip.EntityShip == null)
-      {
-          return false;
-      }
-        return canvas._drawingShip.MoveTransport(GetDirectionType(direction));
-    }
-    private static DirectionType GetDirectionType(MovementDirection direction)
-    {
-        switch (direction) {
-            case MovementDirection.Left: return DirectionType.Left;
-            case MovementDirection.Right: return DirectionType.Right;
-            case MovementDirection.Up: return DirectionType.Up;
-            case MovementDirection.Down: return DirectionType.Down;
-            default: return DirectionType.Unknow;
-        }
-    }
-}

WarmlyShip/src/MovementStrategy/MovementDirection.java

@@ -1,8 +0,0 @@
-package MovementStrategy;
-
-public enum MovementDirection {
-    Up,
-    Down,
-    Left,
-    Right
-}

WarmlyShip/src/MovementStrategy/ObjectParameters.java

@@ -1,27 +0,0 @@
-package MovementStrategy;
-
-public class ObjectParameters {
-    private int _x;
-    private int _y;
-    private int _width;
-    private int _height;
-    public int LeftBorder = _x;
-    public int TopBorder = _y;
-    public int RightBorder = _x + _width;
-    public int DownBorder = _y + _height;
-    public int ObjectMiddleHorizontal = _x + _width / 2;
-    public int ObjectMiddleVertical = _y + _height / 2;
-    public ObjectParameters(int x, int y, int width, int height)
-    {
-        _x = x;
-        _y = y;
-        _width = width;
-        _height = height;
-        LeftBorder = _x;
-        TopBorder = _y;
-        RightBorder = _x + _width;
-        DownBorder = _y + _height;
-        ObjectMiddleHorizontal = _x + _width / 2;
-        ObjectMiddleVertical = _y + _height / 2;
-    }
-}

WarmlyShip/src/MovementStrategy/StrategyStatus.java

@@ -1,7 +0,0 @@
-package MovementStrategy;
-
-public enum StrategyStatus {
-    NotInit,
-    InProgress,
-    Finish
-}