fix errors happend on checkin/checkout
authorpenk
Wed, 09 Jul 2003 15:14:25 +0200
changeset 5034 3a50f655ee4d
parent 5033 2b52a33c7eee
child 5035 f560d545050c
fix errors happend on checkin/checkout
AbstractFileBrowser.st
AbstractSettingsApplication.st
--- a/AbstractFileBrowser.st	Wed Jul 09 15:14:12 2003 +0200
+++ b/AbstractFileBrowser.st	Wed Jul 09 15:14:25 2003 +0200
@@ -4104,7 +4104,7 @@
     |dialog|
 
     dialog := FileBrowserV2SettingsDialog new.
-    dialog requestor:self.
+    dialog settingsDialog:self.
     dialog allButOpen.
     dialog doReload.
     dialog openWindow
@@ -4320,7 +4320,7 @@
     | inst |
 
     inst := FileBrowserV2SettingsDialog new.
-    inst requestor:self.
+    inst settingsDialog:self.
     inst open.
 !
 
@@ -6371,5 +6371,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.162 2003-06-30 13:24:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.163 2003-07-09 13:14:25 penk Exp $'
 ! !
--- a/AbstractSettingsApplication.st	Wed Jul 09 15:14:12 2003 +0200
+++ b/AbstractSettingsApplication.st	Wed Jul 09 15:14:25 2003 +0200
@@ -1,231 +1,231 @@
 "{ 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'
-	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'
+        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:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
+                hasCreatedServerChannel'
+        classVariableNames:''
+        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 languageList listOfLanguages translatedLanguages
-		noticeLabelHolder currentLanguageChannel currentLanguageLabel'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'languageHolder languageList listOfLanguages translatedLanguages
+                noticeLabelHolder currentLanguageChannel currentLanguageLabel'
+        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 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 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 oldUserPreferences reformatLocked'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'spaceAfterKeywordSelector emptyLineAfterTemporaries tabIndent
+                autoFormat cStyleBlocks editorText maxLengthForSingleLineBlocks
+                blockArgumentsOnNewLine spaceAfterReturnToken
+                spaceAroundTemporaries 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'
-	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'
+        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'!
@@ -3011,7 +3011,7 @@
 !AbstractSettingsApplication::HTTPStartServerSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.79 2003-07-09 13:10:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.80 2003-07-09 13:13:44 penk Exp $'
 ! !
 
 !AbstractSettingsApplication::HTTPStartServerSettingsApplication class methodsFor:'image specs'!
@@ -3269,7 +3269,7 @@
         portToUse := 8080
     ] ifTrue:[
         highestUsedPortNr := HTTPServer allInstances 
-                                inject:(HTTPServer defaultPort - 1) 
+                                inject:(HTTPServer port - 1) 
                                 into:[:maxSoFar :thisServer | thisServer port max:maxSoFar].
 
         portToUse := highestUsedPortNr + 1
@@ -10822,5 +10822,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.79 2003-07-09 13:10:59 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.80 2003-07-09 13:13:44 penk Exp $'
+! !