changed:
#addRepositoryAction
#hasUnsavedChanges
#mcRepositories
#removeRepositoryAction
--- a/MCSettingsApp.st Sun Jan 15 15:28:19 2012 +0100
+++ b/MCSettingsApp.st Tue Jan 24 01:06:45 2012 +0100
@@ -462,12 +462,12 @@
dialog accepted ifFalse:[^self].
repo := Compiler evaluate: codeHolder value.
self mcRepositories value add: repo.
- self mcRepositories changed.
+ self updateModifiedChannel
"Created: / 26-05-2008 / 12:04:30 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 16-08-2009 / 17:24:17 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 16-09-2010 / 14:33:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 01-12-2011 / 20:31:10 / cg"
+ "Modified: / 23-01-2012 / 23:55:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
defineAsPrimaryRepositoryAction
@@ -494,11 +494,12 @@
removeRepositoryAction
self repositoryConfiguration notNil ifTrue:[
self repositoryConfigurationList remove: self repositoryConfiguration.
- self mcRepositories changed.
+ self updateModifiedChannel
].
"Created: / 26-05-2008 / 12:04:10 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 01-12-2011 / 20:50:08 / cg"
+ "Modified: / 23-01-2012 / 23:55:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MCSettingsApp methodsFor:'aspects'!
@@ -528,10 +529,11 @@
mcRepositories
- ^self settingsAspectFor: #mcRepositories default:nil
+ ^self settingsAspectFor: #mcRepositories default: OrderedCollection new
"Created: / 16-09-2010 / 14:14:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 01-12-2011 / 20:08:34 / cg"
+ "Modified: / 23-01-2012 / 23:59:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selectedRepositoryHolder
@@ -616,12 +618,16 @@
(self
hasChangedAspectIn: #(mcRepositories)
asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ ] ifFalse:[
+ self mcRepositories value notEmptyOrNil ifTrue:[^ true]
].
"/ special case, because default value of false is not ok here !!
(currentUserPrefs includesKey:#mcPrimaryRepository) ifTrue:[
(self
hasChangedAspectIn: #(mcPrimaryRepository)
asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ ] ifFalse:[
+ self mcRepositories value notNil ifTrue:[^ true]
].
^ self
hasChangedAspectIn: #(mcEnabled)
@@ -629,18 +635,18 @@
"Created: / 28-05-2008 / 07:33:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 19-08-2009 / 12:07:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 16-09-2010 / 14:17:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 01-12-2011 / 20:27:34 / cg"
+ "Modified: / 23-01-2012 / 23:57:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!MCSettingsApp class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCSettingsApp.st,v 1.8 2012-01-15 09:35:36 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCSettingsApp.st,v 1.9 2012-01-24 00:06:45 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCSettingsApp.st,v 1.8 2012-01-15 09:35:36 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCSettingsApp.st,v 1.9 2012-01-24 00:06:45 vrany Exp $'
!
version_SVN