Completed Tasks

bin/Instructions.md

@@ -41,7 +41,7 @@ The `Square` class should store the information and methods related to a square
 
 The `Rectangle` class should store the information and methods related to a Rectangle shape.  
 
-1. Instead of using `size` you should use `width` and `hieght` to represent the width and height of the rectangle. 
+1. Instead of using `size` you should use `width` and `height` to represent the width and height of the rectangle. 
 2. `Rectangle` should have two constructors. The first should have no parameters and set the `width` equal to 3 and the `height` equal to 4. The second should take a two integer parameter and uses them to set the `width` and `height` (in that order).  
 3. You should be able to use the `getWidth()` and `setWidth()` methods properly for the `Rectangle`.
 4. You should be able to use the `getHeight()` and `setHeight()` methods properly for the `Rectangle`.

src/App.java

@@ -2,5 +2,11 @@ public class App {
     public static void main(String[] args) throws Exception {
         Shape shape1 = new Triangle(3);
         shape1.draw();
+
+        Shape shape2 = new Square(3);
+        shape2.draw();
+
+        Shape shape3 = new Rectangle(3);
+        shape3.draw();
     }
 }

src/Instructions.md

@@ -41,7 +41,7 @@ The `Square` class should store the information and methods related to a square
 
 The `Rectangle` class should store the information and methods related to a Rectangle shape.  
 
-1. Instead of using `size` you should use `width` and `hieght` to represent the width and height of the rectangle. 
+1. Instead of using `size` you should use `width` and `height` to represent the width and height of the rectangle. 
 2. `Rectangle` should have two constructors. The first should have no parameters and set the `width` equal to 3 and the `height` equal to 4. The second should take a two integer parameter and uses them to set the `width` and `height` (in that order).  
 3. You should be able to use the `getWidth()` and `setWidth()` methods properly for the `Rectangle`.
 4. You should be able to use the `getHeight()` and `setHeight()` methods properly for the `Rectangle`.

src/Rectangle.java

+public class Rectangle extends Shape {
+
+    public Rectangle() {
+      
+      super();
+        
+      }
+        public Rectangle(int i) {
+        super(i);
+      }
+
+      @Override  
+      public void draw() {
+        for (int loop1=0; loop1<size; loop1++){
+          for (int loop2=loop1; loop2<(size-1); loop2++) {
+            System.out.print(" ");
+          }
+          System.out.print("/");
+          for (int loop2=0; loop2<loop1; loop2++){
+            System.out.print("  ");
+          }
+          System.out.println("\\");
+        }
+        for (int loop1=0; loop1<size; loop1++){
+          System.out.print("--");
+        }
+        System.out.println("");
+      }
+    
+      @Override
+      public float area() {
+        float area = width * height;
+        return area;
+      }
+    
+      @Override
+      public float circumference() {
+        float circ = (width*2) + (height*2);
+        return circ;
+      }
+    
+}

src/Shape.java

 abstract public class Shape {
 
   protected int size;
-
+  protected float height;
+  protected float width;
+  
   abstract public void draw();
   abstract public float area();
   abstract public float circumference();
+  
 
   public int getSize() { return size; }
   public void setSize(int size) { this.size = size; }
 
+  public float getHeight() { return height; }
+  public void setHeight(float height) { this.height = height; }
+  
+        
+  public float getWidth() { return width; }
+  public void setWidth(float width) { this.width = width; }
+
   public Shape(){
     this.size = 3;
+    this.height = 4;
+    this.width = 3;
   }
 
   public Shape(int size){
     this.size = size;
   }
 
+  public Shape(float width){
+    this.width = width;
+  }
+
 }

src/Square.java

+public class Square extends Shape{
+
+    public Square() {
+        super();
+      }
+        public Square(int i) {
+        super(i);
+      }
+    
+      @Override  
+      public void draw() {
+    
+        for (int loop1=0; loop1<size; loop1++){
+          for (int loop2=loop1; loop2<(size-1); loop2++) {
+            System.out.print(" ");
+          }
+          System.out.print("/");
+          for (int loop2=0; loop2<loop1; loop2++){
+            System.out.print("  ");
+          }
+          System.out.println("\\");
+        }
+        for (int loop1=0; loop1<size; loop1++){
+          System.out.print("--");
+        }
+        System.out.println("");
+      }
+    
+      @Override
+      public float area() {
+        float fSize = size;
+        float area = 1f * fSize * fSize;
+        return area;
+      }
+    
+      @Override
+      public float circumference() {
+        float fSize = size;
+        float circ = fSize + fSize +fSize +fSize;
+        return circ;
+      }
+    
+    }
+    
\ No newline at end of file