diff --git a/WarmlyShip/src/CanvasWarmlyShip.java b/WarmlyShip/src/CanvasWarmlyShip.java deleted file mode 100644 index 2e1b6a2..0000000 --- a/WarmlyShip/src/CanvasWarmlyShip.java +++ /dev/null @@ -1,16 +0,0 @@ -import javax.swing.*; -import java.awt.*; - -public class CanvasWarmlyShip extends JComponent { - public DrawingWarmlyShip _drawingWarmlyShip; - public CanvasWarmlyShip(){} - public void paintComponent(Graphics g) { - if (_drawingWarmlyShip == null) { - return; - } - super.paintComponents(g); - Graphics2D g2d = (Graphics2D) g; - _drawingWarmlyShip.DrawTransport(g2d); - super.repaint(); - } -} diff --git a/WarmlyShip/src/DirectionType.java b/WarmlyShip/src/DirectionType.java deleted file mode 100644 index 35657f0..0000000 --- a/WarmlyShip/src/DirectionType.java +++ /dev/null @@ -1,6 +0,0 @@ -public enum DirectionType { - Up, - Down, - Left, - Right -} diff --git a/WarmlyShip/src/DrawingDecks.java b/WarmlyShip/src/DrawingDecks.java deleted file mode 100644 index f7afbdc..0000000 --- a/WarmlyShip/src/DrawingDecks.java +++ /dev/null @@ -1,23 +0,0 @@ -import java.awt.*; - -public class DrawingDecks { - private NumberOfDecks numberOfDecks; - public void setNumberOfDecks(int numberofdeck) { - for (NumberOfDecks numofenum : NumberOfDecks.values()) { - if (numofenum.getNumdecks() == numberofdeck) { - numberOfDecks = numofenum; - return; - } - } - } - public NumberOfDecks getNumberOfDecks() { - return numberOfDecks; - } - public void DrawDecks(Graphics 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); - } -} diff --git a/WarmlyShip/src/DrawingWarmlyShip.java b/WarmlyShip/src/DrawingWarmlyShip.java deleted file mode 100644 index 2a3a221..0000000 --- a/WarmlyShip/src/DrawingWarmlyShip.java +++ /dev/null @@ -1,127 +0,0 @@ -import javax.swing.*; -import java.awt.*; - -public class DrawingWarmlyShip extends JPanel { - public EntityWarmlyShip EntityWarmlyShip; - public DrawingDecks drawingDecks = null; - private Integer picture_width; - private Integer picture_height; - private Integer _StartPosX; - private Integer _StartPosY; - private int drawingShipWidth = 150; - private int drawingShipHeight = 140; - public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, boolean sheeppipes, boolean fueltank) { - EntityWarmlyShip = new EntityWarmlyShip(); - EntityWarmlyShip.Init(speed, weight, bodycolor, additionalcolor, sheeppipes, fueltank); - picture_width = null; - picture_height = null; - _StartPosX = null; - _StartPosY = null; - drawingDecks = new DrawingDecks(); - drawingDecks.setNumberOfDecks((int)(Math.random() * 4 + 0)); - } - 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 (EntityWarmlyShip == null || _StartPosX == null || _StartPosY == null) return false; - switch (direction) { - case Left: - if (_StartPosX - EntityWarmlyShip.Step > 0) { - _StartPosX -= (int)EntityWarmlyShip.Step; - } - return true; - case Up: - if (_StartPosY - EntityWarmlyShip.Step > 0) - { - _StartPosY -= (int)EntityWarmlyShip.Step; - } - return true; - case Right: - if (_StartPosX + drawingShipWidth + (int)EntityWarmlyShip.Step < picture_width - EntityWarmlyShip.Step) - { - _StartPosX += (int)EntityWarmlyShip.Step; - } - return true; - case Down: - if (_StartPosY + drawingShipHeight + (int)EntityWarmlyShip.Step < picture_height - EntityWarmlyShip.Step) - { - _StartPosY += (int)EntityWarmlyShip.Step; - } - return true; - default: - return false; - } - } - public void DrawTransport(Graphics2D g) { - if (EntityWarmlyShip == null || _StartPosX == null || _StartPosY == null) return; - int y = _StartPosY; - if (EntityWarmlyShip.getShipPipes()) { - //трубы - g.setColor(EntityWarmlyShip.getAdditionalColor()); - g.fillRect(_StartPosX + 70, _StartPosY, 12, 30); - g.fillRect(_StartPosX + 90, _StartPosY, 12, 30); - y += 30; - } - g.setColor(EntityWarmlyShip.getBodyColor()); - if (drawingDecks.getNumberOfDecks() != null) { - switch (drawingDecks.getNumberOfDecks()) { - case OneDeck: - drawingDecks.DrawDecks(g, _StartPosX + 30, y, 100, 15, EntityWarmlyShip.getBodyColor()); - y += 15; - break; - case TwoDecks: - drawingDecks.DrawDecks(g, _StartPosX + 30, y, 100, 15, EntityWarmlyShip.getBodyColor()); - drawingDecks.DrawDecks(g, _StartPosX + 30, y + 15, 100, 15, EntityWarmlyShip.getBodyColor()); - y += 30; - break; - case ThreeDecks: - drawingDecks.DrawDecks(g, _StartPosX + 30, y, 100, 15, EntityWarmlyShip.getBodyColor()); - drawingDecks.DrawDecks(g, _StartPosX + 30, y + 15, 100, 15, EntityWarmlyShip.getBodyColor()); - drawingDecks.DrawDecks(g, _StartPosX + 30, y + 30, 100, 15, EntityWarmlyShip.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); - g.setColor(EntityWarmlyShip.getAdditionalColor()); - if (EntityWarmlyShip.getFuelTank()) { - g.setColor(EntityWarmlyShip.getAdditionalColor()); - g.fillRect(_StartPosX + 40, y + 30, 70, 10); - } - drawingShipHeight = y + 50 - _StartPosY; - } -} diff --git a/WarmlyShip/src/EntityWarmlyShip.java b/WarmlyShip/src/EntityWarmlyShip.java deleted file mode 100644 index 6fd0aed..0000000 --- a/WarmlyShip/src/EntityWarmlyShip.java +++ /dev/null @@ -1,24 +0,0 @@ -import java.awt.*; -public class EntityWarmlyShip { - private int Speed; - private double Weight; - private Color BodyColor; - public Color getBodyColor() {return BodyColor;} - private Color AdditionalColor; - public Color getAdditionalColor() {return AdditionalColor;} - private boolean ShipPipes; - public boolean getShipPipes() {return ShipPipes;} - private boolean FuelTank; - public boolean getFuelTank() {return FuelTank;} - public double Step; - public void Init(int speed, double weight, Color bodycolor, Color additionalcolor, boolean shippipes, boolean fueltank) - { - Speed = speed; - Weight = weight; - BodyColor = bodycolor; - AdditionalColor = additionalcolor; - ShipPipes = shippipes; - FuelTank = fueltank; - Step = Speed * 100 / Weight; - } -} diff --git a/WarmlyShip/src/FormWarmlyShip.java b/WarmlyShip/src/FormWarmlyShip.java index 760d3fa..b712300 100644 --- a/WarmlyShip/src/FormWarmlyShip.java +++ b/WarmlyShip/src/FormWarmlyShip.java @@ -1,3 +1,9 @@ +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; @@ -10,24 +16,58 @@ public class FormWarmlyShip extends JFrame { private String title; private Dimension dimension; private int Width, Height; - private CanvasWarmlyShip canvasWarmlyShip = new CanvasWarmlyShip(); - private JButton CreateButton = new JButton("Create");; + 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() - 15; - Height = getHeight() - 35; + + 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"); @@ -44,39 +84,74 @@ public class FormWarmlyShip extends JFrame { CreateButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - 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)); - 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._drawingWarmlyShip = new DrawingWarmlyShip(); - canvasWarmlyShip._drawingWarmlyShip.Init(speed, weight, bodyColor, additionalColor, sheepPipes, fuelTank); - canvasWarmlyShip._drawingWarmlyShip.SetPictureSize(Width, Height); - canvasWarmlyShip._drawingWarmlyShip.SetPosition( StartPositionX, StartPositionY); - canvasWarmlyShip.repaint(); + 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._drawingWarmlyShip == null) return; + if (canvasWarmlyShip._drawingShip == null) return; boolean result = false; switch ((((JButton)(event.getSource())).getName())) { case "UP": - result = canvasWarmlyShip._drawingWarmlyShip.MoveTransport(DirectionType.Up); + System.out.println("Кнопка UP нажата"); + result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Up); break; case "DOWN": - result = canvasWarmlyShip._drawingWarmlyShip.MoveTransport(DirectionType.Down); + result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Down); break; case "LEFT": - result = canvasWarmlyShip._drawingWarmlyShip.MoveTransport(DirectionType.Left); + result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Left); break; case "RIGHT": - result = canvasWarmlyShip._drawingWarmlyShip.MoveTransport(DirectionType.Right); + result = canvasWarmlyShip._drawingShip.MoveTransport(DirectionType.Right); break; } if (result) { @@ -92,31 +167,40 @@ public class FormWarmlyShip extends JFrame { setSize(dimension.width,dimension.height); setLayout(null); canvasWarmlyShip.setBounds(0,0, getWidth(), getHeight()); - CreateButton.setBounds(10, getHeight() - 90, 100, 40); + 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() - 15; - Height = getHeight() - 35; - if (canvasWarmlyShip._drawingWarmlyShip != null) - canvasWarmlyShip._drawingWarmlyShip.SetPictureSize(Width, Height); + 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, 100, 40); + 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); } }); } diff --git a/WarmlyShip/src/Main.java b/WarmlyShip/src/Main.java index c5fcc85..a785b53 100644 --- a/WarmlyShip/src/Main.java +++ b/WarmlyShip/src/Main.java @@ -1,8 +1,7 @@ import java.awt.*; - public class Main { public static void main(String[] args) { - FormWarmlyShip form = new FormWarmlyShip("Теплоход", new Dimension(500,500)); + FormWarmlyShip form = new FormWarmlyShip("Теплоход", new Dimension(700,500)); form.Init(); } } \ No newline at end of file diff --git a/WarmlyShip/src/NumberOfDecks.java b/WarmlyShip/src/NumberOfDecks.java deleted file mode 100644 index d1526e0..0000000 --- a/WarmlyShip/src/NumberOfDecks.java +++ /dev/null @@ -1,10 +0,0 @@ -public enum NumberOfDecks { - OneDeck(1), - TwoDecks(2), - ThreeDecks(3); - private int numberofdecks; - NumberOfDecks(int numberofdecks) { - this.numberofdecks = numberofdecks; - } - public int getNumdecks() {return numberofdecks;} -}