--- a/PerforceSourceCodeManagerUtilities.st Thu Aug 18 06:53:35 2016 +0200
+++ b/PerforceSourceCodeManagerUtilities.st Tue Aug 23 07:03:59 2016 +0200
@@ -2734,7 +2734,7 @@
"Modified: / 28-06-2016 / 07:54:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathesInRepository
+setSymbolicName:symbolicNameArg revision:rev overWrite:overWriteBool pathes:pathsInRepository
"set a symbolicName for revision rev.
If rev is nil, set it for the head (most recent) revision.
If rev is 0, delete the symbolic name.
@@ -2742,26 +2742,26 @@
If overWriteBool is false, an error will be raised if symbolicName has already been set.
If filename is nil, the symbolicName for a whole package is set.
- If multiple pathes are given, the revision MUST be nil."
+ If multiple paths are given, the revision MUST be nil."
|argumentString result errorStream moduleDirs symbolicName perforceCommand outputStream|
- symbolicName := (symbolicNameArg includes:Character space)
+ symbolicName := (symbolicNameArg includes:Character space)
ifTrue:[ '"',symbolicNameArg,'"' ]
ifFalse:[ symbolicNameArg ].
- pathesInRepository size > 1 ifTrue:[
- self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple pathes"
+ pathsInRepository size > 1 ifTrue:[
+ self assert:(rev isNil or:[rev == 0]) "revision must be nil (for head) or 0 (for delete) with multiple paths"
].
- moduleDirs := pathesInRepository
+ moduleDirs := pathsInRepository
collect:[:pathInRepository |
(pathInRepository asCollectionOfSubstringsSeparatedByAny:'/\') first.
].
moduleDirs do:[:moduleDir |
- |pathesInModule pathesInModuleAsArgument|
-
- pathesInModule := pathesInRepository
+ |pathsInModule pathsInModuleAsArgument|
+
+ pathsInModule := pathsInRepository
select:[:pathInRepository |
|moduleOfThisPath|
@@ -2778,7 +2778,7 @@
].
].
- pathesInModuleAsArgument := pathesInModule
+ pathsInModuleAsArgument := pathsInModule
collect:[:eachPath |
(eachPath includes:Character space) ifTrue:[
'"',eachPath,'"'
@@ -2786,20 +2786,20 @@
eachPath
].
].
- pathesInModuleAsArgument := pathesInModuleAsArgument asStringCollection asStringWith:Character space.
-
- self activityNotification:'setting symbolic name for: ', pathesInModuleAsArgument.
+ pathsInModuleAsArgument := pathsInModuleAsArgument asStringCollection asStringWith:Character space.
+
+ self activityNotification:'setting symbolic name for: ', pathsInModuleAsArgument.
self information:'Implementation not finished yet'.
^self.
- perforceCommand := ('label "' , pathesInRepository, '"').
+ perforceCommand := ('label "' , pathsInRepository, '"').
outputStream := ReadWriteStream on:''.
errorStream := ReadWriteStream on:''.
- result := self executePerforceCommand:perforceCommand inDirectory:self root
- inputFrom:nil outputTo:outputStream
+ result := self executePerforceCommand:perforceCommand inDirectory:self root
+ inputFrom:nil outputTo:outputStream
errorTo:errorStream
- logHeader:('set label ', pathesInRepository, '.').
+ logHeader:('set label ', pathsInRepository, '.').
result ifFalse:[
^ nil
].
@@ -2809,24 +2809,24 @@
self setSymbolicName:'stable' revision:nil overWrite:false path:'stx/libbasic/Array.st'
self setSymbolicName:'stable' revision:nil overWrite:true path:'stx/libbasic/Array.st'
- self
- setSymbolicName:'test1'
- revision:nil
- overWrite:true
+ self
+ setSymbolicName:'test1'
+ revision:nil
+ overWrite:true
path:'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
- self
- setSymbolicName:'test2'
- revision:nil
- overWrite:true
- pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
+ self
+ setSymbolicName:'test2'
+ revision:nil
+ overWrite:true
+ pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
- self
- setSymbolicName:'test2'
- revision:0
- overWrite:true
- pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
+ self
+ setSymbolicName:'test2'
+ revision:0
+ overWrite:true
+ pathes:#( 'bosch/dapasx/datenbasis/DAPASX__HierarchicalList.st'
'bosch/dapasx/datenbasis/DAPASX__ProjectSearch.st' )
"
--- a/Tools__NewSystemBrowser.st Thu Aug 18 06:53:35 2016 +0200
+++ b/Tools__NewSystemBrowser.st Tue Aug 23 07:03:59 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2000 by eXept Software AG
All Rights Reserved
@@ -43538,7 +43536,7 @@
with:ex description).
] do:[
self selectedProjectsDo:[:prj |
- |packageId defClass pathes|
+ |packageId defClass paths|
packageId := prj asPackageId.
defClass := ProjectDefinition definitionClassForPackage:packageId createIfAbsent:false.
@@ -43547,16 +43545,16 @@
tag isEmptyOrNil ifTrue:[^ self ].
self withWaitCursorDo: [
- pathes := OrderedCollection new.
+ paths := OrderedCollection new.
defClass forEachFileNameAndGeneratedContentsDo:[:fileName :fileContents |
- pathes add:(packageId pathRelativeToTopDirectory,'/',fileName). "/ always unix names
+ paths add:(packageId pathRelativeToTopDirectory,'/',fileName). "/ always unix names
].
aManager
setSymbolicName:tag
revision:nil
overWrite:true
- pathes:pathes
+ pathes:paths
].
]
].
@@ -47110,7 +47108,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.
].
@@ -51688,7 +51686,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.
].
@@ -59051,6 +59049,7 @@
^ selectorCompletion
! !
+
!NewSystemBrowser methodsFor:'private-semantic checks'!
checkAcceptedMethod:aMethod inClass:aClass