change this.color to getColor() and null to default figure

mate-academy · Dec 28, 2024 · c58bfac · c58bfac
1 parent a58aa62
commit c58bfac
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/core/basesyntax/Circle.java b/src/main/java/core/basesyntax/Circle.java
@@ -17,6 +17,6 @@ public double getArea() {
     public void draw() {
         System.out.println("Figure: circle, area: "
                 + getArea() + " sq. units, radius: "
-                + this.radius + " units, color: " + this.color);
+                + this.radius + " units, color: " + getColor());
     }
 }
diff --git a/src/main/java/core/basesyntax/FigureSupplier.java b/src/main/java/core/basesyntax/FigureSupplier.java
@@ -30,7 +30,7 @@ public Figure getRandomFigure() {
                 return new IsoscelesTrapezoid(getRandomColor(), random.nextInt(1, 10),
                         random.nextInt(1, 10), random.nextInt(1, 10));
             default:
-                return null;
+                return getDefaultFigure();
         }
     }
 

diff --git a/src/main/java/core/basesyntax/IsoscelesTrapezoid.java b/src/main/java/core/basesyntax/IsoscelesTrapezoid.java
@@ -24,6 +24,6 @@ public void draw() {
                 + this.base1 + ", base2: "
                 + this.base2 + ", height: "
                 + this.height + " units, color: "
-                + this.color);
+                + getColor());
     }
 }
diff --git a/src/main/java/core/basesyntax/Rectangle.java b/src/main/java/core/basesyntax/Rectangle.java
@@ -19,6 +19,6 @@ public double getArea() {
     public void draw() {
         System.out.println("Figure: rectangle, area: "
                 + getArea() + " sq. units, length: "
-                + this.length + ", width: " + this.width + " units, color: " + this.color);
+                + this.length + ", width: " + this.width + " units, color: " + getColor());
     }
 }
diff --git a/src/main/java/core/basesyntax/RightTriangle.java b/src/main/java/core/basesyntax/RightTriangle.java
@@ -21,6 +21,6 @@ public void draw() {
                 + getArea() + " sq. units, firstLeg: "
                 + this.firstLeg + ", secondLeg: "
                 + this.secondLeg + " units, color: "
-                + this.color);
+                + getColor());
     }
 }
diff --git a/src/main/java/core/basesyntax/Square.java b/src/main/java/core/basesyntax/Square.java
@@ -7,7 +7,7 @@ public class Square extends Figure {
     public Square() {
     }
 
-    public Square(String color, int site) {
+    public Square(String color, double site) {
         super(color);
         this.site = site;
     }
@@ -21,6 +21,6 @@ public double getArea() {
     public void draw() {
         System.out.println("Figure: square, area: "
                 + getArea() + " sq. units, side: "
-                + this.site + " units, color: " + this.color);
+                + this.site + " units, color: " + getColor());
     }
 }