--- a/ClassBuilder.st	Tue Nov 09 13:54:57 2010 +0000
+++ b/ClassBuilder.st	Tue Nov 09 16:24:28 2010 +0000
@@ -132,11 +132,7 @@
         trapCode := trap code.
         trapByteCode := trap byteCode.
 
-        mthd isWrapped ifTrue:[
-            oldMethod := mthd originalMethod
-        ] ifFalse:[
-            oldMethod := mthd.
-        ].
+        oldMethod := mthd originalMethodIfWrapped.
 
         newMethod := oldMethod copy.
         newMethod makeInvalid.
@@ -145,8 +141,8 @@
 
     newClass methodDictionary:newDict.
 
-    "Modified: 12.6.1996 / 10:44:27 / stefan"
-    "Modified: 4.11.1996 / 22:55:57 / cg"
+    "Modified: / 12-06-1996 / 10:44:27 / stefan"
+    "Modified: / 22-10-2010 / 11:47:27 / cg"
 !
 
 copyInvalidatedMethodsFrom:oldClass for:newClass accessingAny:setOfNames
@@ -179,11 +175,7 @@
     nNames := setOfNames size.
 
     methodDict keysAndValuesDo:[:selector :method |
-        method isWrapped ifTrue:[
-            oldMethod := method originalMethod
-        ] ifFalse:[
-            oldMethod := method
-        ].
+        oldMethod := method originalMethodIfWrapped.
 
         "before parsing (which may take some time),
          do a string search if its only one variable,
@@ -227,8 +219,8 @@
     newClass methodDictionary:newMethodDict.
 
     "Modified: / 07-06-1996 / 08:33:52 / stefan"
-    "Modified: / 19-06-1997 / 18:27:09 / cg"
     "Modified: / 21-08-2009 / 10:14:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 22-10-2010 / 11:47:39 / cg"
 !
 
 copyMethodsFrom:oldClass for:newClass
@@ -2225,18 +2217,19 @@
 !ClassBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassBuilder.st 10564 2010-08-10 08:55:15Z vranyj1 $'
+    ^ '$Id: ClassBuilder.st 10590 2010-11-09 16:24:28Z vranyj1 $'
 !
 
 version_CVS
-    ^ 'Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.95 2010/08/02 16:23:53 cg Exp '
+    ^ 'Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.96 2010-10-22 11:54:47 cg Exp '
 !
 
 version_SVN
-    ^ '$Id: ClassBuilder.st 10564 2010-08-10 08:55:15Z vranyj1 $'
+    ^ '$Id: ClassBuilder.st 10590 2010-11-09 16:24:28Z vranyj1 $'
 ! !
 
 
 
 
 
+