diff -r af709bd4e0d2 -r 6eb1b9632453 Tools__NewSystemBrowser.st --- a/Tools__NewSystemBrowser.st Wed May 17 03:50:49 2017 +0000 +++ b/Tools__NewSystemBrowser.st Wed May 17 12:41:54 2017 +0200 @@ -1,3 +1,5 @@ +"{ Encoding: utf8 }" + " COPYRIGHT (c) 2000 by eXept Software AG All Rights Reserved @@ -42167,7 +42169,7 @@ "/ classesNotInRepository filesNotInImage classesDeletedInRepository "/ classesModifiedInImage classesModifiedInRepository "/ classesDeletedInImage classesAddedInImage -"/ anyDifference box doRemove classDefs changeSets filePerClassDefintion +"/ anyDifference box doRemove classDefs changeSets filePerClassDefinition "/ classesToCheckIn| "/ "/ module := eachProject asPackageId module. @@ -42192,7 +42194,7 @@ "/ "/ anyDifference := false. "/ filesNotInImage notEmpty ifTrue:[ -"/ filePerClassDefintion := Dictionary new. +"/ filePerClassDefinition := Dictionary new. "/ classDefs := ChangeSet new. "/ changeSets := OrderedCollection new. "/ filesNotInImage do:[:eachSTFile | @@ -42204,7 +42206,7 @@ "/ s close. "/ changeSets add:chgSet. "/ classDefinitions := chgSet select:[:change | change isClassDefinitionChange and:[change isPrivateClassDefinitionChange not]]. -"/ classDefinitions do:[:def | filePerClassDefintion at:def put:eachSTFile]. +"/ classDefinitions do:[:def | filePerClassDefinition at:def put:eachSTFile]. "/ classDefs addAll:classDefinitions. "/ ]. "/ "/ now, install ... @@ -42212,7 +42214,7 @@ "/ |cls oldPackage| "/ "/ eachClassDefinition package:eachProject. -"/ eachClassDefinition installAsAutoloadedClassIfPublicWithFilename:(filePerClassDefintion at:eachClassDefinition). +"/ eachClassDefinition installAsAutoloadedClassIfPublicWithFilename:(filePerClassDefinition at:eachClassDefinition). "/ (cls := eachClassDefinition changeClass) notNil ifTrue:[ "/ (oldPackage := cls package) ~= eachProject ifTrue:[ "/ (Dialog confirm:('Move the %1-class from %2 to %3 ?' bindWith:cls name allBold with:oldPackage allBold with:eachProject allBold)) ifTrue:[ @@ -42345,6 +42347,7 @@ "/ ]. "Modified: / 10-02-2012 / 17:32:39 / cg" + "Modified (comment): / 17-05-2017 / 12:39:44 / mawalch" ! projectMenuCheckOutNewestUsingManager: manager @@ -43282,7 +43285,7 @@ projectMenuImport:doLoadClasses usingManager:managerOrNil |currentProject default pkg fromWhere module checkedOutPackageDir package numImported numSkipped msg classDefs - filePerClassDefintion importFromFilesystem importDirectory importFromDirectoryAction + filePerClassDefinition importFromFilesystem importDirectory importFromDirectoryAction sourceCodeManager| importFromFilesystem := false. @@ -43450,7 +43453,7 @@ "/ cannot simply fileIn that stuff (because of load order) "/ instead, create a change set containing all class definitions, "/ and define them first ... - filePerClassDefintion := Dictionary new. + filePerClassDefinition := Dictionary new. classDefs := ChangeSet new. filesThere do:[:eachSTFile | |s classDefinitions chgSet| @@ -43459,7 +43462,7 @@ chgSet := ChangeSet fromStream:s. s close. classDefinitions := chgSet select:[:change | change isClassDefinitionChange and:[change isPrivateClassDefinitionChange not]]. - classDefinitions do:[:def | filePerClassDefintion at:def put:eachSTFile]. + classDefinitions do:[:def | filePerClassDefinition at:def put:eachSTFile]. classDefs addAll:classDefinitions. ]. @@ -43468,7 +43471,7 @@ |cls oldPackage| eachClassDefinition package:theProject. - eachClassDefinition installAsAutoloadedClassIfPublicWithFilename:(filePerClassDefintion at:eachClassDefinition). + eachClassDefinition installAsAutoloadedClassIfPublicWithFilename:(filePerClassDefinition at:eachClassDefinition). (cls := eachClassDefinition changeClass) notNil ifTrue:[ (oldPackage := cls package) ~= theProject ifTrue:[ (Dialog confirm:('There is already a class named "%1" in the "%2"-pacakge.\\Move it to the "%3"-package?' withCRs @@ -47586,7 +47589,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. ]. @@ -52201,7 +52204,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. ]. @@ -59699,7 +59702,6 @@ ^ selectorCompletion ! ! - !NewSystemBrowser methodsFor:'private-semantic checks'! checkAcceptedMethod:aMethod inClass:aClass