Final Commit

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(5,7);
+        shape3.draw();
     }
 }

src/Rectangle.java

+public class Rectangle extends Shape{
+    
+    public Rectangle(){
+        setWidth(3);
+        setHeight(4);
+
+    }
+
+    public Rectangle(int x, int y){
+        setWidth(x);
+        setHeight(y);
+    }
+
+    @Override
+    public float area(){
+      float area = width * height;
+      return area;
+    }
+  
+    @Override
+    public float circumference(){
+      float circ = (width*2) + (height*2);
+      return circ;
+    }
+
+    @Override
+    public void draw(){
+    
+        for (int loop1=0; loop1<width; loop1++){
+            System.out.print("--");
+        }
+        System.out.println();
+        for (int loop2=0; loop2<height; loop2++){
+            System.out.print("|");
+            for (int loop3=0; loop3<(width-1); loop3++){            
+                System.out.print("  ");
+            }
+            System.out.println("|");
+        }
+        for (int loop4=0; loop4<width; loop4++){
+            System.out.print("--");
+        }
+        System.out.println("");
+    }
+
+
+}

src/Shape.java

 abstract public class Shape {
 
   protected int size;
+  protected int width;
+  protected int height;
 
   abstract public void draw();
   abstract public float area();
@@ -15,6 +17,25 @@ abstract public class Shape {
 
   public Shape(int size){
     this.size = size;
+}
+
+  public int getWidth(){
+    return width;
+  }
+
+  public int getHeight(){
+      return height;
+  }
+
+  public void setWidth(int width){
+      this.width = width;
   }
 
+  public void setHeight(int height){
+      this.height = height;
+  }
+
+
+
+
 }

src/Square.java

@@ -8,16 +8,33 @@ public class Square extends Shape{
         super(x);
     }
 
+    @Override
     public float area(){
         return(size*size);
     }
 
+    @Override
     public float circumference(){
         return(size*4);
     }
 
-    public void Draw(){
-
+    @Override
+    public void draw(){
+        for (int loop1=0; loop1<size; loop1++){
+            System.out.print("--");
+        }
+        System.out.println();
+        for (int loop2=0; loop2<(size); loop2++){
+            System.out.print("|");
+            for (int loop3=0; loop3<(size-1); loop3++){            
+                System.out.print("  ");
+            }
+            System.out.println("|");
+        }
+        for (int loop4=0; loop4<size; loop4++){
+            System.out.print("--");
+        }
+        System.out.println("");
     }
     
 }