--- a/ClassBuilder.st	Fri Feb 09 16:59:52 2007 +0100
+++ b/ClassBuilder.st	Sat Feb 10 17:16:12 2007 +0100
@@ -1985,24 +1985,19 @@
             (superInstVars includes:nm) ifTrue:[
                 msg := 'instVar "%1" is already defined in a superclass of "%2"' bindWith:nm allBold with:newName allBold.
                 "/ experimental
-                (Tools::CompilerWarningToDoListEntry notNil
-                and:[ Tools::CompilerWarningToDoListEntry isLoaded ]) ifTrue:[
-                    self todo:((Tools::CompilerWarningToDoListEntry new
-                                severity:(Tools::ToDoList errorSeverity)
-                                priority:(Tools::ToDoList highPriority) 
-                                timestamp:(Timestamp now) 
-                                message:msg)
-                                className:newName 
-                                selector:nil 
-                                checkAction:[:e | 
-                                    |superClass class|
+                self
+                    notifyTodo:msg position:nil
+                    className:newName selector:nil
+                    severity:#error priority:#high 
+                    equalityParameter:nm
+                    checkAction:[:e | 
+                        |superClass class|
 
-                                    superClass := Smalltalk classNamed:aClass name.    
-                                    class := Smalltalk classNamed:newName.    
+                        superClass := Smalltalk classNamed:aClass name.    
+                        class := Smalltalk classNamed:newName.    
 
-                                    (superClass allInstVarNames includes:nm) and:[class instVarNames includes:nm]]
-                                equalityParameter:nm).
-                ].
+                        (superClass allInstVarNames includes:nm) and:[class instVarNames includes:nm]].
+
                 ParserFlags warnings ifTrue:[
                     (oldClass notNil 
                     and:[stringOfInstVarNames = oldClass instanceVariableString])
@@ -2032,25 +2027,20 @@
                 (vars includes:nm) ifTrue:[
                     msg := 'subclass "%1" also defines an instVar named "%2"' bindWith:sub name allBold with:nm allBold.
                     "/ experimental
-                    (Tools::CompilerWarningToDoListEntry notNil
-                    and:[ Tools::CompilerWarningToDoListEntry isLoaded ]) ifTrue:[
-                        self todo:((Tools::CompilerWarningToDoListEntry new
-                                    severity:(Tools::ToDoList errorSeverity)
-                                    priority:(Tools::ToDoList highPriority) 
-                                    timestamp:(Timestamp now) 
-                                    message:msg)
-                                    className:newName 
-                                    selector:nil 
-                                    checkAction:[:e | 
-                                        |class|
+                    self
+                        notifyTodo:msg position:nil
+                        className:newName selector:nil
+                        severity:#error priority:#high 
+                        equalityParameter:nm
+                        checkAction:[:e | 
+                            |class|
 
-                                        Class flushSubclassInfo.
-                                        class := Smalltalk classNamed:newName.    
+                            Class flushSubclassInfo.
+                            class := Smalltalk classNamed:newName.    
 
-                                        (class instVarNames includes:nm)
-                                        and:[ class allSubclasses contains:[:aSubclass | aSubclass instVarNames includes:nm]]]
-                                    equalityParameter:nm).
-                    ].
+                            (class instVarNames includes:nm)
+                            and:[ class allSubclasses contains:[:aSubclass | aSubclass instVarNames includes:nm]]].
+
                     ParserFlags warnings ifTrue:[
                         msg := ('subclass "%1" also defines an instVar named "%2".\\Change the definition of "%3" anyway ?\Notice: you must fix this later.'
                                         bindWith:sub name allBold with:nm allBold with:newName allBold) withCRs.
@@ -2138,5 +2128,5 @@
 !ClassBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.66 2006-11-22 14:54:05 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.67 2007-02-10 16:16:12 cg Exp $'
 ! !