revised with info from OOPSLA 2004:

  renaming support.Log.log to support.Log.write
  renaming test.Test to test.CoreTest
  (r)ing aspectj
  clearing up a few random things

1 files changed, 9 insertions, 6 deletions

diff --git a/docs/teaching/exercises/answers/Answer4e.java b/docs/teaching/exercises/answers/Answer4e.java
index 2a6e0aefd..6ee534ff6 100644
--- a/docs/teaching/exercises/answers/Answer4e.java
+++ b/docs/teaching/exercises/answers/Answer4e.java
@@ -21,22 +21,25 @@ aspect Answer4e {
     private Rectangle Group.cache = null;
     private Group FigureElement.enclosingGroup = null;
 
-    before(FigureElement p, Group g):
-        execution(void add(FigureElement)) && args(p) && target(g)
-    {
+    before(FigureElement p, Group 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);
         }
         return g.cache;
     }
 
-    before(Point p): set(* Point.*) && target(p) {
+    before(Point p): 
+	    set(* Point.*) 
+	    && target(p) {
         FigureElement fe = p;
         while (fe.enclosingGroup != null) {
             fe.enclosingGroup.cache = null;