revised section 4 (untested)

5 files changed, 13 insertions, 12 deletions

diff --git a/docs/teaching/exercises/answers/Answer4a.java b/docs/teaching/exercises/answers/Answer4a.java
index fd0e2e684..e99eb1266 100644
--- a/docs/teaching/exercises/answers/Answer4a.java
+++ b/docs/teaching/exercises/answers/Answer4a.java
@@ -17,12 +17,7 @@ import figures.Group;
 import java.awt.Rectangle;
 
 aspect Answer4a {
-    private Rectangle wholeCanvas =
-        new Rectangle(FigureElement.MIN_VALUE, FigureElement.MIN_VALUE,
-                      FigureElement.MAX_VALUE - FigureElement.MIN_VALUE,
-                      FigureElement.MAX_VALUE - FigureElement.MIN_VALUE);
-
     Rectangle around(): execution(Rectangle Group.getBounds()) {
-        return wholeCanvas;
+        return FigureElement.MAX_BOUNDS;
     }
 }
diff --git a/docs/teaching/exercises/answers/Answer4b.java b/docs/teaching/exercises/answers/Answer4b.java
index 4fd5354c1..33649c4e1 100644
--- a/docs/teaching/exercises/answers/Answer4b.java
+++ b/docs/teaching/exercises/answers/Answer4b.java
@@ -20,7 +20,8 @@ aspect Answer4b {
     private Rectangle Group.cache = null;
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) && this(g) {
+            execution(Rectangle Group.getBounds()) && this(g)
+    {
         if (g.cache == null) {
             g.cache = proceed(g);
         }
diff --git a/docs/teaching/exercises/answers/Answer4c.java b/docs/teaching/exercises/answers/Answer4c.java
index 35f4b90af..75e1123dd 100644
--- a/docs/teaching/exercises/answers/Answer4c.java
+++ b/docs/teaching/exercises/answers/Answer4c.java
@@ -20,7 +20,8 @@ aspect Answer4c {
     private Rectangle Group.cache = null;
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) && this(g) {
+            execution(Rectangle Group.getBounds()) && this(g)
+    {
         if (g.cache == null) {
             g.cache = proceed(g);
         }
diff --git a/docs/teaching/exercises/answers/Answer4d.java b/docs/teaching/exercises/answers/Answer4d.java
index f2127836a..58d31d44c 100644
--- a/docs/teaching/exercises/answers/Answer4d.java
+++ b/docs/teaching/exercises/answers/Answer4d.java
@@ -22,12 +22,14 @@ aspect Answer4d {
     private Group Point.enclosingGroup = null;
 
     before(Point p, Group g):
-        execution(void add(FigureElement)) && args(p) && target(g) {
+        execution(void add(FigureElement)) && args(p) && target(g)
+    {
         p.enclosingGroup = g;
     }
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) && this(g) {
+            execution(Rectangle Group.getBounds()) && this(g)
+    {
         if (g.cache == null) {
             g.cache = proceed(g);
         }
diff --git a/docs/teaching/exercises/answers/Answer4e.java b/docs/teaching/exercises/answers/Answer4e.java
index bab9e2afd..2a6e0aefd 100644
--- a/docs/teaching/exercises/answers/Answer4e.java
+++ b/docs/teaching/exercises/answers/Answer4e.java
@@ -22,12 +22,14 @@ aspect Answer4e {
     private Group FigureElement.enclosingGroup = null;
 
     before(FigureElement p, Group g):
-        execution(void add(FigureElement)) && args(p) && target(g) {
+        execution(void add(FigureElement)) && args(p) && target(g)
+    {
         p.enclosingGroup = g;
     }
 
     Rectangle around(Group g):
-            execution(Rectangle Group.getBounds()) && this(g) {
+            execution(Rectangle Group.getBounds()) && this(g)
+    {
         if (g.cache == null) {
             g.cache = proceed(g);
         }