1st commit

Picture/Canvas.java

@@ -28,7 +28,7 @@ public class Canvas
     public static Canvas getCanvas()
     {
         if(canvasSingleton == null) {
-            canvasSingleton = new Canvas("BlueJ Shapes Demo", 300, 300, 
+            canvasSingleton = new Canvas("BlueJ Shapes Demo", 800, 800, 
                     Color.white);
         }
         canvasSingleton.setVisible(true);

Picture/Circle.java

@@ -24,8 +24,8 @@ public Circle()
         diameter = 30;
         xPosition = 20;
         yPosition = 60;
-        color = "blue";
-        isVisible = false;
+        color = "green";
+        isVisible = true;
     }
 
     /**

Picture/Picture.java

@@ -12,10 +12,22 @@
  */
 public class Picture
 {
+    private Square window2;
+    private Circle door;
     private Square wall;
     private Square window;
+    private Square windowpane;
+    private Square windowpane2;
     private Triangle roof;
     private Circle sun;
+    private Square lawn;
+    private Square garage;
+    private Square garagedoor;
+
+
+
+
+
 
     /**
      * Constructor for objects of class Picture
@@ -32,27 +44,81 @@ public void draw()
     {
         wall = new Square();
         wall.moveVertical(80);
-        wall.changeSize(100);
+        wall.changeColor("blue");
+        wall.changeSize(400);
         wall.makeVisible();
+
 
         window = new Square();
         window.changeColor("black");
         window.moveHorizontal(20);
         window.moveVertical(100);
+        window.changeSize(85);
         window.makeVisible();
-
+
+        window2 = new Square();
+        window2.changeColor("black");
+        window2.moveHorizontal(180);
+        window2.moveVertical(100);
+        window2.changeSize(85);
+        window2.makeVisible();
+
+        windowpane = new Square();
+        windowpane.changeColor("white");
+        windowpane.moveHorizontal(22);
+        windowpane.moveVertical(105);
+        windowpane.changeSize(75);
+        windowpane.makeVisible();
+
+        windowpane2 = new Square();
+        windowpane2.changeColor("white");
+        windowpane2.moveHorizontal(182);
+        windowpane2.moveVertical(105);
+        windowpane2.changeSize(75);
+        windowpane2.makeVisible();
+
+
         roof = new Triangle();
-        roof.changeSize(50, 140);
-        roof.moveHorizontal(60);
-        roof.moveVertical(70);
+        roof.changeSize(120, 416);
+        roof.moveHorizontal(258);
+        roof.moveVertical(13);
         roof.makeVisible();
 
         sun = new Circle();
         sun.changeColor("yellow");
-        sun.moveHorizontal(180);
+        sun.moveHorizontal(500);
         sun.moveVertical(-10);
-        sun.changeSize(60);
+        sun.changeSize(200);
         sun.makeVisible();
+
+        door = new Circle();
+        door.changeColor("brown");
+        door.moveHorizontal(200);
+        door.moveVertical(350);
+        door.changeSize(100);
+        door.makeVisible();
+
+        lawn = new Square();
+        lawn.changeColor("green");
+        lawn.moveHorizontal(-58);
+        lawn.moveVertical(475);
+        lawn.changeSize(800);
+        lawn.makeVisible();
+
+        garage = new Square();
+        garage.changeColor("red");
+        garage.moveHorizontal(397);
+        garage.moveVertical(350);
+        garage.changeSize(130);
+        garage.makeVisible();
+
+        garagedoor = new Square();
+        garagedoor.changeColor("black");
+        garagedoor.moveHorizontal(420);
+        garagedoor.moveVertical(400);
+        garagedoor.changeSize(80);
+        garagedoor.makeVisible();
+
     }
 
     /**

Picture/Square.java

@@ -20,7 +20,7 @@ public class Square
      */
     public Square()
     {
-        size = 30;
+        size = 90;
         xPosition = 60;
         yPosition = 50;
         color = "red";

Picture/Triangle.java

@@ -23,10 +23,10 @@ public Triangle()
     {
         height = 30;
         width = 40;
-        xPosition = 50;
-        yPosition = 15;
-        color = "green";
-        isVisible = false;
+        xPosition = 0;
+        yPosition = 0;
+        color = "red";
+        isVisible = true;
     }
 
     /**

Picture/package.bluej

@@ -2,46 +2,46 @@
 dependency1.from=Circle
 dependency1.to=Canvas
 dependency1.type=UsesDependency
-dependency2.from=Picture
-dependency2.to=Square
+dependency2.from=Square
+dependency2.to=Canvas
 dependency2.type=UsesDependency
-dependency3.from=Picture
-dependency3.to=Triangle
+dependency3.from=Triangle
+dependency3.to=Canvas
 dependency3.type=UsesDependency
-dependency4.from=Picture
-dependency4.to=Circle
+dependency4.from=PictureTest
+dependency4.to=Picture
 dependency4.type=UsesDependency
-dependency5.from=Triangle
-dependency5.to=Canvas
+dependency5.from=Picture
+dependency5.to=Square
 dependency5.type=UsesDependency
-dependency6.from=Square
-dependency6.to=Canvas
+dependency6.from=Picture
+dependency6.to=Circle
 dependency6.type=UsesDependency
-dependency7.from=PictureTest
-dependency7.to=Picture
+dependency7.from=Picture
+dependency7.to=Triangle
 dependency7.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=2086
-editor.fx.0.y=284
-objectbench.height=101
-objectbench.width=461
+editor.fx.0.x=640
+editor.fx.0.y=84
+objectbench.height=100
+objectbench.width=776
 package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
-package.editor.width=674
-package.editor.x=239
-package.editor.y=118
+package.divider.vertical=0.8003731343283582
+package.editor.height=422
+package.editor.width=684
+package.editor.x=142
+package.editor.y=34
 package.frame.height=600
 package.frame.width=800
 package.numDependencies=7
 package.numTargets=6
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
-readme.height=58
+readme.height=60
 readme.name=@README
-readme.width=47
+readme.width=48
 readme.x=10
 readme.y=10
 target1.height=40