--- a/PerforceSourceCodeManagementSettingsAppl.st Tue Apr 19 11:08:30 2011 +0200
+++ b/PerforceSourceCodeManagementSettingsAppl.st Tue Apr 19 11:08:39 2011 +0200
@@ -47,8 +47,8 @@
<resource: #image>
^Icon
- constantNamed:#'AbstractSettingsApplication::SourceCodeManagementSettingsAppl class defaultIcon'
- ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+ constantNamed:#'AbstractSettingsApplication::SourceCodeManagementSettingsAppl class defaultIcon'
+ ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
@@@@@@@@@@@A@PHB@0P@@@@@@@@@@@@@@@@@@@HEA \HA $JB0HD@@@@@@@@@@@@@@HLA04NC0HD@@L@@ P@@@@@@@@@@@@ED@ NDP@@@@@@@@@D@@@@@@@@
@@@BA \FAPP@@@@@@@@@@@P@@@@@@@@@AQ@RC0@@@@@@@@@@@@@@@@@@@@@@@@TGA!!DD@@@@@@@@@@@@@@@@@@@D@PDIA08OA@@@@@@@@@@@@@@@@@@@AP S
A0XIBPXGC0P@@@@@@@@@@@@@@@@ECAPLBPXOAP@@@@@@EQX@@@@@@@@@@@TIE@XOAP@@@@@@EQ\XE @@@@@@@@@@AP$OAP@@@@@@FQ\ZE!! V@@@@@@@@@@@E
@@ -74,258 +74,258 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: windowSpec
- window:
+ name: windowSpec
+ window:
(WindowSpec
- label: 'Source Code Manager Settings'
- name: 'Source Code Manager Settings'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 726 653)
- )
- component:
+ label: 'Source Code Manager Settings'
+ name: 'Source Code Manager Settings'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 726 653)
+ )
+ component:
(SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel2'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
- horizontalLayout: fit
- verticalLayout: topSpace
- horizontalSpace: 3
- verticalSpace: 20
- component:
- (SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel3'
- horizontalLayout: fit
- verticalLayout: top
- horizontalSpace: 3
- verticalSpace: 4
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box3'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Perforce Command or Path:'
- name: 'Label22'
- layout: (LayoutFrame 0 0.0 59 0 60 0.25 81 0)
- level: 0
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField8'
- layout: (LayoutFrame 66 0.25 59 0 -5 1 81 0)
- tabable: true
- model: perforceExecutableHolder
- acceptChannel: acceptChannel
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: 'Default Perforce Root'
- name: ''
- layout: (LayoutFrame 0 0.0 22 0 60 0.25 44 0)
- level: 0
- translateLabel: true
- adjust: right
- )
- (LabelSpec
- label: 'client:user:pass@host:port '
- name: 'Label18'
- layout: (LayoutFrame 4 0.0 40 0 64 0.25 55 0)
- style: (FontDescription helvetica medium roman 10)
- level: 0
- translateLabel: true
- adjust: right
- )
- (ComboBoxSpec
- name: 'cvsRootComboBox'
- layout: (LayoutFrame 66 0.25 28 0 -5 1 50 0)
- tabable: true
- model: defaultSettingsHolder
- immediateAccept: true
- acceptOnLeave: true
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptChannel: acceptChannel
- acceptOnPointerLeave: true
- comboList: defaultSettingsPrototypeList
- )
- )
-
- )
- extent: (Point 726 105)
- )
- (ViewSpec
- name: 'ManagerSetupBoxx'
- component:
- (SpecCollection
- collection: (
- (FramedBoxSpec
- label: 'Per Module Manager Setup'
- name: 'PerModuleManagerSetup'
- layout: (LayoutFrame 0 0 -1 0 0 1 -3 1)
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (DataSetSpec
- name: 'Table1'
- layout: (LayoutFrame 5 0 5 0 0 1 180 0)
- model: selectedPerModuleRoot
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- dataList: listOfModules
- useIndex: false
- columnHolder: tableColumns
- )
- (HorizontalPanelViewSpec
- name: 'HorizontalPanel11'
- layout: (LayoutFrame 5 0 -25 1 -1 1 0 1)
- horizontalLayout: fitSpace
- verticalLayout: center
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'Add/Apply'
- name: 'Button2'
- translateLabel: true
- tabable: true
- model: addPerModuleRoot
- extent: (Point 340 22)
- )
- (ActionButtonSpec
- label: 'Remove'
- name: 'Button3'
- translateLabel: true
- tabable: true
- model: removePerModuleRoot
- enableChannel: removeEnabled
- extent: (Point 341 22)
- )
- )
-
- )
- )
- )
-
- )
- )
- )
-
- )
- extent: (Point 726 250)
- )
- (FramedBoxSpec
- label: 'Source Cache'
- name: 'FramedBox2'
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box4'
- layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Source Cache Dir:'
- name: 'Label23'
- layout: (LayoutFrame 0 0.0 0 0 60 0.25 22 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField9'
- layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
- model: sourceCacheDir
- immediateAccept: false
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- )
-
- )
- )
- (HorizontalPanelViewSpec
- name: 'HorizontalPanel12'
- layout: (LayoutFrame 44 0.25 33 0 0 1 67 0)
- horizontalLayout: fitSpace
- verticalLayout: center
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'Flush Cache now'
- name: 'Button4'
- translateLabel: true
- tabable: true
- model: flushSourceCache
- extent: (Point 234 22)
- )
- (ActionButtonSpec
- label: 'Condense Cache now'
- name: 'Button5'
- translateLabel: true
- tabable: true
- model: condenseSourceCache
- extent: (Point 235 22)
- )
- )
-
- )
- )
- )
-
- )
- extent: (Point 726 95)
- )
- (ViewSpec
- name: 'VerboseBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Verbose (Trace Access on Transcript)'
- name: 'CheckBox6'
- layout: (LayoutFrame 30 0 5 0 -5 1 27 0)
- model: verboseSourceCodeAccess
- translateLabel: true
- )
- )
-
- )
- extent: (Point 726 25)
- )
- )
-
- )
- extent: (Point 726 768)
- )
- )
-
- )
- )
- )
-
- )
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel2'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+ horizontalLayout: fit
+ verticalLayout: topSpace
+ horizontalSpace: 3
+ verticalSpace: 20
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel3'
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 4
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box3'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Perforce Command or Path:'
+ name: 'Label22'
+ layout: (LayoutFrame 0 0.0 59 0 60 0.25 81 0)
+ level: 0
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField8'
+ layout: (LayoutFrame 66 0.25 59 0 -5 1 81 0)
+ tabable: true
+ model: perforceExecutableHolder
+ acceptChannel: acceptChannel
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: 'Default Perforce Root'
+ name: ''
+ layout: (LayoutFrame 0 0.0 22 0 60 0.25 44 0)
+ level: 0
+ translateLabel: true
+ adjust: right
+ )
+ (LabelSpec
+ label: 'client:user:pass@host:port '
+ name: 'Label18'
+ layout: (LayoutFrame 4 0.0 40 0 64 0.25 55 0)
+ style: (FontDescription helvetica medium roman 10)
+ level: 0
+ translateLabel: true
+ adjust: right
+ )
+ (ComboBoxSpec
+ name: 'cvsRootComboBox'
+ layout: (LayoutFrame 66 0.25 28 0 -5 1 50 0)
+ tabable: true
+ model: defaultSettingsHolder
+ immediateAccept: true
+ acceptOnLeave: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptChannel: acceptChannel
+ acceptOnPointerLeave: true
+ comboList: defaultSettingsPrototypeList
+ )
+ )
+
+ )
+ extent: (Point 726 105)
+ )
+ (ViewSpec
+ name: 'ManagerSetupBoxx'
+ component:
+ (SpecCollection
+ collection: (
+ (FramedBoxSpec
+ label: 'Per Module Manager Setup'
+ name: 'PerModuleManagerSetup'
+ layout: (LayoutFrame 0 0 -1 0 0 1 -3 1)
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (DataSetSpec
+ name: 'Table1'
+ layout: (LayoutFrame 5 0 5 0 0 1 180 0)
+ model: selectedPerModuleRoot
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ dataList: listOfModules
+ useIndex: false
+ columnHolder: tableColumns
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel11'
+ layout: (LayoutFrame 5 0 -25 1 -1 1 0 1)
+ horizontalLayout: fitSpace
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Add/Apply'
+ name: 'Button2'
+ translateLabel: true
+ tabable: true
+ model: addPerModuleRoot
+ extent: (Point 340 22)
+ )
+ (ActionButtonSpec
+ label: 'Remove'
+ name: 'Button3'
+ translateLabel: true
+ tabable: true
+ model: removePerModuleRoot
+ enableChannel: removeEnabled
+ extent: (Point 341 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 726 250)
+ )
+ (FramedBoxSpec
+ label: 'Source Cache'
+ name: 'FramedBox2'
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box4'
+ layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Source Cache Dir:'
+ name: 'Label23'
+ layout: (LayoutFrame 0 0.0 0 0 60 0.25 22 0)
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField9'
+ layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
+ model: sourceCacheDir
+ immediateAccept: false
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel12'
+ layout: (LayoutFrame 44 0.25 33 0 0 1 67 0)
+ horizontalLayout: fitSpace
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Flush Cache now'
+ name: 'Button4'
+ translateLabel: true
+ tabable: true
+ model: flushSourceCache
+ extent: (Point 234 22)
+ )
+ (ActionButtonSpec
+ label: 'Condense Cache now'
+ name: 'Button5'
+ translateLabel: true
+ tabable: true
+ model: condenseSourceCache
+ extent: (Point 235 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 726 95)
+ )
+ (ViewSpec
+ name: 'VerboseBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Verbose (Trace Access on Transcript)'
+ name: 'CheckBox6'
+ layout: (LayoutFrame 30 0 5 0 -5 1 27 0)
+ model: verboseSourceCodeAccess
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 726 25)
+ )
+ )
+
+ )
+ extent: (Point 726 768)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
)
! !
@@ -346,20 +346,20 @@
^#(
(DataSetColumnSpec
- label: 'Module'
- labelButtonType: Button
- usePreferredWidth: true
- model: module
+ label: 'Module'
+ labelButtonType: Button
+ usePreferredWidth: true
+ model: module
)
(DataSetColumnSpec
- label: 'Settings'
- labelButtonType: Button
- editorType: InputField
- model: settings
- isResizeable: false
+ label: 'Settings'
+ labelButtonType: Button
+ editorType: InputField
+ model: settings
+ isResizeable: false
)
)
-
+
! !
!P4SourceCodeManagementSettingsAppl methodsFor:'actions'!
@@ -370,10 +370,10 @@
detectedManager := self listOfModules detect:[:eachModuleManager| eachModuleManager module = aModuleManager module] ifNone:nil.
detectedManager isNil ifTrue:[
- self listOfModules add:aModuleManager; sort.
- self updateModifiedChannel.
+ self listOfModules add:aModuleManager; sort.
+ self updateModifiedChannel.
] ifFalse:[
- Dialog information:'Manager for Module ', aModuleManager module, ' already exists'.
+ Dialog information:'Manager for Module ', aModuleManager module, ' already exists'.
].
@@ -382,7 +382,7 @@
addModule:module withData:data
(self listOfModules includes:module) ifFalse:[
- self listOfModules add:module; sort.
+ self listOfModules add:module; sort.
].
self updateModifiedChannel.
@@ -396,15 +396,15 @@
app := ManagerPerModuleApp openFromSourceCodeManagementSettingsApp:self.
app canceled ifFalse:[
- moduleManager := ModuleManager new.
- app moduleHolder value isEmptyOrNil ifTrue:[
- self information:'Adding without module name not allowed'.
- ^ self.
- ].
- moduleManager module:app moduleHolder value.
- moduleManager settings:app settingsHolder value.
- self listOfModules add:moduleManager.
- self updateModifiedChannel.
+ moduleManager := ModuleManager new.
+ app moduleHolder value isEmptyOrNil ifTrue:[
+ self information:'Adding without module name not allowed'.
+ ^ self.
+ ].
+ moduleManager module:app moduleHolder value.
+ moduleManager settings:app settingsHolder value.
+ self listOfModules add:moduleManager.
+ self updateModifiedChannel.
].
"Modified: / 08-11-2006 / 19:27:39 / cg"
!
@@ -432,10 +432,11 @@
].
self perforceExecutableHolder value:PerforceSourceCodeManager perforceExecutable.
+ self verboseSourceCodeAccess value:PerforceSourceCodeManager verboseSourceCodeAccess.
"/ self selectedPerModuleRootChanged.
- "Modified: / 21-09-2006 / 16:52:47 / cg"
+ "Modified: / 19-04-2011 / 10:53:15 / cg"
!
basicSaveSettings
@@ -448,7 +449,7 @@
nm notEmptyOrNil ifTrue:[
(fn := nm asFilename) exists ifFalse:[
(self confirm:('Perforce cache directory ''' , nm , ''' does not exist\create ?' withCRs)) ifTrue:[
- fn makeDirectory;
+ fn makeDirectory;
makeReadableForAll;
makeWritableForAll;
makeExecutableForAll.
@@ -477,12 +478,12 @@
PerforceSourceCodeManager perforcePort:(settings at:#port ifAbsent:nil).
PerforceSourceCodeManager perforcePassword:(settings at:#password ifAbsent:nil).
].
-
+ PerforceSourceCodeManager verboseSourceCodeAccess:self verboseSourceCodeAccess value.
].
self acceptChannel value.
- "Modified: / 09-11-2006 / 14:56:52 / cg"
+ "Modified: / 19-04-2011 / 10:53:46 / cg"
!
condenseSourceCache
@@ -503,7 +504,7 @@
|module|
- acceptChannel value:true.
+ acceptChannel value:true.
module := self selectedPerModuleRoot value.
self listOfModules remove:module ifAbsent:nil.
self updateModifiedChannel.
@@ -514,7 +515,7 @@
acceptChannel
acceptChannel isNil ifTrue:[
- acceptChannel := TriggerValue new.
+ acceptChannel := TriggerValue new.
].
^ acceptChannel.
!
@@ -522,8 +523,8 @@
defaultSettingsHolder
defaultSettingsHolder isNil ifTrue:[
- defaultSettingsHolder := ValueHolder new.
- defaultSettingsHolder addDependent:self.
+ defaultSettingsHolder := ValueHolder new.
+ defaultSettingsHolder addDependent:self.
].
^ defaultSettingsHolder.
!
@@ -531,24 +532,24 @@
defaultSettingsPrototypeList
defaultSettingsPrototypeList isNil ifTrue:[
- defaultSettingsPrototypeList := self perforcePrototypeList.
+ defaultSettingsPrototypeList := self perforcePrototypeList.
].
^ defaultSettingsPrototypeList.
!
listOfModules
- listOfModules isNil ifTrue:[
- listOfModules := List new.
- listOfModules addDependent:self.
+ listOfModules isNil ifTrue:[
+ listOfModules := List new.
+ listOfModules addDependent:self.
].
^ listOfModules.
!
perforceExecutableHolder
perforceExecutableHolder isNil ifTrue:[
- perforceExecutableHolder := ValueHolder new.
- perforceExecutableHolder onChangeSend:#updateModifiedChannel to:self
+ perforceExecutableHolder := ValueHolder new.
+ perforceExecutableHolder onChangeSend:#updateModifiedChannel to:self
].
^ perforceExecutableHolder.
@@ -561,34 +562,34 @@
client := PerforceSourceCodeManager perforceClient.
client isEmptyOrNil ifTrue:[
- client := 'workspace'.
+ client := 'workspace'.
].
- first := (client ,':', PerforceSourceCodeManager perforceUser, ':',
- (PerforceSourceCodeManager perforcePassword ? 'pass'), '@',
- PerforceSourceCodeManager perforcePort).
+ first := (client ,':', PerforceSourceCodeManager perforceUser, ':',
+ (PerforceSourceCodeManager perforcePassword ? 'pass'), '@',
+ PerforceSourceCodeManager perforcePort).
^ Array with:first.
!
removeEnabled
removeEnabled isNil ifTrue:[
- removeEnabled := false asValue.
+ removeEnabled := false asValue.
].
^ removeEnabled.
!
selectedPerModuleRoot
selectedPerModuleRoot isNil ifTrue:[
- selectedPerModuleRoot := ValueHolder new.
- selectedPerModuleRoot addDependent:self.
+ selectedPerModuleRoot := ValueHolder new.
+ selectedPerModuleRoot addDependent:self.
].
^ selectedPerModuleRoot.
!
sourceCacheDir
sourceCacheDir isNil ifTrue:[
- sourceCacheDir := ValueHolder new.
- sourceCacheDir onChangeSend:#updateModifiedChannel to:self
+ sourceCacheDir := ValueHolder new.
+ sourceCacheDir onChangeSend:#updateModifiedChannel to:self
].
^ sourceCacheDir.
!
@@ -604,7 +605,7 @@
"*** (and replace this comment by something more useful ;-)"
tableColumns isNil ifTrue:[
- tableColumns := self class tableColumns asValue.
+ tableColumns := self class tableColumns asValue.
"/ if your app needs to be notified of changes, uncomment one of the lines below:
"/ tableColumns addDependent:self.
"/ tableColumns onChangeSend:#tableColumnsChanged to:self.
@@ -614,8 +615,8 @@
verboseSourceCodeAccess
verboseSourceCodeAccess isNil ifTrue:[
- verboseSourceCodeAccess := false asValue.
- verboseSourceCodeAccess onChangeSend:#updateModifiedChannel to:self
+ verboseSourceCodeAccess := false asValue.
+ verboseSourceCodeAccess onChangeSend:#updateModifiedChannel to:self
].
^ verboseSourceCodeAccess.
! !
@@ -634,45 +635,45 @@
nm isEmptyOrNil ifTrue:[^ self].
(fn := nm asFilename) exists ifFalse:[
- (self confirm:('SourceCache directory ''' , nm , ''' does not exist.\Create ?' withCRs)) ifTrue:[
- fn makeDirectory;
- makeReadableForAll;
- makeWritableForAll;
- makeExecutableForAll.
- ] ifFalse:[
- self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
- ^ self.
- ].
+ (self confirm:('SourceCache directory ''' , nm , ''' does not exist.\Create ?' withCRs)) ifTrue:[
+ fn makeDirectory;
+ makeReadableForAll;
+ makeWritableForAll;
+ makeExecutableForAll.
+ ] ifFalse:[
+ self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
+ ^ self.
+ ].
].
(fn isDirectory
and:[fn isReadable
and:[fn isWritable]]) ifTrue:[
- AbstractSourceCodeManager cacheDirectoryName:nm.
+ AbstractSourceCodeManager cacheDirectoryName:nm.
] ifFalse:[
- self warn:'Invalid sourceCache directory.'.
- self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
+ self warn:'Invalid sourceCache directory.'.
+ self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
].
!
-update:something with:aParameter from:changedObject
- "/ common
+update:something with:aParameter from:changedObject
+ "/ common
changedObject == sourceCacheDir ifTrue:[
- self sourceDirChanged.
- self updateModifiedChannel.
- ^ self
+ self sourceDirChanged.
+ self updateModifiedChannel.
+ ^ self
].
changedObject == selectedPerModuleRoot ifTrue:[
- self selectedPerModuleRootChanged.
- ^ self
+ self selectedPerModuleRootChanged.
+ ^ self
].
changedObject == self listOfModules ifTrue:[
- self updateModifiedChannel.
+ self updateModifiedChannel.
].
changedObject == defaultSettingsHolder ifTrue:[
- self updateModifiedChannel.
+ self updateModifiedChannel.
].
@@ -687,21 +688,21 @@
|userPassAndHost sel|
userPassAndHost := self getStoreElementsFromSettingsString:self defaultSettingsHolder value.
- self storeConnectEnabled
- value:(userPassAndHost first notEmptyOrNil
- and:[ userPassAndHost second notEmptyOrNil
- and:[ userPassAndHost third notEmptyOrNil ]]).
+ self storeConnectEnabled
+ value:(userPassAndHost first notEmptyOrNil
+ and:[ userPassAndHost second notEmptyOrNil
+ and:[ userPassAndHost third notEmptyOrNil ]]).
sel := self selectedPerModuleRoot value.
sel notEmptyOrNil ifTrue:[
- (sel managerClass = StoreSourceCodeManager) ifTrue:[
- userPassAndHost := self getStoreElementsFromSettingsString:sel settings.
- self storeConnectInModuleEnabled
- value:(userPassAndHost first notEmptyOrNil
- and:[ userPassAndHost second notEmptyOrNil
- and:[ userPassAndHost third notEmptyOrNil ]]).
- ^ self.
- ].
+ (sel managerClass = StoreSourceCodeManager) ifTrue:[
+ userPassAndHost := self getStoreElementsFromSettingsString:sel settings.
+ self storeConnectInModuleEnabled
+ value:(userPassAndHost first notEmptyOrNil
+ and:[ userPassAndHost second notEmptyOrNil
+ and:[ userPassAndHost third notEmptyOrNil ]]).
+ ^ self.
+ ].
].
! !
@@ -739,7 +740,6 @@
client := self defaultSettingsHolder value.
client notNil ifTrue:[
settings := PerforceSourceCodeManager getPerforceSettingsFromString:client.
-self halt.
PerforceSourceCodeManager perforceClient ~= (settings at:#client ifAbsent:nil) ifTrue:[
^ true
].
@@ -758,6 +758,9 @@
self listOfModules do:[:aModuleManager|
repositoryInfoPerModule at:aModuleManager module put:aModuleManager settings.
].
+ PerforceSourceCodeManager verboseSourceCodeAccess ~= self verboseSourceCodeAccess value ifTrue:[
+ ^true
+ ].
PerforceSourceCodeManager repositoryInfoPerModule keysAndValuesDo:[:module :info |
((repositoryInfoPerModule includesKey:module) and:[info = (repositoryInfoPerModule at:module)])
@@ -767,10 +770,10 @@
((PerforceSourceCodeManager repositoryInfoPerModule includesKey:module) and:[(PerforceSourceCodeManager repositoryInfoPerModule at:module) = info])
ifFalse:[^ true].
].
-
+
^ false
- "Modified: / 09-11-2006 / 14:49:14 / cg"
+ "Modified: / 19-04-2011 / 10:54:31 / cg"
!
repositoryInfoPerModuleFor:sourceCodeManager
@@ -779,7 +782,7 @@
repositoryInfoPerModule := Dictionary new.
self listOfModules do:[:aModuleManager|
- repositoryInfoPerModule at:aModuleManager module put:aModuleManager settings.
+ repositoryInfoPerModule at:aModuleManager module put:aModuleManager settings.
].
^ repositoryInfoPerModule
! !
@@ -859,7 +862,7 @@
model: moduleHolder
acceptChannel: acceptChannel
acceptOnPointerLeave: true
- extent: (Point 463 22)
+ extent: (Point 465 22)
)
)
@@ -901,12 +904,12 @@
)
extent: (Point 180 35)
)
- (ComboListSpec
- name: 'ComboList1'
+ (ComboBoxSpec
+ name: 'ComboBox1'
model: settingsHolder
+ acceptOnPointerLeave: false
comboList: defaultSettingsPrototypeList
- useIndex: false
- extent: (Point 463 20)
+ extent: (Point 465 20)
)
)
@@ -961,7 +964,7 @@
defaultSettingsPrototypeList
defaultSettingsPrototypeList isNil ifTrue:[
- defaultSettingsPrototypeList := sourceCodeManagementSettingsApp perforcePrototypeList.
+ defaultSettingsPrototypeList := sourceCodeManagementSettingsApp perforcePrototypeList.
].
^ defaultSettingsPrototypeList.
!
@@ -987,7 +990,7 @@
"*** (and replace this comment by something more useful ;-)"
acceptChannel isNil ifTrue:[
- acceptChannel := TriggerValue new.
+ acceptChannel := TriggerValue new.
].
^ acceptChannel.
!
@@ -1003,7 +1006,7 @@
"*** (and replace this comment by something more useful ;-)"
acceptEnableChannel isNil ifTrue:[
- acceptEnableChannel := true asValue.
+ acceptEnableChannel := true asValue.
"/ if your app needs to be notified of changes, uncomment one of the lines below:
"/ acceptEnableChannel addDependent:self.
"/ acceptEnableChannel onChangeSend:#acceptEnableChannelChanged to:self.
@@ -1022,9 +1025,9 @@
"*** (and replace this comment by something more useful ;-)"
moduleHolder isNil ifTrue:[
- moduleHolder := ValueHolder new.
+ moduleHolder := ValueHolder new.
"/ if your app needs to be notified of changes, uncomment one of the lines below:
- moduleHolder addDependent:self.
+ moduleHolder addDependent:self.
"/ moduleHolder onChangeSend:#moduleHolderChanged to:self.
].
^ moduleHolder.
@@ -1041,7 +1044,7 @@
"*** (and replace this comment by something more useful ;-)"
settingsHolder isNil ifTrue:[
- settingsHolder := ValueHolder new.
+ settingsHolder := ValueHolder new.
"/ if your app needs to be notified of changes, uncomment one of the lines below:
"/ settingsHolder addDependent:self.
"/ settingsHolder onChangeSend:#settingsHolderChanged to:self.
@@ -1060,7 +1063,7 @@
postBuildWith:aBuilder
"This is a hook method generated by the Browser.
It will be invoked during the initialization of your app/dialog,
- after all of the visual components have been built,
+ after all of the visual components have been built,
but BEFORE the top window is made visible.
Add any app-specific actions here (reading files, setting up values etc.)
See also #postOpenWith:, which is invoked after opening."
@@ -1129,5 +1132,5 @@
!P4SourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.1 2011-04-19 08:29:32 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.2 2011-04-19 09:08:39 cg Exp $'
! !