--- a/DataSetBuilder.st	Mon Jul 17 19:05:58 2000 +0200
+++ b/DataSetBuilder.st	Wed Jul 26 13:59:33 2000 +0200
@@ -14,6 +14,8 @@
 
 
 
+"{ Package: 'stx:libtool2' }"
+
 ResourceSpecEditor subclass:#DataSetBuilder
 	instanceVariableNames:'rowClass rowSuperClass columnView columns selectedColumnIndex
 		modalOpened listOfSpecViews'
@@ -2918,7 +2920,7 @@
 doDefineRowClass
     "launch a dialog to define class and superclass"
 
-    |aspects cls oldClass oldSuper|
+    |aspects cls oldClass oldSuper val classNameChannel superclassNameChannel|
 
     aspects  := IdentityDictionary new.
     oldClass := rowClass.
@@ -2927,24 +2929,20 @@
     [true] 
     whileTrue:
     [
-        rowClass notNil 
-        ifTrue:
-        [
-            (cls := self resolveRowClass) notNil 
-            ifTrue:
-            [
+        rowClass notNil ifTrue:[
+            (cls := self resolveRowClass) notNil ifTrue:[
                 rowSuperClass := cls superclass name asString
             ].
-            aspects at:#classNameChannel put:(ValueHolder with:rowClass)
-        ] 
-        ifFalse:
-        [
-            aspects at:#classNameChannel put:(ValueHolder with:'DSVRow')
+            val := rowClass
+        ] ifFalse:[
+            val := 'DSVRow'
         ].
+        aspects at:#classNameChannel put:(classNameChannel := ValueHolder with:val).
 
         rowSuperClass notNil 
-            ifTrue: [aspects at:#superclassNameChannel put:(ValueHolder with:rowSuperClass)] 
-            ifFalse:[aspects at:#superclassNameChannel put:(ValueHolder with:'Object')].
+            ifTrue: [val := rowSuperClass] 
+            ifFalse:[val := 'Object'].
+        aspects at:#superclassNameChannel put:(superclassNameChannel := ValueHolder with:val).
 
         (self openDialogInterface:#defineClassNameSpec withBindings:aspects) 
         ifFalse:
@@ -2953,8 +2951,8 @@
             rowSuperClass := oldSuper.
             ^self
         ].
-        rowClass      := ((aspects at:#classNameChannel) value)      withoutSeparators.
-        rowSuperClass := ((aspects at:#superclassNameChannel) value) withoutSeparators.
+        rowClass      := (classNameChannel value)      withoutSeparators.
+        rowSuperClass := (superclassNameChannel value) withoutSeparators.
 
         rowClass size == 0 
         ifTrue: