--- a/MCCommitDialog.st Thu Nov 03 13:22:28 2016 +0100
+++ b/MCCommitDialog.st Tue Jan 16 22:24:00 2018 +0100
@@ -15,7 +15,7 @@
!MCCommitDialog class methodsFor:'help specs'!
-flyByHelpSpec
+helpSpec
"This resource specification was automatically generated
by the UIHelpTool of ST/X."
@@ -23,12 +23,12 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:MCCommitDialog
+ UIHelpTool openOnClass:MCCommitDialog
"
<resource: #help>
- ^ super flyByHelpSpec addPairsFrom:#(
+ ^ super helpSpec addPairsFrom:#(
#commitMessage
'A log message describing this version (your changes)'
@@ -69,82 +69,82 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
- name: contentSpec
- window:
+ name: contentSpec
+ window:
(WindowSpec
- label: 'Commit Dialog'
- name: 'Commit Dialog'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 555 303)
- )
- component:
+ label: 'Commit Dialog'
+ name: 'Commit Dialog'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 555 303)
+ )
+ component:
(SpecCollection
- collection: (
- (LabelSpec
- label: 'Repository:'
- name: 'Label1'
- layout: (LayoutFrame 3 0 4 0 94 0 26 0)
- activeHelpKey: repository
- translateLabel: true
- adjust: left
- )
- (ComboListSpec
- name: 'RepositoryList'
- layout: (LayoutFrame 101 0 0 0 0 1 25 0)
- activeHelpKey: repository
- model: repositoryHolder
- comboList: repositoryList
- useIndex: false
- )
- (LabelSpec
- label: 'Version:'
- name: 'Label2'
- layout: (LayoutFrame 3 0 30 0 94 0 52 0)
- activeHelpKey: versionName
- translateLabel: true
- adjust: left
- )
- (InputFieldSpec
- name: 'VersionName'
- layout: (LayoutFrame 101 0 30 0 0 1 55 0)
- activeHelpKey: versionName
- model: versionNameHolder
- immediateAccept: true
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnPointerLeave: true
- )
- (CheckBoxSpec
- label: 'Include ST/X Support Files'
- name: 'CheckBox1'
- layout: (LayoutFrame 96 0 63 0 232 1 85 0)
- activeHelpKey: includeExtrasForSTX
- model: includeExtrasForSTX
- translateLabel: true
- )
- (CheckBoxSpec
- label: 'Clear Change Set'
- name: 'CheckBox2'
- layout: (LayoutFrame 96 0 90 0 232 1 112 0)
- activeHelpKey: clearChangeSet
- model: clearChangeSet
- translateLabel: true
- )
- (TextEditorSpec
- name: 'CommitMessage'
- layout: (LayoutFrame 0 0 120 0 0 1 0 1)
- activeHelpKey: commitMessage
- model: messageHolder
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- hasKeyboardFocusInitially: false
- postBuildCallback: postBuildMessageView:
- )
- )
-
- )
+ collection: (
+ (LabelSpec
+ label: 'Repository:'
+ name: 'Label1'
+ layout: (LayoutFrame 3 0 4 0 94 0 26 0)
+ activeHelpKey: repository
+ translateLabel: true
+ adjust: left
+ )
+ (ComboListSpec
+ name: 'RepositoryList'
+ layout: (LayoutFrame 101 0 0 0 0 1 25 0)
+ activeHelpKey: repository
+ model: repositoryHolder
+ comboList: repositoryList
+ useIndex: false
+ )
+ (LabelSpec
+ label: 'Version:'
+ name: 'Label2'
+ layout: (LayoutFrame 3 0 30 0 94 0 52 0)
+ activeHelpKey: versionName
+ translateLabel: true
+ adjust: left
+ )
+ (InputFieldSpec
+ name: 'VersionName'
+ layout: (LayoutFrame 101 0 30 0 0 1 55 0)
+ activeHelpKey: versionName
+ model: versionNameHolder
+ immediateAccept: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnPointerLeave: true
+ )
+ (CheckBoxSpec
+ label: 'Include ST/X Support Files'
+ name: 'CheckBox1'
+ layout: (LayoutFrame 96 0 63 0 232 1 85 0)
+ activeHelpKey: includeExtrasForSTX
+ model: includeExtrasForSTX
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Clear Change Set'
+ name: 'CheckBox2'
+ layout: (LayoutFrame 96 0 90 0 232 1 112 0)
+ activeHelpKey: clearChangeSet
+ model: clearChangeSet
+ translateLabel: true
+ )
+ (TextEditorSpec
+ name: 'CommitMessage'
+ layout: (LayoutFrame 0 0 120 0 0 1 0 1)
+ activeHelpKey: commitMessage
+ model: messageHolder
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ hasKeyboardFocusInitially: false
+ postBuildCallback: postBuildMessageView:
+ )
+ )
+
+ )
)
! !
@@ -174,52 +174,52 @@
self acceptEnabled ifFalse:[^self].
self withWaitCursorDo:[
- |workingCopy version repository clearChangeSet
- newVersionString stxPackageID defClass|
+ |workingCopy version repository clearChangeSet
+ newVersionString stxPackageID defClass|
- workingCopy := self workingCopyHolder value.
- repository := self repositoryHolder value.
- LastRepository := repository.
- DefaultForIncludeSTXExtras := clearChangeSet := self clearChangeSet value.
+ workingCopy := self workingCopyHolder value.
+ repository := self repositoryHolder value.
+ LastRepository := repository.
+ DefaultForIncludeSTXExtras := clearChangeSet := self clearChangeSet value.
- [
- version := workingCopy newVersion
- ] on: MCVersionNameAndMessageRequest do:[:n |
- n resume: (Array with: self versionNameHolder value
- with: messageView contents asText string)
- ].
+ [
+ version := workingCopy newVersion
+ ] on: MCVersionNameAndMessageRequest do:[:n |
+ n resume: (Array with: self versionNameHolder value
+ with: messageView contents asText string)
+ ].
- stxPackageID := version package name.
- defClass := ProjectDefinition definitionClassForPackage:stxPackageID.
- newVersionString := MCSourceCodeManager revisionStringForVersion:version.
+ stxPackageID := version package name.
+ defClass := ProjectDefinition definitionClassForPackage:stxPackageID.
+ newVersionString := MCSourceCodeManager revisionStringForVersion:version.
- "/ update all project classes version_MC
- defClass allClasses do:[:cls |
- MCSourceCodeManager
- updateVersionMethod:(MCSourceCodeManager nameOfVersionMethodInClasses)
- of:cls
- for:newVersionString.
- ].
+ "/ update all project classes version_MC
+ defClass allClasses do:[:cls |
+ MCSourceCodeManager
+ updateVersionMethod:(MCSourceCodeManager nameOfVersionMethodInClasses)
+ of:cls
+ for:newVersionString.
+ ].
- "/ update the project definition classes version_MC
- MCSourceCodeManager
- updateVersionMethod:(MCSourceCodeManager nameOfVersionMethodInClasses)
- of:defClass
- for:newVersionString.
- MCSourceCodeManager
- updateVersionMethod:(MCSourceCodeManager nameOfVersionMethodForExtensions)
- of:defClass
- for:newVersionString.
+ "/ update the project definition classes version_MC
+ MCSourceCodeManager
+ updateVersionMethod:(MCSourceCodeManager nameOfVersionMethodInClasses)
+ of:defClass
+ for:newVersionString.
+ MCSourceCodeManager
+ updateVersionMethod:(MCSourceCodeManager nameOfVersionMethodForExtensions)
+ of:defClass
+ for:newVersionString.
- "/ sigh: make a new snapshot (now with updated version methods)
- version snapshot:version package snapshot.
- version cachable:false. "/ force new a write (otherwise, the mcz is not rewritten)
- version snapshot includeExtrasForSTX:(DefaultForIncludeSTXExtras := self includeExtrasForSTX value).
- repository storeVersion: version.
+ "/ sigh: make a new snapshot (now with updated version methods)
+ version snapshot:version package snapshot.
+ version cachable:false. "/ force new a write (otherwise, the mcz is not rewritten)
+ version snapshot includeExtrasForSTX:(DefaultForIncludeSTXExtras := self includeExtrasForSTX value).
+ repository storeVersion: version.
- clearChangeSet ifTrue:[
- ChangeSet current condenseChangesForPackage:stxPackageID
- ].
+ clearChangeSet ifTrue:[
+ ChangeSet current condenseChangesForPackage:stxPackageID
+ ].
].
super doAccept.
@@ -231,14 +231,14 @@
clearChangeSet
clearChangeSet isNil ifTrue:[
- clearChangeSet := (DefaultForClearChangeSet ? true) asValue.
+ clearChangeSet := (DefaultForClearChangeSet ? true) asValue.
].
^ clearChangeSet
!
includeExtrasForSTX
includeExtrasForSTX isNil ifTrue:[
- includeExtrasForSTX := (DefaultForIncludeSTXExtras ? true) asValue.
+ includeExtrasForSTX := (DefaultForIncludeSTXExtras ? true) asValue.
].
^ includeExtrasForSTX
!
@@ -247,8 +247,8 @@
"return/create the 'messageHolder' value holder (automatically generated)"
messageHolder isNil ifTrue:[
- messageHolder := ValueHolder with: ('Commit message' asText colorizeAllWith: Color gray).
- messageHolder addDependent:self.
+ messageHolder := ValueHolder with: ('Commit message' asText colorizeAllWith: Color gray).
+ messageHolder addDependent:self.
].
^ messageHolder
@@ -261,16 +261,16 @@
|oldValue newValue|
messageHolder notNil ifTrue:[
- oldValue := messageHolder value.
- messageHolder removeDependent:self.
+ oldValue := messageHolder value.
+ messageHolder removeDependent:self.
].
messageHolder := something.
messageHolder notNil ifTrue:[
- messageHolder addDependent:self.
+ messageHolder addDependent:self.
].
newValue := messageHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:messageHolder.
+ self update:#value with:newValue from:messageHolder.
].
!
@@ -280,11 +280,11 @@
^
(Array new: MCRepositoryGroup default repositories size)
- , (Array
- with:nil
- with:#addRepository
- with:#addDirectoryRepository
- )
+ , (Array
+ with:nil
+ with:#addRepository
+ with:#addDirectoryRepository
+ )
!
repositoryHolder
@@ -293,13 +293,13 @@
|initial|
repositoryHolder isNil ifTrue:[
- repositoryHolder := ValueHolder new.
- initial := LastRepository.
- initial isNil ifTrue:[
- initial := UserPreferences current at:#mcPrimaryRepository ifAbsent:nil.
- ].
- repositoryHolder value:initial.
- repositoryHolder addDependent:self.
+ repositoryHolder := ValueHolder new.
+ initial := LastRepository.
+ initial isNil ifTrue:[
+ initial := UserPreferences current at:#mcPrimaryRepository ifAbsent:nil.
+ ].
+ repositoryHolder value:initial.
+ repositoryHolder addDependent:self.
].
^ repositoryHolder
@@ -312,16 +312,16 @@
|oldValue newValue|
repositoryHolder notNil ifTrue:[
- oldValue := repositoryHolder value.
- repositoryHolder removeDependent:self.
+ oldValue := repositoryHolder value.
+ repositoryHolder removeDependent:self.
].
repositoryHolder := something.
repositoryHolder notNil ifTrue:[
- repositoryHolder addDependent:self.
+ repositoryHolder addDependent:self.
].
newValue := repositoryHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:repositoryHolder.
+ self update:#value with:newValue from:repositoryHolder.
].
!
@@ -329,11 +329,11 @@
^[
MCRepositoryGroup default repositories
- , (Array
- with:nil
- with:(resources string:'Open MC Repository Dialog...')
- with:(resources string:'Add Directory Repository...')
- )
+ , (Array
+ with:nil
+ with:(resources string:'Open MC Repository Dialog...')
+ with:(resources string:'Add Directory Repository...')
+ )
]
"Created: / 14-09-2010 / 23:16:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -344,8 +344,8 @@
"return/create the 'versionNameHolder' value holder (automatically generated)"
versionNameHolder isNil ifTrue:[
- versionNameHolder := ValueHolder new.
- versionNameHolder addDependent:self.
+ versionNameHolder := ValueHolder new.
+ versionNameHolder addDependent:self.
].
^ versionNameHolder
!
@@ -356,16 +356,16 @@
|oldValue newValue|
versionNameHolder notNil ifTrue:[
- oldValue := versionNameHolder value.
- versionNameHolder removeDependent:self.
+ oldValue := versionNameHolder value.
+ versionNameHolder removeDependent:self.
].
versionNameHolder := something.
versionNameHolder notNil ifTrue:[
- versionNameHolder addDependent:self.
+ versionNameHolder addDependent:self.
].
newValue := versionNameHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:versionNameHolder.
+ self update:#value with:newValue from:versionNameHolder.
].
!
@@ -373,8 +373,8 @@
"return/create the 'workingCopyHolder' value holder (automatically generated)"
workingCopyHolder isNil ifTrue:[
- workingCopyHolder := ValueHolder new.
- workingCopyHolder addDependent:self.
+ workingCopyHolder := ValueHolder new.
+ workingCopyHolder addDependent:self.
].
^ workingCopyHolder
!
@@ -385,16 +385,16 @@
|oldValue newValue|
workingCopyHolder notNil ifTrue:[
- oldValue := workingCopyHolder value.
- workingCopyHolder removeDependent:self.
+ oldValue := workingCopyHolder value.
+ workingCopyHolder removeDependent:self.
].
workingCopyHolder := something.
workingCopyHolder notNil ifTrue:[
- workingCopyHolder addDependent:self.
+ workingCopyHolder addDependent:self.
].
newValue := workingCopyHolder value.
oldValue ~~ newValue ifTrue:[
- self update:#value with:newValue from:workingCopyHolder.
+ self update:#value with:newValue from:workingCopyHolder.
].
! !
@@ -408,16 +408,16 @@
repo := MCDirectoryRepository directory:dir.
MCRepositoryGroup default addRepository:repo.
- self repositoryHolder
- value:repo
- withoutNotifying:self.
+ self repositoryHolder
+ value:repo
+ withoutNotifying:self.
!
addRepository
MCSettingsApp open.
- self repositoryHolder
- value:(self repositoryList value first)
- withoutNotifying:self.
+ self repositoryHolder
+ value:(self repositoryList value first)
+ withoutNotifying:self.
!
findUniqueVersionNumber
@@ -430,10 +430,10 @@
self subtitle: wc package name.
versionName := wc uniqueVersionName.
- self
- enqueueMessage:#updateVersionNumberTo:
- for:self
- arguments: { versionName }
+ self
+ enqueueMessage:#updateVersionNumberTo:
+ for:self
+ arguments: { versionName }
"Created: / 31-08-2012 / 11:49:56 / cg"
!
@@ -450,8 +450,8 @@
selIndex := self repositoryList value indexOf:self repositoryHolder value.
action := self repositoryActionList at:selIndex.
- action notNil ifTrue:[
- self perform:action.
+ action notNil ifTrue:[
+ self perform:action.
].
self updateAcceptEnabled
@@ -465,17 +465,17 @@
"stub code automatically generated - please change as required"
changedObject == workingCopyHolder ifTrue:[
- self workingCopyChanged.
- ^ self.
+ self workingCopyChanged.
+ ^ self.
].
changedObject == messageHolder ifTrue:[
- self messageChanged.
- ^ self.
+ self messageChanged.
+ ^ self.
].
changedObject == repositoryHolder ifTrue:[
- self repositoryChanged.
- ^ self.
+ self repositoryChanged.
+ ^ self.
].
super update:something with:aParameter from:changedObject
@@ -506,21 +506,21 @@
|p|
self window isNil ifTrue:[
- versionNameFinderProcess isNil ifTrue:[
- versionNameFinderProcess :=
- [
- self findUniqueVersionNumber.
- ] fork.
- ].
- ^ self.
+ versionNameFinderProcess isNil ifTrue:[
+ versionNameFinderProcess :=
+ [
+ self findUniqueVersionNumber.
+ ] fork.
+ ].
+ ^ self.
].
(self workingCopyHolder value) notNil ifTrue:[
- (p := versionNameFinderProcess) notNil ifTrue:[
- versionNameFinderProcess := nil.
- p terminateAndWait.
- ].
- self findUniqueVersionNumber.
+ (p := versionNameFinderProcess) notNil ifTrue:[
+ versionNameFinderProcess := nil.
+ p terminateAndWait.
+ ].
+ self findUniqueVersionNumber.
].
"Created: / 15-09-2010 / 09:30:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -540,11 +540,11 @@
!MCCommitDialog class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCCommitDialog.st,v 1.13 2015-02-25 00:12:38 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCCommitDialog.st,v 1.13 2015-02-25 00:12:38 cg Exp $'
+ ^ '$Header$'
!
version_MC
@@ -552,6 +552,5 @@
!
version_SVN
- ^ '$Id: MCCommitDialog.st,v 1.13 2015-02-25 00:12:38 cg Exp $'
+ ^ '$Id$'
! !
-