AbstractSettingsApplication.st
changeset 5918 d575b87ea523
parent 5915 d7d685d60d82
child 5919 0d11395cb5a4
--- a/AbstractSettingsApplication.st	Mon Jun 14 20:43:03 2004 +0200
+++ b/AbstractSettingsApplication.st	Mon Jun 14 20:58:22 2004 +0200
@@ -13,235 +13,235 @@
 "{ Package: 'stx:libtool' }"
 
 ApplicationModel subclass:#AbstractSettingsApplication
-	instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
-		requestor'
-	classVariableNames:''
-	poolDictionaries:''
-	category:'Interface-Smalltalk'
+        instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
+                requestor'
+        classVariableNames:''
+        poolDictionaries:''
+        category:'Interface-Smalltalk'
 !
 
 AbstractSettingsApplication subclass:#ByteCodeCompilerSettingsAppl
-	instanceVariableNames:'allowQualifiedNames warnDollar warnOldStyle fullDebugSupport
-		warnCommonMistakes warnUnderscore keepSource constantFolding
-		warnCompatibility constantFoldingOptions warnings warnSTX
-		allowDollar allowReservedWordsAsSelectors immutableArrays
-		allowOldStyleAssignment allowUnderscore allowDolphinExtensions
-		warnUnusedVars allowSqueakExtensions justInTimeCompilation
-		canLoadBinaries constantFoldingSelection enableUnderscore
-		enableDollar'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'allowQualifiedNames warnDollar warnOldStyle fullDebugSupport
+                warnCommonMistakes warnUnderscore keepSource constantFolding
+                warnCompatibility constantFoldingOptions warnings warnSTX
+                allowDollar allowReservedWordsAsSelectors immutableArrays
+                allowOldStyleAssignment allowUnderscore allowDolphinExtensions
+                warnUnusedVars allowSqueakExtensions justInTimeCompilation
+                canLoadBinaries constantFoldingSelection enableUnderscore
+                enableDollar'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#DebuggerSettingsAppl
-	instanceVariableNames:'showErrorNotifier showVerboseStack allowSendMailFromDebugger'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'showErrorNotifier showVerboseStack allowSendMailFromDebugger'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#DisplaySettingsAppl
-	instanceVariableNames:'isColorMonitor useFixGrayPaletteLabel useFixPalette sizeY
-		clipEncodingListSelection sizeX monitorList ditherList
-		clipEncodingList ditherListSelection deepIcons monitorSelection
-		useFixPaletteLabel visualIsPseudoColor ditherSymsNotNil
-		useFixGrayPalette sizeInfos screen ditherStyles ditherSyms
-		screenDepthVisualLabelHolder maxCopyBufferSize'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'isColorMonitor useFixGrayPaletteLabel useFixPalette sizeY
+                clipEncodingListSelection sizeX monitorList ditherList
+                clipEncodingList ditherListSelection deepIcons monitorSelection
+                useFixPaletteLabel visualIsPseudoColor ditherSymsNotNil
+                useFixGrayPalette sizeInfos screen ditherStyles ditherSyms
+                screenDepthVisualLabelHolder maxCopyBufferSize'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#EditSettingsAppl
-	instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
-		searchDialogIsModal startTextDragWithControl'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
+                searchDialogIsModal startTextDragWithControl'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#FontSettingsAppl
-	instanceVariableNames:'filter allOfThem labelDef buttonDef listDef menuDef textDef
-		allFontLabelHolder buttonsFontLabelHolder textFontLabelHolder
-		labelsFontLabelHolder listsFontLabelHolder menusFontLabelHolder
-		allLabel buttonsLabel textLabel labelLabel listsLabel menuLabel'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'filter allOfThem labelDef buttonDef listDef menuDef textDef
+                allFontLabelHolder buttonsFontLabelHolder textFontLabelHolder
+                labelsFontLabelHolder listsFontLabelHolder menusFontLabelHolder
+                allLabel buttonsLabel textLabel labelLabel listsLabel menuLabel'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#GeneralCompilerSettingsAppl
-	instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
-		searchDialogIsModal startTextDragWithControl catchClassRedefs
-		fullHistoryUpdate historyLines keepSourceSelection keepSource
-		hasHistoryManager canLoadBinaries loadBinaries catchMethodRedefs'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
+                searchDialogIsModal startTextDragWithControl catchClassRedefs
+                fullHistoryUpdate historyLines keepSourceSelection keepSource
+                hasHistoryManager canLoadBinaries loadBinaries catchMethodRedefs'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#HTTPStartServerSettingsApplication
-	instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
-		hasCreatedServerChannel'
-	classVariableNames:'CreatedServers'
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
+                hasCreatedServerChannel'
+        classVariableNames:'CreatedServers'
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#KbdMappingSettingsAppl
-	instanceVariableNames:'selectedRawKey macroTextHolder selectedFunctionKey
-		labelTextHolder functionKeyList rawKeyList mappings'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'selectedRawKey macroTextHolder selectedFunctionKey
+                labelTextHolder functionKeyList rawKeyList mappings'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#LanguageSettingsAppl
-	instanceVariableNames:'languageHolder languageIndexHolder languageList
-		languageListHolder listOfLanguages translatedLanguages
-		noticeLabelHolder currentFlagAndLanguageChannel
-		currentLanguageLabel perLanguageResources'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'languageHolder languageIndexHolder languageList
+                languageListHolder listOfLanguages translatedLanguages
+                noticeLabelHolder currentFlagAndLanguageChannel
+                currentLanguageLabel perLanguageResources'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MemorySettingsAppl
-	instanceVariableNames:'newSpaceSize maxOldSpace fastMoreLimit warningLabelHolder
-		codeTrigger codeLimit oldIncr compressLimit igcFreeLimit igcLimit
-		igcFreeAmount stackLimit supportsJustInTimeCompilation'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'newSpaceSize maxOldSpace fastMoreLimit warningLabelHolder
+                codeTrigger codeLimit oldIncr compressLimit igcFreeLimit igcLimit
+                igcFreeAmount stackLimit supportsJustInTimeCompilation'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MiscCommunicationSettingsAppl
-	instanceVariableNames:'remoteBrowsingEnabled windowMigrationEnabled
-		windowMigrationPassword windowMigrationAuthenticate
-		enablePasswordCheck'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'remoteBrowsingEnabled windowMigrationEnabled
+                windowMigrationPassword windowMigrationAuthenticate
+                enablePasswordCheck'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MiscDisplaySettingsAppl
-	instanceVariableNames:'returnFocus focusFollowsMouse beepEnabled takeFocus
-		activateOnClick shadows opaqueVariablePanelResize
-		formatHostNameinWindowLabels opaqueTableColumnResize
-		hostNameInLabelHolder showAccelerators newWindowLabelFormat
-		formatHostNameWindowLabel'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'returnFocus focusFollowsMouse beepEnabled takeFocus
+                activateOnClick shadows opaqueVariablePanelResize
+                formatHostNameinWindowLabels opaqueTableColumnResize
+                hostNameInLabelHolder showAccelerators newWindowLabelFormat
+                formatHostNameWindowLabel'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#OsiSettingsAppl
-	instanceVariableNames:'osiACSEConnectionLogging osiROSEErrorLogging osiCMISEErrorLogging
-		osiACSEErrorLogging osiROSEPresent osiCMISEPresent
-		osiCMISEMessageLogging osiACSEDataLogging
-		osiROSEInvokationLogging osiACSEPresent osiROSEResponseLogging'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'osiACSEConnectionLogging osiROSEErrorLogging osiCMISEErrorLogging
+                osiACSEErrorLogging osiROSEPresent osiCMISEPresent
+                osiCMISEMessageLogging osiACSEDataLogging
+                osiROSEInvokationLogging osiACSEPresent osiROSEResponseLogging'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#PrinterSettingsAppl
-	instanceVariableNames:'selectedUnit supportsColor topMargin rightMargin bottomMargin
-		landscape pageFormatList pageFormat unitList leftMargin
-		possiblePrinters printerType printerTypeSelection
-		printCommandList commandList printCommand printFilename
-		enableFormat enablelandscape enableMargins enableColorBox'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'selectedUnit supportsColor topMargin rightMargin bottomMargin
+                landscape pageFormatList pageFormat unitList leftMargin
+                possiblePrinters printerType printerTypeSelection
+                printCommandList commandList printCommand printFilename
+                enableFormat enablelandscape enableMargins enableColorBox'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#ProcessorSchedulerSettingsAppl
-	instanceVariableNames:'dynamicPrios preemptive'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'dynamicPrios preemptive'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#RDoItServerSettingsAppl
-	instanceVariableNames:'rDoitLogging rDoitsEnabled rDoitErrorLogging hasRDoitServer
-		rDoitErrorDebugging rDoitServerPortOrPath'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'rDoitLogging rDoitsEnabled rDoitErrorLogging hasRDoitServer
+                rDoitErrorDebugging rDoitServerPortOrPath'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#STCCompilerSettingsAppl
-	instanceVariableNames:'cc ccOptions stcIncludes linkCommand stc linkArgs canLoadBinaries
-		stcDefines stcLibraries stcOptions stcLibraryPath
-		stcCompilationSelection stcCompilationList'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'cc ccOptions stcIncludes linkCommand stc linkArgs canLoadBinaries
+                stcDefines stcLibraries stcOptions stcLibraryPath
+                stcCompilationSelection stcCompilationList'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SourceCodeFormatSettingsAppl
-	instanceVariableNames:'spaceAfterKeywordSelector emptyLineAfterTemporaries tabIndent
-		autoFormat cStyleBlocks editorText maxLengthForSingleLineBlocks
-		blockArgumentsOnNewLine spaceAfterReturnToken
-		spaceAroundTemporaries spaceAfterBlockStart spaceBeforeBlockEnd
-		oldUserPreferences reformatLocked'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'spaceAfterKeywordSelector emptyLineAfterTemporaries tabIndent
+                autoFormat cStyleBlocks editorText maxLengthForSingleLineBlocks
+                blockArgumentsOnNewLine spaceAfterReturnToken
+                spaceAroundTemporaries spaceAfterBlockStart spaceBeforeBlockEnd
+                oldUserPreferences reformatLocked'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SourceCodeManagementSettingsAppl
-	instanceVariableNames:'sourceCacheDir useManager condenseSourceCache
-		syntaxColorConfiguration setupSourceCodeManager
-		checkClassesWhenCheckingIn formattingConfiguration
-		flushSourceCache localSourceFirst cvsIsSetup repositoryHolder
-		manager repository listOfModules cvsRootPrototypeList
-		addPerModuleRoot removeEnabled perModuleRootModule acceptChannel
-		removePerModuleRoot perModuleRoot cvsRootHolder
-		selectedPerModuleRoot cvsBinDirectoryHolder rootsPerModule
-		cvsLoginInModuleEnabled cvsLoginEnabled'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'sourceCacheDir useManager condenseSourceCache
+                syntaxColorConfiguration setupSourceCodeManager
+                checkClassesWhenCheckingIn formattingConfiguration
+                flushSourceCache localSourceFirst cvsIsSetup repositoryHolder
+                manager repository listOfModules cvsRootPrototypeList
+                addPerModuleRoot removeEnabled perModuleRootModule acceptChannel
+                removePerModuleRoot perModuleRoot cvsRootHolder
+                selectedPerModuleRoot cvsBinDirectoryHolder rootsPerModule
+                cvsLoginInModuleEnabled cvsLoginEnabled'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#StyleSettingsAppl
-	instanceVariableNames:'showStandardStylesOnly styleList selectedStyle
-		styleDirectoryContents infoLabelHolder noticeLabelHolder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'showStandardStylesOnly styleList selectedStyle
+                styleDirectoryContents infoLabelHolder noticeLabelHolder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SyntaxColorSettingsAppl
-	instanceVariableNames:'coloredText syntaxColor syntaxColors resetList resetListSelection
-		fullSelectorCheck syntaxColoring oldUserPreferences
-		syntaxFontSelector syntaxFonts syntaxElementList
-		syntaxElementSelection syntaxEmphasisList syntaxEmphasisSelection
-		emphasisDictionary resetListDictionary'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'coloredText syntaxColor syntaxColors resetList resetListSelection
+                fullSelectorCheck syntaxColoring oldUserPreferences
+                syntaxFontSelector syntaxFonts syntaxElementList
+                syntaxElementSelection syntaxEmphasisList syntaxEmphasisSelection
+                emphasisDictionary resetListDictionary'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SystemMessageSettingsAppl
-	instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
-		changeFileName'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
+                changeFileName'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#ToolsSettingsAppl
-	instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
-		showClockInLauncher useNewChangesBrowser useNewFileBrowser
-		useNewSystemBrowser useNewFileDialog useNewSettingsApplication
-		useProcessMonitorV2'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
+                showClockInLauncher useNewChangesBrowser useNewFileBrowser
+                useNewSystemBrowser useNewFileDialog useNewSettingsApplication
+                useProcessMonitorV2'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 !AbstractSettingsApplication class methodsFor:'documentation'!
@@ -1040,28 +1040,26 @@
 !AbstractSettingsApplication::ByteCodeCompilerSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ 
-        (
-        ((Compiler warnings ? false) ~= self warnings value) or:[
-        ((Compiler warnSTXSpecials ? false) ~= self warnSTX value) or:[
-        ((Compiler warnOldStyleAssignment ? false) ~= self warnOldStyle value) or:[
-        ((Compiler warnUnderscoreInIdentifier ? false) ~= self warnUnderscore value) or:[
-        ((Compiler warnDollarInIdentifier ? false) ~= self warnDollar value) or:[
-        ((Compiler warnCommonMistakes ? false) ~= self warnCommonMistakes value) or:[
-        ((Compiler warnPossibleIncompatibilities ? false) ~= self warnCompatibility value) or:[
-        ((Compiler warnUnusedVars ? false) ~= self warnUnusedVars value)  or:[
-        ((Compiler allowUnderscoreInIdentifier ? false) ~= self allowUnderscore value) or:[
-        ((Compiler allowDollarInIdentifier ? false) ~= self allowDollar value) or:[
-        ((Compiler allowSqueakExtensions ? false) ~= self allowSqueakExtensions value) or:[
-        ((Compiler allowDolphinExtensions ? false) ~= self allowDolphinExtensions value) or:[
-        ((Compiler allowQualifiedNames ? false) ~= self allowQualifiedNames value) or:[
-        ((Compiler allowOldStyleAssignment ? false) ~= self allowOldStyleAssignment value) or:[
-        ((Compiler allowReservedWordsAsSelectors ? false) ~= self allowReservedWordsAsSelectors value) or:[
-        ((Compiler arraysAreImmutable ? false) ~= self immutableArrays value) or:[
-        ((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[Compiler lineNumberInfo == #full]) ~= self fullDebugSupport value) or:[
-        ((Compiler foldConstants) ~= (self class constantFoldingOptions at:self constantFoldingSelection value)) or:[
-        ((ObjectMemory justInTimeCompilation ? false) ~= self justInTimeCompilation value)]]]]]]]]]]]]]]]]]])
+    ((Compiler warnings ? false) ~= self warnings value) ifTrue:[^ true].
+    ((Compiler warnSTXSpecials ? false) ~= self warnSTX value) ifTrue:[^ true].
+    ((Compiler warnOldStyleAssignment ? false) ~= self warnOldStyle value) ifTrue:[^ true].
+    ((Compiler warnUnderscoreInIdentifier ? false) ~= self warnUnderscore value) ifTrue:[^ true].
+    ((Compiler warnDollarInIdentifier ? false) ~= self warnDollar value) ifTrue:[^ true].
+    ((Compiler warnCommonMistakes ? false) ~= self warnCommonMistakes value) ifTrue:[^ true].
+    ((Compiler warnPossibleIncompatibilities ? false) ~= self warnCompatibility value) ifTrue:[^ true].
+    ((Compiler warnUnusedVars ? false) ~= self warnUnusedVars value) ifTrue:[^ true].
+    ((Compiler allowUnderscoreInIdentifier ? false) ~= self allowUnderscore value) ifTrue:[^ true].
+    ((Compiler allowDollarInIdentifier ? false) ~= self allowDollar value) ifTrue:[^ true].
+    ((Compiler allowSqueakExtensions ? false) ~= self allowSqueakExtensions value) ifTrue:[^ true].
+    ((Compiler allowDolphinExtensions ? false) ~= self allowDolphinExtensions value) ifTrue:[^ true].
+    ((Compiler allowQualifiedNames ? false) ~= self allowQualifiedNames value) ifTrue:[^ true].
+    ((Compiler allowOldStyleAssignment ? false) ~= self allowOldStyleAssignment value) ifTrue:[^ true].
+    ((Compiler allowReservedWordsAsSelectors ? false) ~= self allowReservedWordsAsSelectors value) ifTrue:[^ true].
+    ((Compiler arraysAreImmutable ? false) ~= self immutableArrays value) ifTrue:[^ true].
+    ((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[Compiler lineNumberInfo == #full]) ~= self fullDebugSupport value) ifTrue:[^ true].
+    ((Compiler foldConstants) ~= (self class constantFoldingOptions at:self constantFoldingSelection value)) ifTrue:[^ true].
+    ((ObjectMemory justInTimeCompilation ? false) ~= self justInTimeCompilation value) ifTrue:[^ true].
+    ^ false
 !
 
 supportsJustInTimeCompilation
@@ -1250,13 +1248,10 @@
 !AbstractSettingsApplication::DebuggerSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (
-        self showErrorNotifier value ~= (NoHandlerError emergencyHandler == AbstractLauncherApplication notifyingEmergencyHandler) or:[
-        DebugView defaultVerboseBacktrace ? false ~= self showVerboseStack value or:[
-        (UserPreferences current at:#allowSendMailFromDebugger ifAbsent:true) ~= self allowSendMailFromDebugger value 
-        ]]
-    )
+    self showErrorNotifier value ~= (NoHandlerError emergencyHandler == AbstractLauncherApplication notifyingEmergencyHandler) ifTrue:[^ true].
+    DebugView defaultVerboseBacktrace ? false ~= self showVerboseStack value ifTrue:[^ true].
+    (UserPreferences current at:#allowSendMailFromDebugger ifAbsent:true) ~= self allowSendMailFromDebugger value ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::DisplaySettingsAppl class methodsFor:'defaults'!
@@ -1842,21 +1837,18 @@
 !AbstractSettingsApplication::DisplaySettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (
-        self useFixPalette value ~= screen fixColors notNil or:[
-        self useFixGrayPalette value ~= screen fixGrayColors notNil or:[
-        self isColorMonitor value ~= screen hasColors or:[
-        self sizeX value ~= screen widthInMillimeter or:[
-        self sizeY value ~= screen heightInMillimeter or:[
-
-        self deepIcons value ~= screen supportsDeepIcons or:[
-        (ditherSyms notNil and:[
-            self ditherListSelection value ~= (ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold).
-        ]) or:[
-        self clipEncodingListSelection value ~= (self class clipEncodingSyms indexOf:screen clipBoardEncoding ifAbsent:1)
-        ]]]]]]]
-    )
+    self useFixPalette value ~= screen fixColors notNil ifTrue:[^ true].
+    self useFixGrayPalette value ~= screen fixGrayColors notNil ifTrue:[^ true].
+    self isColorMonitor value ~= screen hasColors ifTrue:[^ true].
+    self sizeX value ~= screen widthInMillimeter ifTrue:[^ true].
+    self sizeY value ~= screen heightInMillimeter ifTrue:[^ true].
+
+    self deepIcons value ~= screen supportsDeepIcons ifTrue:[^ true].
+    ditherSyms notNil ifTrue:[
+        self ditherListSelection value ~= (ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold) ifTrue:[^ true].
+    ].
+    self clipEncodingListSelection value ~= (self class clipEncodingSyms indexOf:screen clipBoardEncoding ifAbsent:1) ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::EditSettingsAppl class methodsFor:'image specs'!
@@ -2760,12 +2752,12 @@
 !AbstractSettingsApplication::FontSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (self labelDef value ~= Label defaultFont) or:[
-       self buttonDef value ~= Button defaultFont or:[
-       self listDef value ~= SelectionInListView defaultFont or:[
-       self menuDef value ~= MenuView defaultFont or:[
-       self textDef value ~= TextView defaultFont ]]]]
+    self labelDef value ~= Label defaultFont ifTrue:[^ true].
+    self buttonDef value ~= Button defaultFont ifTrue:[^ true].
+    self listDef value ~= SelectionInListView defaultFont ifTrue:[^ true].
+    self menuDef value ~= MenuView defaultFont ifTrue:[^ true].
+    self textDef value ~= TextView defaultFont ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::GeneralCompilerSettingsAppl class methodsFor:'defaults'!
@@ -3050,16 +3042,13 @@
 !AbstractSettingsApplication::GeneralCompilerSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ ( 
-        ((HistoryManager fullHistoryUpdate ? false) ~= self fullHistoryUpdate value) or:[
-        ((ClassCategoryReader sourceMode) ~= (self class keepSourceOptions at:self keepSourceSelection value)) or:[
-        ((Class catchMethodRedefinitions ? false) ~= self catchMethodRedefs value) or:[
-        ((Class catchClassRedefinitions ? false) ~= self catchClassRedefs value) or:[
-        ((Smalltalk loadBinaries ? false) ~= self loadBinaries value) or:[
-        ((self hasHistoryManager) ~= self historyLines value) 
-        ]]]]]
-    )
+    ((HistoryManager fullHistoryUpdate ? false) ~= self fullHistoryUpdate value) ifTrue:[^ true].
+    ((ClassCategoryReader sourceMode) ~= (self class keepSourceOptions at:self keepSourceSelection value)) ifTrue:[^ true].
+    ((Class catchMethodRedefinitions ? false) ~= self catchMethodRedefs value) ifTrue:[^ true].
+    ((Class catchClassRedefinitions ? false) ~= self catchClassRedefs value) ifTrue:[^ true].
+    ((Smalltalk loadBinaries ? false) ~= self loadBinaries value) ifTrue:[^ true].
+    ((self hasHistoryManager) ~= self historyLines value) ifTrue:[^ true].
+    ^ false.
 ! !
 
 !AbstractSettingsApplication::HTTPStartServerSettingsApplication class methodsFor:'image specs'!
@@ -5025,20 +5014,18 @@
 !AbstractSettingsApplication::MemorySettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^   (
-        ObjectMemory freeSpaceGCAmount ~= self igcFreeAmount value or:[
-        ObjectMemory freeSpaceGCLimit ~= self igcFreeLimit value or:[
-        ObjectMemory incrementalGCLimit ~= self igcLimit value or:[
-        ObjectMemory newSpaceSize ~= self newSpaceSize value or:[
-        ObjectMemory oldSpaceIncrement ~= self oldIncr value or:[
-        Process defaultMaximumStackSize ~= self stackLimit value or:[
-        (ObjectMemory fastMoreOldSpaceLimit:-1) ~= self fastMoreLimit value or:[
-        ObjectMemory maxOldSpace ~= self maxOldSpace value or:[
-        ObjectMemory oldSpaceCompressLimit ~= self compressLimit value or:[
-        ObjectMemory dynamicCodeLimit ~= self codeLimit value or:[
-        ObjectMemory dynamicCodeGCTrigger ~= self codeTrigger value ]]]]]]]]]]
-        )
+    ObjectMemory freeSpaceGCAmount ~= self igcFreeAmount value ifTrue:[^ true].
+    ObjectMemory freeSpaceGCLimit ~= self igcFreeLimit value ifTrue:[^ true].
+    ObjectMemory incrementalGCLimit ~= self igcLimit value ifTrue:[^ true].
+    ObjectMemory newSpaceSize ~= self newSpaceSize value ifTrue:[^ true].
+    ObjectMemory oldSpaceIncrement ~= self oldIncr value ifTrue:[^ true].
+    Process defaultMaximumStackSize ~= self stackLimit value ifTrue:[^ true].
+    (ObjectMemory fastMoreOldSpaceLimit:-1) ~= self fastMoreLimit value ifTrue:[^ true].
+    ObjectMemory maxOldSpace ~= self maxOldSpace value ifTrue:[^ true].
+    ObjectMemory oldSpaceCompressLimit ~= self compressLimit value ifTrue:[^ true].
+    ObjectMemory dynamicCodeLimit ~= self codeLimit value ifTrue:[^ true].
+    ObjectMemory dynamicCodeGCTrigger ~= self codeTrigger value ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::MiscCommunicationSettingsAppl class methodsFor:'image specs'!
@@ -5769,23 +5756,18 @@
 !AbstractSettingsApplication::MiscDisplaySettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (
-    self newWindowLabelFormat value ~= StandardSystemView windowLabelFormat or:[
-    self shadows value ~= PopUpView shadows or:[
-    self beepEnabled value ~= currentUserPrefs beepEnabled or:[
-    self hostNameInLabelHolder value ~= StandardSystemView includeHostNameInLabel or:[
-    self returnFocus value ~= StandardSystemView returnFocusWhenClosingModalBoxes or:[
-    self takeFocus value ~= StandardSystemView takeFocusWhenMapped or:[
-    self focusFollowsMouse value ~= (currentUserPrefs focusFollowsMouse ? true) or:[
-    self activateOnClick value ~= (Display activateOnClick:nil) or:[
-    self opaqueVariablePanelResize value ~= currentUserPrefs opaqueVariablePanelResizing or:[
-    self opaqueTableColumnResize value ~= currentUserPrefs opaqueTableColumnResizing or:[
-    self showAccelerators value ~= MenuView showAcceleratorKeys
-    ]]]]]]]]]]
-    )
-
-    "Modified: / 16.12.2002 / 18:09:42 / penk"
+    self newWindowLabelFormat value ~= StandardSystemView windowLabelFormat ifTrue:[^ true].
+    self shadows value ~= PopUpView shadows ifTrue:[^ true].
+    self beepEnabled value ~= currentUserPrefs beepEnabled ifTrue:[^ true].
+    self hostNameInLabelHolder value ~= StandardSystemView includeHostNameInLabel ifTrue:[^ true].
+    self returnFocus value ~= StandardSystemView returnFocusWhenClosingModalBoxes ifTrue:[^ true].
+    self takeFocus value ~= StandardSystemView takeFocusWhenMapped ifTrue:[^ true].
+    self focusFollowsMouse value ~= (currentUserPrefs focusFollowsMouse ? true) ifTrue:[^ true].
+    self activateOnClick value ~= (Display activateOnClick:nil) ifTrue:[^ true].
+    self opaqueVariablePanelResize value ~= currentUserPrefs opaqueVariablePanelResizing ifTrue:[^ true].
+    self opaqueTableColumnResize value ~= currentUserPrefs opaqueTableColumnResizing ifTrue:[^ true].
+    self showAccelerators value ~= MenuView showAcceleratorKeys ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::OsiSettingsAppl class methodsFor:'image specs'!
@@ -6901,24 +6883,25 @@
     ].
     printer := self possiblePrinters at:(self printerTypeSelection value).
 
-    ^ (
-        printer ~= Printer or:[
-        Printer printCommand ~= self printCommand value or:[
-        (Printer printFilename ? '') ~= (self printFilename value ? '') or:[
-        (Printer supportsPageSizes and:[
-            Printer pageFormat ~= self pageFormat value or:[
-            Printer landscape ~= (self landscape value)
-        ]]) or:[
-        (Printer supportsMargins and:[
-            Printer topMargin ~= ((UnitConverter convert:(self topMargin value asFloat) from:unit to:#inch) asFloat) or:[
-            Printer leftMargin ~= ((UnitConverter convert:(self leftMargin value asFloat) from:unit to:#inch) asFloat) or:[
-            Printer rightMargin ~= ((UnitConverter convert:(self rightMargin value asFloat) from:unit to:#inch) asFloat) or:[
-            Printer bottomMargin ~= ((UnitConverter convert:(self bottomMargin value asFloat) from:unit to:#inch) asFloat)
-        ]]]]) or:[
-        Printer supportsPostscript and:[
-            Printer supportsColor ~= self supportsColor value 
-        ]]]]]]
-    )
+    printer ~= Printer ifTrue:[^ true].
+
+    Printer printCommand ~= self printCommand value ifTrue:[^ true].
+    (Printer printFilename ? '') ~= (self printFilename value ? '') ifTrue:[^ true].
+
+    Printer supportsPageSizes ifTrue:[
+        Printer pageFormat ~= self pageFormat value ifTrue:[^ true].
+        Printer landscape ~= (self landscape value) ifTrue:[^ true].
+    ].
+    Printer supportsMargins ifTrue:[
+        Printer topMargin ~= ((UnitConverter convert:(self topMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer leftMargin ~= ((UnitConverter convert:(self leftMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer rightMargin ~= ((UnitConverter convert:(self rightMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer bottomMargin ~= ((UnitConverter convert:(self bottomMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+    ].
+    Printer supportsPostscript ifTrue:[
+        Printer supportsColor ~= self supportsColor value ifTrue:[^ true].
+    ].
+    ^ false
 !
 
 possiblePrinters
@@ -7075,11 +7058,9 @@
 !AbstractSettingsApplication::ProcessorSchedulerSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (
-        self preemptive value ~= Processor isTimeSlicing or:[
-        self dynamicPrios value ~= Processor supportDynamicPriorities]
-    )
+    self preemptive value ~= Processor isTimeSlicing ifTrue:[^ true].
+    self dynamicPrios value ~= Processor supportDynamicPriorities ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::RDoItServerSettingsAppl class methodsFor:'image specs'!
@@ -7389,16 +7370,14 @@
 !
 
 hasUnsavedChanges
-
     (self hasRDoitServer and:[RDoItServer isLoaded]) ifTrue:[
-        ^ (
-            self rDoitsEnabled value ~= RDoItServer serverRunning or:[
-            RDoItServer serverRunning and:[
-            (self rDoitLogging value ~= RDoItServer isLogging or:[
-            self rDoitErrorLogging value ~= RDoItServer isErrorLogging or:[
-            self rDoitErrorDebugging value ~= RDoItServer isErrorCatching not or:[
-            self rDoitServerPortOrPath value ~= RDoItServer defaultPortNumberOrPath]]])]]
-        )
+        self rDoitsEnabled value ~= RDoItServer serverRunning ifTrue:[^ true].
+        RDoItServer serverRunning ifTrue:[
+            self rDoitLogging value ~= RDoItServer isLogging ifTrue:[^ true].
+            self rDoitErrorLogging value ~= RDoItServer isErrorLogging ifTrue:[^ true].
+            self rDoitErrorDebugging value ~= RDoItServer isErrorCatching not ifTrue:[^ true].
+            self rDoitServerPortOrPath value ~= RDoItServer defaultPortNumberOrPath ifTrue:[^ true].
+        ]
     ].
     ^ false
 ! !
@@ -7976,29 +7955,30 @@
 !AbstractSettingsApplication::STCCompilerSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
     | searchedLibs |
+
     searchedLibs := ObjectFileLoader searchedLibraries.
-    ^ (
-        ((Compiler stcCompilation) ~= (self class stcCompilationOptions at:self stcCompilationSelection value)) or:[
-        ((ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) ~= self canLoadBinaries value ) or:[
-        ((Compiler stcCompilationIncludes) ~= self stcIncludes value) or:[
-        ((Compiler stcCompilationDefines) ~= self stcDefines value) or:[
-        ((Compiler stcCompilationOptions) ~= self stcOptions value) or:[
-        ((Compiler ccCompilationOptions) ~= self ccOptions value) or:[
-        ((Compiler ccPath) ~= self cc value) or:[
-        ((Compiler stcPath) ~= self stc value) or:[
-        ((ObjectFileLoader linkCommand) ~= self linkCommand value) or:[
-        ((ObjectFileLoader linkArgs) ~= self linkArgs value) or:[
-        ObjectFileLoader notNil and:[
-            ((searchedLibs notNil and:[
-                (String fromStringCollection:searchedLibs separatedBy:' ') ~= self stcLibraries value
-            ]) or:[
-            (ObjectFileLoader libPath notNil and:[
-                ObjectFileLoader libPath ~= self stcLibraryPath value 
-            ])]) 
-        ]]]]]]]]]]] 
-    )
+
+    ((Compiler stcCompilation) ~= (self class stcCompilationOptions at:self stcCompilationSelection value)) ifTrue:[^ true].
+    ((ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) ~= self canLoadBinaries value ) ifTrue:[^ true].
+    ((Compiler stcCompilationIncludes) ~= self stcIncludes value) ifTrue:[^ true].
+    ((Compiler stcCompilationDefines) ~= self stcDefines value) ifTrue:[^ true].
+    ((Compiler stcCompilationOptions) ~= self stcOptions value) ifTrue:[^ true].
+    ((Compiler ccCompilationOptions) ~= self ccOptions value) ifTrue:[^ true].
+    ((Compiler ccPath) ~= self cc value) ifTrue:[^ true].
+    ((Compiler stcPath) ~= self stc value) ifTrue:[^ true].
+    ((ObjectFileLoader linkCommand) ~= self linkCommand value) ifTrue:[^ true].
+    ((ObjectFileLoader linkArgs) ~= self linkArgs value) ifTrue:[^ true].
+
+    ObjectFileLoader notNil ifTrue:[
+        searchedLibs notNil ifTrue:[
+            (String fromStringCollection:searchedLibs separatedBy:' ') ~= self stcLibraries value ifTrue:[^ true].
+        ].
+        ObjectFileLoader libPath notNil ifTrue:[
+            ObjectFileLoader libPath ~= self stcLibraryPath value ifTrue:[^ true]. 
+        ].
+    ].
+    ^ false.
 ! !
 
 !AbstractSettingsApplication::SourceCodeFormatSettingsAppl class methodsFor:'defaults'!
@@ -8653,21 +8633,18 @@
 !AbstractSettingsApplication::SourceCodeFormatSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^ (
-        self autoFormat value ~= currentUserPrefs autoFormatting ? false or:[
-        self tabIndent value ~= RBFormatter tabIndent or:[
-        self spaceAroundTemporaries value ~= RBFormatter spaceAroundTemporaries or:[
-        self emptyLineAfterTemporaries value ~= RBFormatter emptyLineAfterTemporaries or:[
-        self spaceAfterReturnToken value ~= RBFormatter spaceAfterReturnToken or:[
-        self spaceAfterKeywordSelector value ~= RBFormatter spaceAfterKeywordSelector or:[
-        self spaceAfterBlockStart value ~= RBFormatter spaceAfterBlockStart or:[
-        self spaceBeforeBlockEnd value ~= RBFormatter spaceBeforeBlockEnd or:[
-        self cStyleBlocks value ~= RBFormatter cStyleBlocks or:[
-        self blockArgumentsOnNewLine value ~= RBFormatter blockArgumentsOnNewLine or:[
-        self maxLengthForSingleLineBlocks value ~= RBFormatter maxLengthForSingleLineBlocks
-        ]]]]]]]]]]
-    )
+    self autoFormat value ~= currentUserPrefs autoFormatting ? false ifTrue:[^ true].
+    self tabIndent value ~= RBFormatter tabIndent ifTrue:[^ true].
+    self spaceAroundTemporaries value ~= RBFormatter spaceAroundTemporaries ifTrue:[^ true].
+    self emptyLineAfterTemporaries value ~= RBFormatter emptyLineAfterTemporaries ifTrue:[^ true].
+    self spaceAfterReturnToken value ~= RBFormatter spaceAfterReturnToken ifTrue:[^ true].
+    self spaceAfterKeywordSelector value ~= RBFormatter spaceAfterKeywordSelector ifTrue:[^ true].
+    self spaceAfterBlockStart value ~= RBFormatter spaceAfterBlockStart ifTrue:[^ true].
+    self spaceBeforeBlockEnd value ~= RBFormatter spaceBeforeBlockEnd ifTrue:[^ true].
+    self cStyleBlocks value ~= RBFormatter cStyleBlocks ifTrue:[^ true].
+    self blockArgumentsOnNewLine value ~= RBFormatter blockArgumentsOnNewLine ifTrue:[^ true].
+    self maxLengthForSingleLineBlocks value ~= RBFormatter maxLengthForSingleLineBlocks ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::SourceCodeManagementSettingsAppl class methodsFor:'image specs'!
@@ -9536,8 +9513,7 @@
 !
 
 hasUnsavedChanges
-    (self useManager value ~= ((Smalltalk at:#SourceCodeManager) notNil)) 
-        ifTrue:[^ true].
+    (self useManager value ~= ((Smalltalk at:#SourceCodeManager) notNil)) ifTrue:[^ true].
 
     ((self hasManager and:[self useManager value]) 
     and:[
@@ -9546,8 +9522,7 @@
         ]) 
         ifTrue:[^ true].
 
-    (self hasManager and:[self useManager value]) 
-        ifFalse:[^ false].
+    (self hasManager and:[self useManager value]) ifFalse:[^ false].
 
     ((UserPreferences current at:#checkClassesWhenCheckingIn ifAbsent:true) ~= self checkClassesWhenCheckingIn value)  
         ifTrue:[^ true].
@@ -9561,8 +9536,7 @@
     ((Dictionary new declareAllFrom:(CVSSourceCodeManager repositoryNamesPerModule)) ~= rootsPerModule)
         ifTrue:[^ true].
 
-    (self sourceCacheDir value ~= AbstractSourceCodeManager cacheDirectoryName)
-        ifTrue:[^ true].
+    (self sourceCacheDir value ~= AbstractSourceCodeManager cacheDirectoryName) ifTrue:[^ true].
         
     ^ false
 ! !
@@ -10814,14 +10788,14 @@
 !AbstractSettingsApplication::SystemMessageSettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    ^(self vmInfo value ~= ObjectMemory infoPrinting  or:[
-      self vmErrors value ~= ObjectMemory debugPrinting or:[
-      self classInfos value ~= Object infoPrinting or:[
-      Smalltalk logDoits ~= self logDoits value or:[
-      Class updatingChanges ~= self updChanges value or:[
-      ObjectMemory nameForChanges ~= self changeFileName value or:[
-      self displayErrors value ~= DeviceWorkstation errorPrinting ]]]]]])
+    self vmInfo value ~= ObjectMemory infoPrinting ifTrue:[^ true].
+    self vmErrors value ~= ObjectMemory debugPrinting ifTrue:[^ true].
+    self classInfos value ~= Object infoPrinting ifTrue:[^ true].
+    Smalltalk logDoits ~= self logDoits value ifTrue:[^ true].
+    Class updatingChanges ~= self updChanges value ifTrue:[^ true].
+    ObjectMemory nameForChanges ~= self changeFileName value ifTrue:[^ true].
+    self displayErrors value ~= DeviceWorkstation errorPrinting ifTrue:[^ true].
+    ^ false
 ! !
 
 !AbstractSettingsApplication::ToolsSettingsAppl class methodsFor:'image specs'!
@@ -11208,5 +11182,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.157 2004-06-14 18:42:23 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.158 2004-06-14 18:58:22 cg Exp $'
+! !