finished [picture

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", 600, 600, 
                     Color.white);
         }
         canvasSingleton.setVisible(true);

Picture/Picture.java

@@ -16,6 +16,10 @@ public class Picture
     private Square window;
     private Triangle roof;
     private Circle sun;
+    private Square window2;
+    private Square door;
+    private Triangle tree;
+    private Square treeTrunk;
 
     /**
      * Constructor for objects of class Picture
@@ -37,7 +41,7 @@ public void draw()
 
         window = new Square();
         window.changeColor("black");
-        window.moveHorizontal(20);
+        window.moveHorizontal(10);
         window.moveVertical(100);
         window.makeVisible();
 
@@ -53,6 +57,45 @@ public void draw()
         sun.moveVertical(-10);
         sun.changeSize(60);
         sun.makeVisible();
+
+        window2 = new Square();
+        window2.changeColor("black");
+        window2.moveHorizontal(60);
+        window2.moveVertical(100);
+        window2.makeVisible();
+
+        door = new Square();
+        door.changeColor("black");
+        door.moveHorizontal(35);
+        door.moveVertical(150);
+        door.makeVisible();
+
+        door = new Square();
+        door.changeColor("black");
+        door.moveHorizontal(35);
+        door.moveVertical(135);
+        door.makeVisible();
+
+
+        treeTrunk = new Square();
+        treeTrunk.changeColor("brown");
+        treeTrunk.moveHorizontal(195);
+        treeTrunk.moveVertical(200);
+        treeTrunk.makeVisible();
+
+        tree = new Triangle();
+        tree.changeSize(140, 70);
+        tree.moveHorizontal(220);
+        tree.moveVertical(105);
+        tree.makeVisible();
+
+
+
+
+
+
+
+
     }
 
     /**

Picture/package.bluej

@@ -2,46 +2,46 @@
 dependency1.from=Circle
 dependency1.to=Canvas
 dependency1.type=UsesDependency
-dependency2.from=Picture
-dependency2.to=Square
+dependency2.from=Triangle
+dependency2.to=Canvas
 dependency2.type=UsesDependency
-dependency3.from=Picture
-dependency3.to=Triangle
+dependency3.from=Square
+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=Triangle
 dependency6.type=UsesDependency
-dependency7.from=PictureTest
-dependency7.to=Picture
+dependency7.from=Picture
+dependency7.to=Circle
 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.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=89
+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.8208955223880597
+package.editor.height=433
+package.editor.width=685
+package.editor.x=178
+package.editor.y=191
 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=49
 readme.x=10
 readme.y=10
 target1.height=40

Shapes/package.bluej

@@ -8,28 +8,28 @@ dependency2.type=UsesDependency
 dependency3.from=Square
 dependency3.to=Canvas
 dependency3.type=UsesDependency
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
-objectbench.height=160
-objectbench.width=769
+editor.fx.0.height=728
+editor.fx.0.width=800
+editor.fx.0.x=560
+editor.fx.0.y=109
+objectbench.height=98
+objectbench.width=1290
 package.divider.horizontal=0.5996908809891809
-package.divider.vertical=0.7822685788787483
-package.editor.height=593
-package.editor.width=1188
+package.divider.vertical=0.8620236530880421
+package.editor.height=649
+package.editor.width=1199
 package.editor.x=246
-package.editor.y=192
+package.editor.y=177
 package.frame.height=825
 package.frame.width=1314
 package.numDependencies=3
 package.numTargets=4
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
-readme.height=58
+readme.height=60
 readme.name=@README
-readme.width=47
+readme.width=49
 readme.x=10
 readme.y=10
 target1.height=40