Use #addAll: instead of #declareAllFrom:, since #declareAllFrom:
is supposed to not overwrite existing entries of a Dictionary.
--- a/AbstractLauncherApplication.st Tue Jul 06 14:31:32 2004 +0200
+++ b/AbstractLauncherApplication.st Tue Jul 06 14:33:02 2004 +0200
@@ -5391,7 +5391,8 @@
cvsRootHolder := CVSSourceCodeManager repositoryName ? '/cvs/stx'.
cvsRootHolder := cvsRootHolder asValue.
- rootsPerModule := Dictionary new declareAllFrom:(CVSSourceCodeManager repositoryNamesPerModule).
+ rootsPerModule := Dictionary new.
+ rootsPerModule addAll:(CVSSourceCodeManager repositoryNamesPerModule).
cvsBinDirectoryHolder := CVSSourceCodeManager cvsBinDirectory asValue.
bindings := IdentityDictionary new.
@@ -5821,7 +5822,7 @@
blockArgumentsOnNewLine:blockArgumentsOnNewLine value;
maxLengthForSingleLineBlocks:maxLengthForSingleLineBlocks value.
] ifFalse: [
- (UserPreferences reset; current) declareAllFrom: oldUserPreferences
+ (UserPreferences reset; current) addAll: oldUserPreferences
].
"
self formattingConfigurationDialog
@@ -6007,9 +6008,8 @@
"/
"/ update system settings
"/
- box accepted ifTrue:[
- ] ifFalse: [
- (UserPreferences reset; current) declareAllFrom: oldUserPreferences
+ box accepted ifFalse: [
+ (UserPreferences reset; current) addAll:oldUserPreferences
].
box destroy
@@ -6435,5 +6435,5 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.310 2004-06-14 18:43:03 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.311 2004-07-06 12:33:02 stefan Exp $'
! !