--- a/ChangesBrowser.st	Tue Nov 03 13:45:48 2009 +0100
+++ b/ChangesBrowser.st	Tue Nov 03 15:15:03 2009 +0100
@@ -23,7 +23,8 @@
 		showingDiffs diffViewBox autoloadAsRequired
 		classesNotToBeAutoloaded encodingIfKnown'
 	classVariableNames:'CompressSnapshotInfo NoColoring ShowWarningDialogs
-		DefaultAutoCompare DefaultShowingDiffs LastEnforcedNameSpace'
+		DefaultAutoCompare DefaultShowingDiffs LastEnforcedNameSpace
+		KeepEnforcedNameSpace'
 	poolDictionaries:''
 	category:'Interface-Browsers'
 !
@@ -1247,7 +1248,7 @@
 
 initialize
     |panel v upperFrame buttonPanel menuPanel mH
-     checkBox oldStyle codeViewBox lbl|
+     checkBox oldStyle codeViewBox lbl applyInOriginal|
 
     "/ oldStyle := true.
     oldStyle := false.
@@ -1260,13 +1261,21 @@
     autoCompare onChangeSend:#autoCompareChanged to:self.
     autoUpdate := false asValue.
     autoloadAsRequired := false asValue.
-    applyInOriginalNameSpace := true asValue.
+
+    applyInOriginal := true.
+    KeepEnforcedNameSpace == true ifTrue:[
+        enforcedNameSpace := LastEnforcedNameSpace.
+        applyInOriginal := false.
+    ].
+
+    applyInOriginalNameSpace := applyInOriginal asValue.
     applyInOriginalNameSpace
         onChangeEvaluate:[
             autoCompare value ifTrue:[
                 self doUpdate
             ].
         ].
+
     updateChangeSet := true "false" asValue.
     classesNotToBeAutoloaded := Set new.
 
@@ -5399,7 +5408,7 @@
 !
 
 setEnforcedNameSpace
-    |nsName listOfKnownNameSpaces|
+    |nsName listOfKnownNameSpaces keepAsDefaultHolder|
 
     listOfKnownNameSpaces := Set new.
     NameSpace
@@ -5409,10 +5418,22 @@
             ].
     listOfKnownNameSpaces := listOfKnownNameSpaces asOrderedCollection sort.
 
-    nsName := Dialog
+    Dialog aboutToOpenBoxNotificationSignal handle:[:ex |
+        |box|
+
+        keepAsDefaultHolder := true asValue.
+        box := ex parameter.
+        box verticalPanel
+            add:((CheckBox 
+                    label:(resources string:'Use this as default in the future')) 
+                    model:keepAsDefaultHolder).
+        ex proceed.
+    ] do:[
+        nsName := Dialog
                 request:'When applying, new classes are created in nameSpace:'
                 initialAnswer:(enforcedNameSpace ? LastEnforcedNameSpace ? Class nameSpaceQuerySignal query name)
                 list:listOfKnownNameSpaces.
+    ].
     nsName isNil ifTrue:[^ self].
 
     (nsName isEmpty or:[nsName = 'Smalltalk']) ifTrue:[
@@ -5425,6 +5446,7 @@
             self doUpdate
         ].
     ].
+    KeepEnforcedNameSpace := keepAsDefaultHolder value
 
     "Modified: / 07-09-2006 / 15:10:25 / cg"
 !
@@ -6117,9 +6139,9 @@
 !ChangesBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.398 2009-10-22 19:08:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.399 2009-11-03 14:15:03 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.398 2009-10-22 19:08:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.399 2009-11-03 14:15:03 cg Exp $'
 ! !