--- a/extensions.st Thu Oct 08 14:05:26 2009 +0200
+++ b/extensions.st Fri Oct 09 09:46:33 2009 +0200
@@ -392,10 +392,10 @@
are.
"
- ^self isForMeta
- and:[((self selector) == #version)
- or:[self selector startsWith:'version_' ]
- ]
+ ^self isForMeta
+ and:[((self selector) == #version)
+ or:[self selector startsWith:'version_' ]
+ ]
"Created: / 17-08-2009 / 18:56:59 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
@@ -593,23 +593,23 @@
cls := self theSingleSelectedClass theNonMetaclass.
branch := cls theNonMetaclass svnRepository branch.
SVN::ProgressDialog
- openOn:[diffSet := branch diffSetForClass: cls betweenImageAndRevision: revision]
- title: 'Creating diffset for class ', cls fullName asText allItalic
- subtitle:
- ('Package: ' , branch package asText allItalic ,
- ' Revision ' , revision asString).
+ openOn:[diffSet := branch diffSetForClass: cls betweenImageAndRevision: revision]
+ title: 'Creating diffset for class ', cls fullName asText allItalic
+ subtitle:
+ ('Package: ' , branch package asText allItalic ,
+ ' Revision ' , revision asString).
smalltalkDiffToolClass := Smalltalk classNamed:#'Tools::SmalltalkDiffTool'.
tool := (smalltalkDiffToolClass notNil
- and:[smalltalkDiffToolClass isLoaded])
- ifTrue:[ smalltalkDiffToolClass ]
- ifFalse:[ VersionDiffBrowser ].
+ and:[smalltalkDiffToolClass isLoaded])
+ ifTrue:[ smalltalkDiffToolClass ]
+ ifFalse:[ VersionDiffBrowser ].
tool
- openOnDiffSet:diffSet
- labelA: 'Image'
- labelB: 'r',revision printString
- title: 'Differences of ',cls fullName,' between image and revision ',revision printString.
+ openOnDiffSet:diffSet
+ labelA: 'Image'
+ labelB: 'r',revision printString
+ title: 'Differences of ',cls fullName,' between image and revision ',revision printString.
"Created: / 19-04-2008 / 18:54:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 09-08-2009 / 14:14:37 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -641,50 +641,13 @@
!Tools::NewSystemBrowser methodsFor:'aspects-queries'!
-hasClassesSelectedAndSubversionRepositoryExists
-
- | classes |
- classes := self selectedClasses value.
- classes size = 0 ifTrue:[^false].
- ^classes
- allSatisfy:
- [:cls|self hasSubversionRepositoryFor: cls theNonMetaclass package]
-
- "Created: / 20-06-2009 / 12:10:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 21-06-2009 / 00:31:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 22-08-2009 / 11:19:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!Tools::NewSystemBrowser methodsFor:'aspects-queries'!
-
-hasProjectSelectedSubversionRepositoryExists
- ^ [ self hasProjectSelected
- and:[self selectedProjects value size = 1
- and:[self hasSubversionRepositoryFor: self selectedProjects value anyOne]]]
-
- "Created: / 31-03-2008 / 15:07:52 / janfrog"
-! !
-
-!Tools::NewSystemBrowser methodsFor:'aspects-queries'!
-
hasSingleClassAndSubversionRepositoryExists
^ self hasSingleClassSelected
- and:[self hasSubversionRepositoryFor: self theSingleSelectedClass package]
+ and:[self hasSubversionRepositoryFor: self theSingleSelectedClass package]
"Created: / 19-04-2008 / 17:40:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
-!Tools::NewSystemBrowser methodsFor:'aspects-queries'!
-
-hasSubversionRepositoryFor: package
-
- ^self hasSubversionSupport and:
- [SVN::RepositoryManager hasRepositoryForPackage: package]
-
- "Created: / 31-03-2008 / 15:08:13 / janfrog"
- "Modified: / 22-08-2009 / 10:49:33 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
!Tools::NewSystemBrowser methodsFor:'menus-dynamic'!
projectMenuSubversionBranches
@@ -782,23 +745,23 @@
pkg := self theSingleSelectedProject.
branch := (SVN::RepositoryManager repositoryForPackage: pkg) branch.
SVN::ProgressDialog
- openOn:[diffSet := branch diffSetForExtensionsBetweenImageAndRevision: revision.]
- title: 'Creating diffset for extensions'
- subtitle:
- ('Package: ' , branch package asText allItalic ,
- ' Revision ' , revision asString).
+ openOn:[diffSet := branch diffSetForExtensionsBetweenImageAndRevision: revision.]
+ title: 'Creating diffset for extensions'
+ subtitle:
+ ('Package: ' , branch package asText allItalic ,
+ ' Revision ' , revision asString).
smalltalkDiffToolClass := Smalltalk classNamed:#'Tools::SmalltalkDiffTool'.
tool := (smalltalkDiffToolClass notNil
- and:[smalltalkDiffToolClass isLoaded])
- ifTrue:[ smalltalkDiffToolClass ]
- ifFalse:[ VersionDiffBrowser ].
+ and:[smalltalkDiffToolClass isLoaded])
+ ifTrue:[ smalltalkDiffToolClass ]
+ ifFalse:[ VersionDiffBrowser ].
tool
- openOnDiffSet:diffSet
- labelA: 'Image'
- labelB: 'r',revision printString
- title: 'Differences of extensions for ',pkg,' between image and revision ',revision printString.
+ openOnDiffSet:diffSet
+ labelA: 'Image'
+ labelB: 'r',revision printString
+ title: 'Differences of extensions for ',pkg,' between image and revision ',revision printString.
"Created: / 19-04-2008 / 19:13:55 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 09-08-2009 / 14:14:15 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -827,23 +790,23 @@
pkg := self theSingleSelectedProject.
branch := (SVN::RepositoryManager repositoryForPackage: pkg) branch.
SVN::ProgressDialog
- openOn:[diffSet := branch diffSetBetweenImageAndRevision: revision]
- title: 'Creating diffset'
- subtitle:
- ('Package: ' , branch package asText allItalic ,
- ' Revision ' , revision asString).
+ openOn:[diffSet := branch diffSetBetweenImageAndRevision: revision]
+ title: 'Creating diffset'
+ subtitle:
+ ('Package: ' , branch package asText allItalic ,
+ ' Revision ' , revision asString).
smalltalkDiffToolClass := Smalltalk classNamed:#'Tools::SmalltalkDiffTool'.
tool := (smalltalkDiffToolClass notNil
- and:[smalltalkDiffToolClass isLoaded])
- ifTrue:[ smalltalkDiffToolClass ]
- ifFalse:[ VersionDiffBrowser ].
+ and:[smalltalkDiffToolClass isLoaded])
+ ifTrue:[ smalltalkDiffToolClass ]
+ ifFalse:[ VersionDiffBrowser ].
tool
- openOnDiffSet:diffSet
- labelA: 'Image'
- labelB: 'r',revision printString
- title: 'Differences for ',pkg,' between image and revision ',revision printString.
+ openOnDiffSet:diffSet
+ labelA: 'Image'
+ labelB: 'r',revision printString
+ title: 'Differences for ',pkg,' between image and revision ',revision printString.
"Created: / 20-05-2008 / 18:09:52 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 09-08-2009 / 14:14:10 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -906,25 +869,25 @@
pkg := self theSingleSelectedProject.
branch := (SVN::RepositoryManager repositoryForPackage: pkg) branch.
SVN::ProgressDialog
- openOn:[diffSet := branch diffSetBetweenImageAndRevision: revision]
- title: 'Creating diffset'
- subtitle:
- ('Package: ' , branch package asText allItalic ,
- ' Revision ' , revision asString).
+ openOn:[diffSet := branch diffSetBetweenImageAndRevision: revision]
+ title: 'Creating diffset'
+ subtitle:
+ ('Package: ' , branch package asText allItalic ,
+ ' Revision ' , revision asString).
smalltalkMergeToolClass := Smalltalk classNamed:#'Tools::SmalltalkMergeTool'.
(smalltalkMergeToolClass notNil
- and:[smalltalkMergeToolClass isLoaded]) not ifTrue:[
- Dialog warn: 'Merge is not possible. Tools::SmalltalkMergeTool class is not present'.
- ^ self.
+ and:[smalltalkMergeToolClass isLoaded]) not ifTrue:[
+ Dialog warn: 'Merge is not possible. Tools::SmalltalkMergeTool class is not present'.
+ ^ self.
].
smalltalkMergeToolClass
- openOnDiffSet:diffSet
- labelA: 'Image'
- labelB: 'r',revision printString
- title: 'Merge ',pkg,' revision ',revision printString, ' into image'
+ openOnDiffSet:diffSet
+ labelA: 'Image'
+ labelB: 'r',revision printString
+ title: 'Merge ',pkg,' revision ',revision printString, ' into image'
"Created: / 20-05-2008 / 23:44:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 09-08-2009 / 14:15:28 / Jan Vrany <vranyj1@fel.cvut.cz>"
@@ -1003,40 +966,40 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- label: 'Commit'
- itemValue: classMenuSubversionCommit
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
- )
- (MenuItem
- enabled: false
- label: 'Update'
- itemValue: classMenuSubversionUpdate
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' update 'Update')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Compare with revision HEAD'
- itemValue: classMenuSubversionCompareImageWithRevisionHead
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision HEAD')
- )
- (MenuItem
- label: 'Compare with revision'
- itemValue: classMenuSubversionCompareImageWithRevision
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision')
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ label: 'Commit'
+ itemValue: classMenuSubversionCommit
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
+ )
+ (MenuItem
+ enabled: false
+ label: 'Update'
+ itemValue: classMenuSubversionUpdate
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' update 'Update')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Compare with revision HEAD'
+ itemValue: classMenuSubversionCompareImageWithRevisionHead
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision HEAD')
+ )
+ (MenuItem
+ label: 'Compare with revision'
+ itemValue: classMenuSubversionCompareImageWithRevision
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision')
+ )
+ )
+ nil
+ nil
)
! !
@@ -1056,120 +1019,120 @@
<resource: #menu>
- ^
+ ^
#(Menu
- (
- (MenuItem
- enabled: false
- label: 'Branch'
- translateLabel: true
- submenuChannel: projectMenuSubversionBranches
- labelImage: (ResourceRetriever #'SVN::IconLibrary' checkout 'Branch')
- keepLinkedMenu: true
- )
- (MenuItem
- label: 'Commit'
- itemValue: projectMenuSubversionCommit
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
- )
- (MenuItem
- label: 'Update'
- itemValue: projectMenuSubversionUpdate
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' update 'Update')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Browse revision log'
- itemValue: projectMenuSubversionShowRevisionLog
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' log 'Browse revision log')
- )
- (MenuItem
- label: 'Browse working copy'
- itemValue: projectMenuSubversionBrowseWorkingCopy
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Compare with revision HEAD'
- itemValue: projectMenuSubversionCompareImageWithRevisionHEAD
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision HEAD')
- )
- (MenuItem
- label: 'Compare with revision'
- itemValue: projectMenuSubversionCompareImageWithRevision
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Merge with revision HEAD'
- itemValue: projectMenuSubversionMergeImageWithRevisionHEAD
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision HEAD')
- )
- (MenuItem
- label: 'Merge with revision'
- itemValue: projectMenuSubversionMergeImageWithRevision
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'More'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- label: 'Load revision...'
- itemValue: projectMenuSubversionLoadRevision
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- label: 'Remove working copy'
- itemValue: projectMenuSubversionRemoveWorkingCopy
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSingleProjectSelected
- label: 'Fast commit'
- translateLabel: true
- choice: projectMenuSubversionCommitMode
- choiceValue: fast
- )
- (MenuItem
- enabled: hasSingleProjectSelected
- label: 'Full commit'
- translateLabel: true
- choice: projectMenuSubversionCommitMode
- choiceValue: full
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
+ (
+ (MenuItem
+ enabled: false
+ label: 'Branch'
+ translateLabel: true
+ submenuChannel: projectMenuSubversionBranches
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' checkout 'Branch')
+ keepLinkedMenu: true
+ )
+ (MenuItem
+ label: 'Commit'
+ itemValue: projectMenuSubversionCommit
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
+ )
+ (MenuItem
+ label: 'Update'
+ itemValue: projectMenuSubversionUpdate
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' update 'Update')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Browse revision log'
+ itemValue: projectMenuSubversionShowRevisionLog
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' log 'Browse revision log')
+ )
+ (MenuItem
+ label: 'Browse working copy'
+ itemValue: projectMenuSubversionBrowseWorkingCopy
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Compare with revision HEAD'
+ itemValue: projectMenuSubversionCompareImageWithRevisionHEAD
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision HEAD')
+ )
+ (MenuItem
+ label: 'Compare with revision'
+ itemValue: projectMenuSubversionCompareImageWithRevision
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' compare 'Compare with revision')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Merge with revision HEAD'
+ itemValue: projectMenuSubversionMergeImageWithRevisionHEAD
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision HEAD')
+ )
+ (MenuItem
+ label: 'Merge with revision'
+ itemValue: projectMenuSubversionMergeImageWithRevision
+ translateLabel: true
+ labelImage: (ResourceRetriever #'SVN::IconLibrary' merge 'Merge with revision')
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'More'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Load revision...'
+ itemValue: projectMenuSubversionLoadRevision
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Remove working copy'
+ itemValue: projectMenuSubversionRemoveWorkingCopy
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasSingleProjectSelected
+ label: 'Fast commit'
+ translateLabel: true
+ choice: projectMenuSubversionCommitMode
+ choiceValue: fast
+ )
+ (MenuItem
+ enabled: hasSingleProjectSelected
+ label: 'Full commit'
+ translateLabel: true
+ choice: projectMenuSubversionCommitMode
+ choiceValue: full
+ )
+ )
+ nil
+ nil
+ )
+ )
+ )
+ nil
+ nil
)
! !
@@ -1221,4 +1184,3 @@
self size = 1 ifTrue:[^self first @ attributeName].
self error:'More than one element in node set'
! !
-