From 39fe319e0bd083eb574fc1c3f9d4a4e22744131a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Wed, 2 Nov 2022 10:21:55 +0400 Subject: [PATCH] Fix ornament --- src/DrawingOrnamentWheelsSecond.java | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/DrawingOrnamentWheelsSecond.java b/src/DrawingOrnamentWheelsSecond.java index cf2ff8d..75b725b 100644 --- a/src/DrawingOrnamentWheelsSecond.java +++ b/src/DrawingOrnamentWheelsSecond.java @@ -22,9 +22,9 @@ public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{ g.setColor(Color.BLACK); g.drawOval(_startPosX + 10, _startPosY + 35, 20, 20); g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20); - g.setColor(Color.RED); - g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5); - g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5); + g.setColor(Color.GRAY); + g.drawRect(_startPosX + 130, _startPosY + 45, 20, 5); + g.drawRect(_startPosX + 10, _startPosY + 45, 20, 5); } if (_wheels.getCountWheels() == 3) { g.setColor(Color.BLACK); @@ -32,10 +32,10 @@ public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{ g.fillOval(_startPosX + 10, _startPosY + 35, 20, 20); g.drawOval(_startPosX + 30, _startPosY + 35, 20, 20); g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20); - g.setColor(Color.RED); - g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5); - g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5); - g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5); + g.setColor(Color.GRAY); + g.drawRect(_startPosX + 130, _startPosY + 45, 20, 5); + g.drawRect(_startPosX + 30, _startPosY + 45, 20, 5); + g.drawRect(_startPosX + 10, _startPosY + 45, 20, 5); } if (_wheels.getCountWheels() == 4) { g.setColor(Color.BLACK); @@ -45,11 +45,11 @@ public class DrawingOrnamentWheelsSecond implements IDrawningObjectWheels{ g.fillOval(_startPosX + 30, _startPosY + 35, 20, 20); g.drawOval(_startPosX + 50, _startPosY + 35, 20, 20); g.fillOval(_startPosX + 50, _startPosY + 35, 20, 20); - g.setColor(Color.RED); - g.drawOval(_startPosX + 130, _startPosY + 45, 20, 5); - g.drawOval(_startPosX + 50, _startPosY + 45, 20, 5); - g.drawOval(_startPosX + 30, _startPosY + 45, 20, 5); - g.drawOval(_startPosX + 10, _startPosY + 45, 20, 5); + g.setColor(Color.GRAY); + g.drawRect(_startPosX + 130, _startPosY + 45, 20, 5); + g.drawRect(_startPosX + 50, _startPosY + 45, 20, 5); + g.drawRect(_startPosX + 30, _startPosY + 45, 20, 5); + g.drawRect(_startPosX + 10, _startPosY + 45, 20, 5); } } }