Fix in Tools::NewSystemBrowser>>#classMenuRename
Do not ask for container removal for non-container based (i.e., snapshot) based
source code managers. Containers will be (should be) removed upon next commit.
SVN & HG behaves that way.
--- a/Tools__NewSystemBrowser.st Tue Aug 12 14:18:12 2014 +0200
+++ b/Tools__NewSystemBrowser.st Tue Aug 12 14:22:13 2014 +0200
@@ -19358,6 +19358,7 @@
! !
+
!NewSystemBrowser methodsFor:'aspects-organization'!
categoryMenuVisible
@@ -23076,6 +23077,7 @@
^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
! !
+
!NewSystemBrowser methodsFor:'binding access'!
menuFor:key
@@ -31287,18 +31289,23 @@
askForNewContainer := false.
"/ check if the class has a repository container - warn about this if so
currentClass isPrivate ifFalse:[
- currentClass revision notNil ifTrue:[
- (Dialog
- confirm:(resources string:'Remove the (old) source container for ''%1'' in the repository ?' with:oldSym allBold)
- initialAnswer:false)
- ifTrue:[
- (SourceCodeManagerUtilities sourceCodeManagerFor:currentClass) utilities
- removeSourceContainerForClass:currentClass
- confirm:false
- warn:true.
- askForNewContainer := true.
- ].
- ]
+ | mgr |
+
+ mgr := SourceCodeManagerUtilities sourceCodeManagerFor:currentClass.
+ mgr isContainerBased ifTrue:[
+ currentClass revision notNil ifTrue:[
+ (Dialog
+ confirm:(resources string:'Remove the (old) source container for ''%1'' in the repository ?' with:oldSym allBold)
+ initialAnswer:false)
+ ifTrue:[
+ mgr utilities
+ removeSourceContainerForClass:currentClass
+ confirm:false
+ warn:true.
+ askForNewContainer := true.
+ ].
+ ].
+ ].
].
self busyLabel:('Searching for references to ' , oldSym).
@@ -31384,7 +31391,7 @@
].
"Modified: / 01-06-2012 / 10:30:08 / cg"
- "Modified: / 17-03-2014 / 19:44:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 12-08-2014 / 12:28:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
classMenuRewrite
@@ -48538,6 +48545,7 @@
"Modified: / 28-02-2012 / 16:48:38 / cg"
! !
+
!NewSystemBrowser methodsFor:'menu actions-variables'!
browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -49996,6 +50004,7 @@
"Modified: / 24-02-2014 / 22:44:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!NewSystemBrowser methodsFor:'menus-dynamic'!
boockmarksMenu
@@ -56576,6 +56585,7 @@
^ navigationState projectListApplication
! !
+
!NewSystemBrowser methodsFor:'private-history'!
lastSearchPatterns
@@ -57362,6 +57372,7 @@
"Created: / 04-12-2011 / 22:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!NewSystemBrowser methodsFor:'private-semantic checks'!
checkAcceptedMethod:aMethod inClass:aClass
@@ -61857,11 +61868,11 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2101 2014-08-02 12:53:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2102 2014-08-12 12:22:13 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2101 2014-08-02 12:53:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.2102 2014-08-12 12:22:13 vrany Exp $'
!
version_HG
@@ -61870,7 +61881,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st,v 1.2101 2014-08-02 12:53:46 cg Exp $'
+ ^ '$Id: Tools__NewSystemBrowser.st,v 1.2102 2014-08-12 12:22:13 vrany Exp $'
! !