shapes

Picture/Picture.java

@@ -16,6 +16,7 @@ public class Picture
     private Square window;
     private Triangle roof;
     private Circle sun;
+    private Circle sun2;
 
     /**
      * Constructor for objects of class Picture
@@ -48,13 +49,33 @@ public class Picture
         roof.makeVisible();
 
         sun = new Circle();
-        sun.changeColor("yellow");
+        sun.changeColor("blue");
         sun.moveHorizontal(180);
         sun.moveVertical(-10);
         sun.changeSize(60);
         sun.makeVisible();
+        
+        
+        sun2 = new Circle();
+        sun2.changeColor("yellow");
+        sun2.moveHorizontal(100);
+        sun2.moveVertical(-10);
+        sun2.changeSize(60);
+        sun2.makeVisible();
+        sun2.slowMoveVertical(300);
+        
+        sun.slowMoveVertical(300);
     }
 
+    
+    /**
+    public void draw2()
+    {
+     sun.slowMoveVertical(300);   
+    }
+    **/
+    
+    
     /**
      * Change this picture to black/white display
      */

Picture/package.bluej

@@ -2,35 +2,35 @@
 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.to=Square
 dependency4.type=UsesDependency
-dependency5.from=Triangle
-dependency5.to=Canvas
+dependency5.from=Picture
+dependency5.to=Triangle
 dependency5.type=UsesDependency
-dependency6.from=Square
-dependency6.to=Canvas
+dependency6.from=Picture
+dependency6.to=Circle
 dependency6.type=UsesDependency
-editor.fx.0.height=722
+editor.fx.0.height=717
 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=459
+editor.fx.0.y=26
+objectbench.height=125
+objectbench.width=870
 package.divider.horizontal=0.6
-package.divider.vertical=0.8007380073800738
-package.editor.height=427
-package.editor.width=674
-package.editor.x=2011
-package.editor.y=179
-package.frame.height=600
-package.frame.width=800
+package.divider.vertical=0.7987804878048781
+package.editor.height=517
+package.editor.width=768
+package.editor.x=50
+package.editor.y=29
+package.frame.height=714
+package.frame.width=894
 package.numDependencies=6
 package.numTargets=5
 package.showExtends=true

README.md

@@ -19,3 +19,4 @@ Be sure to
 Object of lab is to follow the chapter reading the doc folder. (and Draw a House!)
 
 Can you draw a house with a tree along side? (think `trunk` and `circle` or a tall, skunny `triangle`.
+# FirstLab-Shapes

Shapes/Triangle.java

@@ -21,8 +21,8 @@ public class Triangle
      */
     public Triangle()
     {
-        height = 30;
-        width = 40;
+        height = 60;
+        width = 80;
         xPosition = 50;
         yPosition = 15;
         color = "green";

Shapes/package.bluej

@@ -12,16 +12,16 @@ 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
+objectbench.height=136
+objectbench.width=938
 package.divider.horizontal=0.5996908809891809
-package.divider.vertical=0.7822685788787483
-package.editor.height=593
-package.editor.width=1188
-package.editor.x=246
-package.editor.y=192
-package.frame.height=825
-package.frame.width=1314
+package.divider.vertical=0.7826747720364742
+package.editor.height=508
+package.editor.width=836
+package.editor.x=0
+package.editor.y=23
+package.frame.height=716
+package.frame.width=962
 package.numDependencies=3
 package.numTargets=4
 package.showExtends=true