#UI_ENHANCEMENT by cg
class: Tools::NewSystemBrowser
changed: #checkOutClasses:askForRevision:usingManager:
better error dialog
--- a/Tools__NewSystemBrowser.st Mon Jun 12 13:16:30 2017 +0200
+++ b/Tools__NewSystemBrowser.st Tue Jun 13 09:04:46 2017 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2000 by eXept Software AG
All Rights Reserved
@@ -35438,24 +35436,34 @@
nonMetaDo:
[:cls |
- UserInformation handle:[:ex |
- classes size > 1 ifTrue:[
- Transcript showCR:ex description.
- ] ifFalse:[
- (Dialog confirm:ex description noLabel:'Cancel') ifFalse:[
- AbortSignal raise
- ].
+ SourceCodeManagerError handle:[:ex |
+ (Dialog confirm:(resources
+ stringWithCRs:'Error during SCM-ceckout:\\%1\\Proceed ?'
+ with:ex description)
+ ) ifFalse:[
+ AbortAllSignal raise
].
ex proceed.
] do:[
- self withActivityNotificationsRedirectedToInfoLabelDo:[
- utilities
- checkoutClass:cls
- askForRevision:askForRevision
- askForMerge:true
- askForConfirmation:false.
- ].
- alreadyCheckedOut add:cls.
+ UserInformation handle:[:ex |
+ classes size > 1 ifTrue:[
+ Transcript showCR:ex description.
+ ] ifFalse:[
+ (Dialog confirm:ex description noLabel:'Cancel') ifFalse:[
+ AbortSignal raise
+ ].
+ ].
+ ex proceed.
+ ] do:[
+ self withActivityNotificationsRedirectedToInfoLabelDo:[
+ utilities
+ checkoutClass:cls
+ askForRevision:askForRevision
+ askForMerge:true
+ askForConfirmation:false.
+ ].
+ alreadyCheckedOut add:cls.
+ ]
]
]
ifUnloaded:
@@ -35490,6 +35498,7 @@
"Created: / 11-10-2011 / 23:11:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 21-12-2011 / 20:15:33 / cg"
+ "Modified: / 13-06-2017 / 08:52:58 / cg"
!
classMenuBrowseAllVersionsInRepository
@@ -47589,7 +47598,7 @@
self activityNotification:nil.
browser := (UserPreferences current changeSetBrowserClass) openOn:previousMethods.
- browser window label:(resources string:'Revisions of %1 » %2' with:mclass name with:mselector).
+ browser window label:(resources string:'Revisions of %1 » %2' with:mclass name with:mselector).
browser readOnly:true.
].
@@ -52204,7 +52213,7 @@
label:[:chg |
|lbl|
"/ lbl := chg printString
- lbl := (chg className ? '???') , ' » ' , (chg selector ? '???') allBold.
+ lbl := (chg className ? '???') , ' » ' , (chg selector ? '???') allBold.
(chg isMethodChange and:[chg changeMethod isNil]) ifTrue:[
lbl := lbl asText allStrikedOut,' ','(removed)' allItalic.
].
@@ -59702,6 +59711,7 @@
^ selectorCompletion
! !
+
!NewSystemBrowser methodsFor:'private-semantic checks'!
checkAcceptedMethod:aMethod inClass:aClass