--- a/Tools__OrganizerCanvas.st	Fri Feb 13 12:12:40 2015 +0100
+++ b/Tools__OrganizerCanvas.st	Fri Feb 13 12:15:13 2015 +0100
@@ -3162,7 +3162,7 @@
     |holder|
 
     (holder := builder bindingAt:#diagramPackageSelection) isNil ifTrue:[
-        holder := nil asValue.
+        holder := ValueHolder with:nil.
         builder aspectAt:#diagramPackageSelection put:holder.
         holder onChangeSend:#diagramPackageSelectionChanged to:self.
     ].
@@ -3181,7 +3181,7 @@
 
 hidePrivateClasses
     hidePrivateClasses isNil ifTrue:[
-        hidePrivateClasses := false asValue.
+        hidePrivateClasses := ValueHolder with:false.
 "/        hidePrivateClasses addDependent:self.
     ].
     ^ hidePrivateClasses.
@@ -3191,7 +3191,7 @@
 
 hideUnloadedClasses
     hideUnloadedClasses isNil ifTrue:[
-        hideUnloadedClasses := false asValue.
+        hideUnloadedClasses := ValueHolder with:false.
 "/        hideUnloadedClasses addDependent:self.
     ].
     ^ hideUnloadedClasses.
@@ -3201,7 +3201,7 @@
 
 immediateUpdate
     immediateUpdate isNil ifTrue:[
-        immediateUpdate := false asValue.
+        immediateUpdate := ValueHolder with:false.
 "/        immediateUpdate addDependent:self.
     ].
     ^ immediateUpdate.
@@ -3215,14 +3215,14 @@
 
 markApplicationsHolder
     markApplicationsHolder isNil ifTrue:[
-	markApplicationsHolder := false asValue.
+        markApplicationsHolder := ValueHolder with:false.
     ].
     ^ markApplicationsHolder.
 !
 
 meta
     meta isNil ifTrue:[
-        meta := false asValue.
+        meta := ValueHolder with:false.
 "/        meta addDependent:self.
     ].
     ^ meta.
@@ -3246,7 +3246,7 @@
     "this is changed from 'Instance/Class' to 'Instance/Static' for Java"
 
     metaToggleLabelHolder isNil ifTrue:[
-        metaToggleLabelHolder := (resources string:'Class') asValue.
+        metaToggleLabelHolder := ValueHolder with:(resources string:'Class').
 "/        metaToggleLabelHolder addDependent:self.
     ].
     ^ metaToggleLabelHolder.
@@ -3260,7 +3260,7 @@
     ].
 
     methodVisibilityHolder isNil ifTrue:[
-        methodVisibilityHolder := false asValue.
+        methodVisibilityHolder := ValueHolder with:false.
     ].
     ^ methodVisibilityHolder.
 
@@ -3515,7 +3515,7 @@
     |holder|
 
     (holder := builder bindingAt:#selectedDiagramProject) isNil ifTrue:[
-        holder := nil asValue.
+        holder := ValueHolder with:nil.
         builder aspectAt:#selectedDiagramProject put:holder.
         holder addDependent:self.
     ].
@@ -3558,7 +3558,7 @@
     ].
 
     showAllClassesInNameSpaceView isNil ifTrue:[
-        showAllClassesInNameSpaceView := false asValue.
+        showAllClassesInNameSpaceView := ValueHolder with:false.
     ].
     ^ showAllClassesInNameSpaceView.
 
@@ -3567,15 +3567,8 @@
 !
 
 showClassPackages
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-
     showClassPackages isNil ifTrue:[
-	showClassPackages := false asValue.
-"/        showClassPackages addDependent:self.
+        showClassPackages := ValueHolder with:false.
     ].
     ^ showClassPackages.
 
@@ -3588,7 +3581,7 @@
     ].
 
     showCoverageInformation isNil ifTrue:[
-        showCoverageInformation := false asValue.
+        showCoverageInformation := ValueHolder with:false.
     ].
     ^ showCoverageInformation.
 
@@ -3601,7 +3594,7 @@
     ].
 
     showMethodComplexity isNil ifTrue:[
-        showMethodComplexity := false asValue.
+        showMethodComplexity := ValueHolder with:false.
     ].
     ^ showMethodComplexity.
 
@@ -3614,7 +3607,7 @@
     ].
 
     showMethodInheritance isNil ifTrue:[
-        showMethodInheritance := false asValue.
+        showMethodInheritance := ValueHolder with:false.
     ].
     ^ showMethodInheritance.
 
@@ -3627,7 +3620,7 @@
     ].
 
     showMethodTypeIcon isNil ifTrue:[
-        showMethodTypeIcon := false asValue.
+        showMethodTypeIcon := ValueHolder with:false.
     ].
     ^ showMethodTypeIcon.
 
@@ -3636,7 +3629,7 @@
 
 sortByNameAndInheritance
     sortByNameAndInheritance isNil ifTrue:[
-        sortByNameAndInheritance := false asValue.
+        sortByNameAndInheritance := ValueHolder with:false.
 "/        sortByNameAndInheritance addDependent:self.
     ].
     ^ sortByNameAndInheritance.
@@ -3646,7 +3639,7 @@
 
 sortVariablesByName
     sortVariablesByName isNil ifTrue:[
-        sortVariablesByName := false asValue.
+        sortVariablesByName := ValueHolder with:false.
     ].
     ^ sortVariablesByName.
 !
@@ -4371,7 +4364,7 @@
 
 categoryListSlaveMode
     categoryListSlaveMode isNil ifTrue:[
-	categoryListSlaveMode := false asValue.
+        categoryListSlaveMode := ValueHolder with:false.
     ].
     ^ categoryListSlaveMode
 
@@ -4381,7 +4374,7 @@
 
 classHierarchyListSlaveMode
     classHierarchyListSlaveMode isNil ifTrue:[
-	classHierarchyListSlaveMode := true asValue.
+        classHierarchyListSlaveMode := ValueHolder with:true.
     ].
     ^ classHierarchyListSlaveMode
 
@@ -4391,7 +4384,7 @@
 
 classInheritanceListSlaveMode
     classInheritanceListSlaveMode isNil ifTrue:[
-	classInheritanceListSlaveMode := true asValue.
+        classInheritanceListSlaveMode := ValueHolder with:true.
     ].
     ^ classInheritanceListSlaveMode
 
@@ -4401,7 +4394,7 @@
 
 classListSlaveMode
     classListSlaveMode isNil ifTrue:[
-	classListSlaveMode := false asValue.
+        classListSlaveMode := ValueHolder with:false.
     ].
     ^ classListSlaveMode
 
@@ -4411,7 +4404,7 @@
 
 nameSpaceListSlaveMode
     namespaceListSlaveMode isNil ifTrue:[
-	namespaceListSlaveMode := true asValue.
+        namespaceListSlaveMode := ValueHolder with:true.
     ].
     ^ namespaceListSlaveMode
 
@@ -4421,7 +4414,7 @@
 
 projectListSlaveMode
     projectListSlaveMode isNil ifTrue:[
-	projectListSlaveMode := true asValue.
+        projectListSlaveMode := ValueHolder with:true.
     ].
     ^ projectListSlaveMode
 
@@ -5238,10 +5231,10 @@
 !OrganizerCanvas class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__OrganizerCanvas.st,v 1.59 2014-11-26 17:44:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__OrganizerCanvas.st,v 1.60 2015-02-13 11:15:13 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__OrganizerCanvas.st,v 1.59 2014-11-26 17:44:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__OrganizerCanvas.st,v 1.60 2015-02-13 11:15:13 cg Exp $'
 ! !