hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:4e89429bee91
+:2269bce1636d
 "{ Package: 'stx:libtool' }"
 "{ NameSpace: Tools }"
 SystemBrowser subclass:#NewSystemBrowser
-	instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
+	instanceVariableNames:'environment navigationState bufferNameList selectedBuffer buffers
 		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
 		lastMethodCategory lastMethodMoveClass browserCanvasType
 		syntaxColoringProcessRunning syntaxColoringProcess
 		methodInfoProcess browsletShowHideLabelHolder browserPageCanvas
 		isEmbedded'
 	aBlock value:className value:singleClass value:doWhat.
 ].
 ^ className
 "Modified: / 29-08-2013 / 12:24:28 / cg"
+"Modified: / 04-09-2013 / 17:48:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 enterBoxTitle:title okText:okText label:label
 "convenient method: setup an enterBox"
 !NewSystemBrowser methodsFor:'accessing'!
 buffersDo:aBlock
 buffers notNil ifTrue:[ buffers do:aBlock ]
+!
+environment
+^ environment
+"Created: / 03-09-2013 / 19:18:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+environment:env
+environment := env.
 !
 isEmbeddedBrowser
 "allows the inspector to disable certain menu items (+ buffer)"
 	classes := self selectedClassesValue.
 	classes isEmptyOrNil ifTrue:[
 	    false
 	] ifFalse:[
-	    classes
+	    classes conform: [:cls | self hasGitRepositoryFor: cls theNonMetaclass package]
-		allSatisfy:
-		    [:cls | self hasGitRepositoryFor: cls theNonMetaclass package]
 	]
 ]
 "Created: / 23-07-2012 / 13:33:07 / cg"
 !
 	classes := self selectedClassesValue.
 	classes isEmptyOrNil ifTrue:[
 	    false
 	] ifFalse:[
-	    classes
+	    classes conform:[:cls | self hasMercurialRepositoryFor: cls theNonMetaclass package]
-		allSatisfy:
-		    [:cls | self hasMercurialRepositoryFor: cls theNonMetaclass package]
 	]
 ]
 "Created: / 19-01-2012 / 16:14:57 / cg"
 !
 	classes := self selectedClassesValue.
 	classes isEmptyOrNil ifTrue:[
 	    false
 	] ifFalse:[
-	    classes
+	    classes conform: [:cls | self hasPerforceRepositoryFor: cls theNonMetaclass package]
-		allSatisfy:
-		    [:cls | self hasPerforceRepositoryFor: cls theNonMetaclass package]
 	]
 ]
 "Created: / 19-04-2011 / 14:13:52 / cg"
 !
 hasClassesSelectedAndSubversionRepositoryExists
 | classes |
 classes := self selectedClassesValue.
 classes size = 0 ifTrue:[^false].
-^ classes
+^ classes conform: [:cls | self hasSubversionRepositoryFor: cls theNonMetaclass package]
-	allSatisfy:
-	    [:cls | self hasSubversionRepositoryFor: cls theNonMetaclass package]
 "Modified: / 28-02-2012 / 16:55:03 / cg"
 !
 hasClassesSelectedAndSubversionRepositoryExistsHolder
 	classes := self selectedClassesValue.
 	classes isEmptyOrNil ifTrue:[
 	    false
 	] ifFalse:[
-	    classes
+	    classes conform: [:cls | self hasSubversionRepositoryFor: cls theNonMetaclass package]
-		allSatisfy:
-		    [:cls | self hasSubversionRepositoryFor: cls theNonMetaclass package]
 	]
 ]
 "Modified: / 28-02-2012 / 16:55:12 / cg"
 !
 selectedNamespaces size == 0 ifTrue:[^ false].
 ^ (selectedNamespaces
 	contains:[:nm |
 	    |ns|
-	    ns := Smalltalk at:nm asSymbol ifAbsent:nil.
+	    ns := environment at:nm asSymbol ifAbsent:nil.
 	    ns notNil
 	    and:[ns allClasses size ~~ 0]
 	]
 ) not
 !
 |codeView s selClass|
 ^ (codeView := self codeView) hasSelection
 and:[ (s := codeView selectionAsString) isValidSmalltalkIdentifier
 and:[ s isUppercaseFirst
-and:[ (Smalltalk includesKey:s) not
+and:[ (environment includesKey:s) not
 and:[ (selClass := self theSingleSelectedClass) notNil
 and:[ (selClass theNonMetaclass classVarNames includes:s) not ]]]]]
 "Modified: / 23-07-2011 / 12:29:26 / cg"
 !
 (self hasSingleWordSelectedInCodeView) ifFalse:[^ nil].
 selection := self selectionInCodeView.
 selection := selection withoutSeparators.
-cls := Smalltalk classNamed:selection.
+cls := environment classNamed:selection.
 ^ cls
 !
 shiftNotPressedHolder
 ^ [ self window sensor shiftDown not ]
 something == #visitedClassHistory ifTrue:[
 	self visitedClassesHistory contents:(self class visitedClassNamesHistory).
 	^ self.
 ].
-changedObject == Smalltalk ifTrue:[
+changedObject == environment ifTrue:[
 	codeAspect := self codeAspect.
 	isForAspect := (codeAspect == something)
 		       and:[ something == #classDefinition
 			     or:[ something == #classComment
 			     or:[ something == #classHierarchy
 	something == #methodInClass ifTrue:[
 	    codeAspect == SyntaxHighlighter codeAspectMethod ifTrue:[
 		mthd := self theSingleSelectedMethod.
 		(mthd notNil and:[aParameter third == mthd])
 		ifTrue:[
+self enqueueDelayedMethodTrapChanged:nil.
 		    mthd mclass notNil ifTrue:[
 			"/ mhmh - Smalltalk tells me that a method has changed,
 			"/ but my selectedMethod has not yet been updated
 			"/ (the methodList seems to be behind me in the dependency chain).
 			"/ simply ignore this update here (assuming that the methodList will trigger
 	    ].
 	    ^ self
 	].
 	something == #methodTrap ifTrue:[
-	    self enqueueDelayedMethodTrapChanged.
+	    self enqueueDelayedMethodTrapChanged:aParameter.
 	    ^ self
 	].
 	something == #methodCoverageInfo ifTrue:[
 	    self theSingleSelectedMethod == aParameter ifTrue:[
 "Created: / 22-02-2008 / 09:00:56 / janfrog"
 "Modified: / 25-10-2009 / 15:06:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 02-07-2011 / 18:33:22 / cg"
 ! !
+!NewSystemBrowser methodsFor:'initialization'!
+initialize
+super initialize.
+environment := Smalltalk
+"Created: / 03-09-2013 / 19:13:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
 !NewSystemBrowser methodsFor:'menu actions-browse'!
 browseClassesReferringToAnyPool:poolsArg in:doWhat
 "open a dialog asking for a poolname; search for classes importing that pool."
 		collect:[:poolOrName |
 		    |p|
 		    poolOrName isSharedPool ifTrue:[
 			poolOrName
 		    ] ifFalse:[
-			p := Smalltalk classNamed:poolNameString.
+			p := environment classNamed:poolNameString.
 			(p notNil and:[p isSharedPool]) ifTrue:[
 			    p
 			] ifFalse:[
 			    nil
 			]
 		  thenSelect:[:p | p notNil].
 pools isEmptyOrNil ifTrue:[
 	^ self
 ].
-classes := Smalltalk allClasses
+classes := environment allClasses
 		select:[:cls |
 			cls isMeta not and:[(cls sharedPools includesAny:pools)]
 		].
 classes size == 0 ifTrue:[
 inputField entryCompletionBlock:[:contents |
 	|s what|
 	s := contents withoutSpaces.
 	box topView withWaitCursorDo:[
-	    what := Smalltalk selectorCompletion:s.
+	    what := DoWhatIMeanSupport selectorCompletion:s inEnvironment:environment.
 	    inputField contents:what first.
 	    (what at:2) size ~~ 1 ifTrue:[
 		self window beep
 	    ]
 	]
 	    self warn:'No selector entered for search'.
 	    ^ self.
 	].
 	self rememberSearchPattern:sel.
 ].
+"Modified: / 04-09-2013 / 17:40:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 browseMenuAllSubclassesOf
 "add a new buffer on all subclasses of an entered class"
 		searchBlock := [ Behavior allSubInstances select:[:cls | cls superclass isNil] ].
 	    ] ifFalse:[
 		className includesMatchCharacters ifTrue:[
 		    className := self askForClassNameMatching:className.
 		].
-		class := (Smalltalk classNamed:className) theNonMetaclass.
+		class := (environment classNamed:className) theNonMetaclass.
 		searchBlock := [ class allSubclasses ]
 	    ].
 	    self
 		spawnClassBrowserForSearch:searchBlock
 "add a new buffer on all classes that have been autoloaded"
 |searchBlock|
 searchBlock := [
-			(Smalltalk allClassesForWhich:[:someClass | someClass wasAutoloaded])
+			(environment allClassesForWhich:[:someClass | someClass wasAutoloaded])
 			    asOrderedCollection
 		   ].
 self
 	spawnClassBrowserForSearch:searchBlock
 "open a browser / add a new buffer on all methods extending a class
 (i.e. methods where the packageID is different from their classes packageID)"
 ^ self
 	browseMenuClassExtensionsFor:nil
-	in:Smalltalk allClasses
+	in:environment allClasses
 	label:'All Class Extensions'
 	openAs:openHow
 !
 browseMenuClassesDefiningVariable
 ].
 allInstVariables := Set new.
 allClassVariables := Set new.
 allClassInstVariables := Set new.
-Smalltalk allClassesDo:[:cls |
+environment allClassesDo:[:cls |
 	cls isMeta ifFalse:[
 	    allInstVariables addAll:(cls instVarNames).
 	    allClassVariables addAll:(cls classVarNames).
 	    allClassInstVariables addAll:(cls class instVarNames).
 	].
 box entryCompletionBlock:[:contents |
 	|s what m|
 	s := contents withoutSpaces.
-	what := Smalltalk classnameCompletion:s.
+	what := DoWhatIMeanSupport selectorCompletion:s inEnvironment:environment .
 	box contents:what first.
 	(what at:2) size ~~ 1 ifTrue:[
 	    self builder window beep
 	].
 	box listView list:(list select:[:entry | s match:entry]).
 ] ifFalse:[
 	varNamesToSearch := varNamesToSearch asSet.
 	checkFilterBlock := [:v | varNamesToSearch includes:v]
 ].
-classes := Smalltalk allClasses select:[:cls |
+classes := environment allClasses select:[:cls |
 		    cls isMeta not
 		    and:[(cls instVarNames contains:checkFilterBlock)
 			 or:[(cls classVarNames contains:checkFilterBlock)
 			     or:[cls class instVarNames contains:checkFilterBlock]]]
 	       ].
 ].
 brwsr selectClasses:classes.
 "Created: / 01-03-2000 / 11:12:38 / cg"
 "Modified: / 29-08-2013 / 12:23:08 / cg"
+"Modified: / 04-09-2013 / 17:40:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 browseMenuClassesForWhich: aFilter label: label
 "add a new buffer on all shared pools"
 searchBlock := [
 			|classes|
 			classes := OrderedCollection new.
-			Smalltalk allClassesDo:[:eachClass |
+			environment allClassesDo:[:eachClass |
 			    (aFilter value: eachClass) ifTrue:[
 				classes add:eachClass
 			    ]
 			].
 			classes
 	[
 	    |appHistory|
 	    appHistory := ApplicationModel recentlyOpenedApplications.
 	    appHistory
-		collect:[:nm | Smalltalk classNamed:nm]
+		collect:[:nm | environment classNamed:nm]
 		as:OrderedCollection
 	].
 ^ self spawnClassBrowserForSearch:searchBlock sortBy:nil in:openHow label:'Recently opened applications'
 box entryCompletionBlock:[:contents |
 	|s what m|
 	s := contents withoutSpaces.
-	what := DoWhatIMeanSupport poolnameCompletion:s inEnvironment:Smalltalk.
+	what := DoWhatIMeanSupport poolnameCompletion:s inEnvironment:environment.
 	box contents:what first.
 	(what at:2) size ~~ 1 ifTrue:[
 	    self builder window beep
 	].
 	box listView list:(list select:[:entry | s match:entry]).
 box showAtPointer.
 poolNameString isEmptyOrNil ifTrue:[
 	^ self
 ].
-pool := Smalltalk classNamed:poolNameString.
+pool := environment classNamed:poolNameString.
 pool isNil ifTrue:[
 	Dialog warn:'No such pool: ', poolNameString.
 	^ self.
 ].
 pool isSharedPool ifFalse:[
 !
 browseMenuClassesWithFilter:aFilterBlock label:aLabelString
 |searchBlock|
-searchBlock := [ Smalltalk allClasses select:aFilterBlock ].
+searchBlock := [ environment allClasses select:aFilterBlock ].
 ^ self
 	spawnClassBrowserForSearch:searchBlock
 	sortBy:nil
 	in:#newBuffer
 	newBrowser := self
 		    spawnClassExtensionBrowserForSearch:[
 			|classes|
-			classes := Smalltalk allClassesForWhich:[:someClass |
+			classes := environment allClassesForWhich:[:someClass |
 			    |include|
 			    include := false.
 			    someClass hasExtensions ifTrue:[
 				someClass instAndClassMethodsDo:[:m | m isShadowingExtension ifTrue:[include := true]].
 withMatch ifTrue:[
 	stringToSearch := '*' , stringToSearch , '*'
 ].
 self withWaitCursorDo:[
-	classes := Smalltalk allClasses select:[:cls |
+	classes := environment allClasses select:[:cls |
 			|s m found|
 			(cls isLoaded and:[cls isMeta not]) ifTrue:[
 			    self activityNotification:('searching %1 ...' bindWith:cls name).
 			    found := false.
 "add a new buffer on all wrapped methods
 (i.e. that have a break, trace or watchPoint)"
 self
 	spawnMethodBrowserForSearch:[
-	    Smalltalk allMethodsForWhich:[:m | m isWrapped or:[m isMethodWithBreakpoints]].
+	    environment allMethodsForWhich:[:m | m isWrapped or:[m isMethodWithBreakpoints]].
 	]
 	sortBy:#class in:#newBuffer
 	label:'BreakPointed Methods'
 !
 				val ~~ 0 ifTrue:[
 				    baseName := (globlName copyFrom:val+1) asSymbol.
 				] ifFalse:[
 				    baseName := sym.
 				].
-				(val := Smalltalk at:sym) isBehavior ifTrue:[
+				(val := environment at:sym) isBehavior ifTrue:[
 				    otherKeysReferringToValue := OrderedCollection new.
-				    Smalltalk keysAndValuesDo:[:k :v | v == val ifTrue:[
+				    environment keysAndValuesDo:[:k :v | v == val ifTrue:[
-									   k ~~ sym ifTrue:[
+									   (k ~~ sym and:[k ~~ #'Parser:PrevClass']) ifTrue:[
 									       otherKeysReferringToValue add:k
 									   ]
 								       ]
 							      ].
 				    otherKeysReferringToValue size > 0 ifTrue:[
 						  ]
 				]
 			   ].
 		       ].
 		       "/ recollect realClasses from names (in case of class-changes)
-		       realClasses := classes collect:[:eachClass | Smalltalk at:eachClass name].
+		       realClasses := classes collect:[:eachClass | environment at:eachClass name].
 		       self class
 			       findMethodsIn:realClasses
 			       where:matchBlock
 		   ]
 	searchWhat:#globalName
 "/                        |defaultId methods methodsInOrder|
 "/
 "/                        methods := OrderedCollection new.
 "/                        defaultId := PackageId noProjectID.
 "/
-"/                        Smalltalk allMethodsDo:[:mthd |
+"/                        environment allMethodsDo:[:mthd |
 "/                            mthd package = defaultId ifTrue:[
 "/                                methods add:mthd.
 "/                            ].
 "/                        ].
 "/                        methods
 !
 browseMenuWritesToGlobal
 "launch an enterBox for global to search for writers"
-|labelHolder alreadyAsked searchAllLabel|
+|labelHolder|
 labelHolder := 'Methods writing to global ''%1''' asValue.
 self
 	askForMethodAndSpawnSearchTitle:'Global to search:\(TAB for completion; matchPattern allowed)'
 	browserLabel:labelHolder
 "/                                val ~~ 0 ifTrue:[
 "/                                    baseName := (globlName copyFrom:val+1) asSymbol.
 "/                                ] ifFalse:[
 "/                                    baseName := sym.
 "/                                ].
-"/                                (val := Smalltalk at:sym) isBehavior ifTrue:[
+"/                                (val := environment at:sym) isBehavior ifTrue:[
 "/                                    otherKeysReferringToValue := OrderedCollection new.
-"/                                    Smalltalk keysAndValuesDo:[:k :v | v == val ifTrue:[
+"/                                    environment keysAndValuesDo:[:k :v | v == val ifTrue:[
 "/                                                                           k ~~ sym ifTrue:[
 "/                                                                               otherKeysReferringToValue add:k
 "/                                                                           ]
 "/                                                                       ]
 "/                                                              ].
 "/                                            msg := '''%1'' also refers to that value. Search these references too ?'.
 "/                                            searchAllLabel := 'Methods referring to ''%1'' or ''%2''' bindWithArguments:keysReferringToValue.
 "/                                        ] ifFalse:[
 "/                                            searchAllLabel := 'Methods referring to the value of ''%1'''.
 "/                                            otherKeysReferringToValue size <= 3 ifTrue:[
-"/                                                msg := (otherKeysReferringToValue copyButLast:1) asStringWith:', '.
+"/                                                msg := (otherKeysReferringToValue copyWithoutLast:1) asStringWith:', '.
 "/                                                msg := msg , ' and ' , otherKeysReferringToValue last.
 "/                                                msg := msg , ' also refer to that value. Search those references too ?'.
 "/                                            ] ifFalse:[
 "/                                                msg := 'There are %2 other globals referring to that value. Search those references too ?'.
 "/                                            ]
 			    globals:true
 			    poolVars:false
 			    access:#write.
 		       "/ recollect realClasses from names (in case of class-changes)
-		       realClasses := classes collect:[:eachClass | Smalltalk at:eachClass name].
+		       realClasses := classes collect:[:eachClass | environment at:eachClass name].
 		       self class
 			   findMethodsIn:realClasses
 			   where:matchBlock
 		   ]
 	searchWhat:#globalName
 !
 browseMethodsForWhich:checkBlock in:openHow label:aString
 |searchBlock|
-searchBlock := [ Smalltalk allMethodsForWhich:checkBlock ].
+searchBlock := [ environment allMethodsForWhich:checkBlock ].
 ^ self
 	spawnMethodBrowserForSearch:searchBlock
 	sortBy:#class
 	in:openHow
 findClassesWithoutClassMethod:selector
 |classes|
 classes := IdentitySet new.
-Smalltalk allClassesDo:[:eachClass |
+environment allClassesDo:[:eachClass |
 	(eachClass isMeta not
 	and:[eachClass isLoaded
 	and:[eachClass isNameSpace not
 	and:[(eachClass class includesSelector:selector) not]]])
 	ifTrue:[
 !
 categoryMenuNewCategory
 |box newCategory allClassCategories|
-allClassCategories := Smalltalk allClassCategories.
+allClassCategories := environment allClassCategories.
 box := self
 		enterBoxTitle:'Name of new class category:'
 		okText:'Create'
 		label:'Create Category'.
 	    guess isNil ifTrue:[
 		guess := eachCategory string.
 	    ].
-	    allCategories := Smalltalk allClassCategories asArray sort.
+	    allCategories := environment allClassCategories asArray sort.
 	    combosList := LastCategoryRenames.
 	    (combosList size > 0 and:[combosList includes:eachCategory]) ifFalse:[
 		combosList size == 0 ifTrue:[
 		    combosList := List with:eachCategory
 		] ifFalse:[
 pattern := Dialog request:'Match pattern for categories:' initialAnswer:(self theSingleSelectedCategory ? '').
 pattern size == 0 ifTrue:[^ self].
 pattern := pattern string.
 matchingCategories := Set new.
-Smalltalk allClassesAndMetaclassesDo:[:eachClass |
+environment allClassesAndMetaclassesDo:[:eachClass |
 	|cat|
 	cat := eachClass category.
 	(pattern match:cat) ifTrue:[
 	    matchingCategories add:cat.
 	    ^ self
 	].
 	answer == true ifTrue:[
 	    self withWaitCursorDo:[
 		    aClass unload.
-		    Smalltalk changed:#classDefinition with:aClass
+		    environment changed:#classDefinition with:aClass
 		].
 	    ^ self
 	]
 ].
 	m := self anySelectedMethod.
 	currentClass := m mclass.
 ].
 LastMethodMoveOrCopyTargetClass notNil ifTrue:[
-	initial := Smalltalk classNamed:LastMethodMoveOrCopyTargetClass.
+	initial := environment classNamed:LastMethodMoveOrCopyTargetClass.
 	initial notNil ifTrue:[
 	    (currentClass notNil and:[currentClass theNonMetaclass name = initial name]) ifTrue:[
 		initial := nil
 	    ]
 	].
 classList := self classListGenerator value.
 self assert:classList isOrderedCollection.
 className := self searchMenuFindClassToAdd.
 className isNil ifTrue:[^ self].
-class := Smalltalk at:className asSymbol ifAbsent:nil.
+class := environment at:className asSymbol ifAbsent:nil.
 class isNil ifTrue:[
 	^ self warn:'No such class'
 ].
 classList add:class.
 classList sort:[:a :b | a name < b name].
 		    onCancel:nil
 		    list:list.
 otherClassName isNil ifTrue:[^ self].
 (otherClassName startsWith:'---- ') ifTrue:[^ self].
-otherClass := Smalltalk classNamed:otherClassName.
+otherClass := environment classNamed:otherClassName.
 otherClass isNil ifTrue:[
 	self warn:'no such class: ', otherClassName.
 	^ self
 ].
 	^ self
 ].
 currentClassName := currentClass name.
 newClassName := currentClassName.
-"/    (nameSpace := currentClass nameSpace) == Smalltalk ifTrue:[
+"/    (nameSpace := currentClass nameSpace) == environment ifTrue:[
 "/        newClassName := 'CopyOf' , currentClassName.
 "/    ] ifFalse:[
 "/        newClassName := nameSpace name , '::' , 'CopyOf' , currentClass nameWithoutPrefix.
 "/    ].
 			request:(resources string:'Copy class %1 as:' with:currentClassName allBold)
 			initialAnswer:newClassName.
 (newClassName isEmptyOrNil or:[newClassName withoutSeparators = currentClassName]) ifTrue:[
 	^ self
 ].
-(Smalltalk classNamed:newClassName) notNil ifTrue:[
+(environment classNamed:newClassName) notNil ifTrue:[
 	(self confirm:(resources string:'A class named: ''%1'' already exists.\\Overwrite ?' with:newClassName) withCRs)
 	    ifFalse:[^ self]
 ].
 (owningClass := currentClass owningClass) notNil ifTrue:[
 	(newClassName startsWith:(owningClass name , '::')) ifTrue:[
-	    newClassName := newClassName copyFrom:(owningClass name , '::') size + 1.
+	    newClassName := newClassName withoutPrefix:(owningClass name , '::').
 	    newOwnerClass := owningClass.
 	] ifFalse:[
 	    (newClassName includes:$:) ifTrue:[
 		idx := newClassName lastIndexOf:$:.
 		ownerName := newClassName copyTo:idx.
 	    newClassName := newClassName copyFrom:idx+1.
 	].
 ].
 ownerName notNil ifTrue:[
-	(Smalltalk classNamed:ownerName) isNil ifTrue:[
+	(environment classNamed:ownerName) isNil ifTrue:[
 	    (Dialog confirm:(resources
 				stringWithCRs:'No class or nameSpace named: "%1"\\Create as Namespace ?' with:ownerName))
 	    ifFalse:[
 		^ self
 	    ].
 	    newOwnerClass := NameSpace fullName:ownerName.
 	].
-	newOwnerClass := Smalltalk at:ownerName asSymbol.
+	newOwnerClass := environment at:ownerName asSymbol.
 	(newOwnerClass == Smalltalk or:[newOwnerClass isNameSpace]) ifTrue:[
 	    newOwnerClass == Smalltalk ifFalse:[
 		newClassName := ownerName , '::' , newClassName.
 	    ].
 	    newOwnerClass := nil.
 	    "/ we have top refetch, because the class is now obsolete (stupid consequence of not having a
 	    "/ good become).
 	    "/ refetch to get the present class (sigh)
 	    theClass := Smalltalk at:(eachClass theNonMetaclass name).
-	    vars := theClass theMetaclass allInstanceVariableNames asSet.
+	    vars := theClass theMetaclass allInstanceVariableNames asNewSet.
 	    vars removeAll:(Class allInstanceVariableNames).
 	    (singletonVarName notNil and:[vars includes:singletonVarName]) ifTrue:[
 		defaultNameForSingleton := singletonVarName
 	    ] ifFalse:[
 		list:(vars asSortedCollection).
 	    singletonVar isEmptyOrNil ifTrue:[^ self].
 	    (theClass theMetaclass allInstanceVariableNames asSet includes:singletonVar) ifFalse:[
 		theClass theMetaclass addInstVarName:singletonVar.
-		theClass := Smalltalk at:(eachClass theNonMetaclass name).
+		theClass := environment at:(eachClass theNonMetaclass name).
 	    ].
 	    generator createSingletonPatternInstanceCreationMethodsIn:theClass usingVariable:singletonVar
 	].
 "Created: / 10-02-2011 / 16:28:36 / cg"
 name := Dialog request:(resources
 				string:'Enter name for new parent class of the selected class(es):').
 name isEmpty ifTrue: [^self].
-existingClass := Smalltalk classNamed:name.
+existingClass := environment classNamed:name.
 existingClass notNil ifTrue:[
 	(Dialog confirm:(resources
 				string:'A Class named "%1" already exists - make the selected class(es) a subclass of it ?'))
 	ifFalse:[
 	    ^ self
 		    list:list
 		    entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
 newOwnerName isNil ifTrue:[^ self].
 (newOwnerName startsWith:'---- ') ifTrue:[^ self].
-newOwner := Smalltalk classNamed:newOwnerName.
+newOwner := environment classNamed:newOwnerName.
 newOwner isNil ifTrue:[
 	(currentClass nameSpace notNil and:[currentClass nameSpace ~~ Smalltalk]) ifTrue:[
 	    newOwner := currentClass nameSpace classNamed:newOwnerName
 	].
 ].
 classes := self selectedNonMetaclasses.
 classes do:[:eachClass |
 	eachClass autoload.
 	newName := newOwner name , '::' , eachClass nameWithoutPrefix.
-	(Smalltalk classNamed:newName) notNil ifTrue:[
+	(environment classNamed:newName) notNil ifTrue:[
-	    (Smalltalk classNamed:newName) ~~ eachClass ifTrue:[
+	    (environment classNamed:newName) ~~ eachClass ifTrue:[
 		self warn:'A class named ' , newName , ' already exists.'.
 		^ self
 	    ].
 	].
 	(newOwner == eachClass) ifTrue:[
 		    default:3.
 	    nsName isEmptyOrNil ifTrue:[^ self].
 	    nsName isNameSpace ifTrue:[
 		ns := nsName
 	    ] ifFalse:[
-		ns := Smalltalk at:nsName.
+		ns := environment at:nsName.
 	    ].
 	].
 	(ns classNamed:baseName) notNil ifTrue:[
 	    self warn:(resources
 nsName := self
 	    askForNameSpace:(resources string:'Make classes public in which Namespace ?')
 	    title:(resources string:'Move to Namespace')
 	    initialText:(LastNameSpaceMove ? '').
 nsName isEmptyOrNil ifTrue:[^ self].
-ns := Smalltalk at:nsName asSymbol.
+ns := environment at:nsName asSymbol.
 LastNameSpaceMove := nsName.
 self selectedNonMetaclassesDo:[:eachClass |
 	baseName := eachClass nameWithoutPrefix.
 !
 classMenuMoveToCategory
 |allCategories box|
-allCategories := Smalltalk allClassCategories asArray sort.
+allCategories := environment allClassCategories asArray sort.
 box := ListSelectionBox new.
 box title:(resources string:'Move class(es) to which category:').
 box list:allCategories.
 box okAction:[:sel |
 box initialText:(LastCategoryRenames ? #('')) first.
 box entryCompletionBlock:[:contents |
 	|s what|
 	s := contents withoutLeadingSeparators.
-	what := Smalltalk classCategoryCompletion:s.
+	what := environment classCategoryCompletion:s.
 	box contents:what first.
 	(what at:2) size ~~ 1 ifTrue:[
 	    self builder window beep
 	]
 ].
 			askForNameSpace:'Move class(es) to which nameSpace:'
 			title:(resources string:'Move to Namespace')
 			initialText:(LastNameSpaceMove ? '').
 newNameSpace size == 0 ifTrue:[^ self].
-ns := Smalltalk at:newNameSpace asSymbol.
+ns := environment at:newNameSpace asSymbol.
 ns isNil ifTrue:[
 	(self confirm:(resources string:'No such nameSpace exists.\\Create "%1" ?' with:newNameSpace) withCRs) ifFalse:[
 	    ^ self
 	].
 	ns := NameSpace name:newNameSpace asSymbol
 dialog accepted ifFalse:[^ self].
 language := dialog language.
 newClassName := dialog classNameHolder value withoutSeparators.
 superclassName := dialog superclassNameHolder value withoutSeparators.
-superclass := Smalltalk classNamed:superclassName.
+superclass := environment classNamed:superclassName.
 package := (dialog packageHolder value ? '') withoutSeparators.
 namespaceName := (dialog nameSpaceHolder value ? 'Smalltalk') withoutSeparators.
 category := (dialog categoryHolder value ? '* as yet unspecified *') withoutSeparators.
 (namespaceName = 'Smalltalk') ifTrue:[
 newNameString = currentClass name ifTrue:[^ self].
 "/ extract owner or namespace, to see if this implies a change
 newOwnerOrNameSpacePath := OrderedCollection new.
-nsOrOwner := Smalltalk.
+nsOrOwner := environment.
 s := newNameString readStream.
 [s atEnd] whileFalse:[
 	nextWord := s nextAlphaNumericWord.
 	[s peek == $_] whileTrue:[
 	    nextWord := nextWord , '_' , s nextAlphaNumericWord.
 	]
 ].
 "/ check if the target already exists - confirm if so.
-(cls := Smalltalk classNamed:newNameString) notNil ifTrue:[
+(cls := environment classNamed:newNameString) notNil ifTrue:[
 	(self confirm:(resources string:'Attention: a class named ''%1'' already present (in the ''%2'' category).\\Rename over it ?'
 				 with:newNameString allBold
 				 with:cls category allBold) withCRs)
 	    ifFalse:[^ self]
 ].
 	]
 ].
 self busyLabel:('Searching for references to ' , oldSym).
 referingMethods := SystemBrowser
-			    allMethodsIn:(Smalltalk allClasses)
+			    allMethodsIn:(environment allClasses)
 			    where:(SystemBrowser searchBlockForReferendsOf:oldSym).
 self normalLabel.
 referingMethods isEmpty ifTrue:[
 	Smalltalk renameClass:currentClass to:newNameString.
 ] ifFalse:[
 	    ].
 	].
 	answer == #renameAndRewrite ifTrue:[
 	    self performRefactoring:(RenameClassRefactoring renameClassNamed:oldSym to:newNameString).
 	    referingMethods := SystemBrowser
-			    allMethodsIn:(Smalltalk allClasses)
+			    allMethodsIn:(environment allClasses)
 			    where:(SystemBrowser searchBlockForReferendsOf:newNameString).
 	    UserInformation ignoreIn:[
 		browser := self
 			    spawnMethodBrowserFor:referingMethods
 			    in:#newBuffer
 askForNewContainer ifTrue:[
 	(self confirm:(resources string:'Create a new source container for ''%1'' ?' with:newNameString allBold))
 	ifTrue:[
 	    currentClass setClassFilename:nil.
-	    SourceCodeManagerUtilities default createSourceContainerForClass:(Smalltalk at:newNameString asSymbol)
+	    SourceCodeManagerUtilities default createSourceContainerForClass:(environment at:newNameString asSymbol)
 	]
 ].
 "Modified: / 01-06-2012 / 10:30:08 / cg"
 !
 	]
 ] ifFalse:[
 	(selectedNamespaces := self selectedNamespaces value) size > 0 ifTrue:[
 	    selectedNamespaces size == 1 ifTrue:[
 		selectedNamespaces first ~= BrowserList nameListEntryForALL ifTrue:[
-		    currentNamespace := Smalltalk at:selectedNamespaces first asSymbol.
+		    currentNamespace := environment at:selectedNamespaces first asSymbol.
 		]
 	    ]
 	]
 ].
 	existingNames size > 0 ifTrue:[
 	    existingNames := existingNames collect:[:cls | cls name].
 	]
 ] ifFalse:[
 	namePrefix := ''.
-	existingNames := Smalltalk keys
+	existingNames := environment keys
 ].
 name := nsTemplate , nameProto , i printString.
 existingNames notNil ifTrue:[
 	nameUsed := namePrefix , name.
 newMetaclass := newClass class.
 newMetaclass instanceVariableNames:(aClass class instanceVariableString).
 "/ sigh - must refetch in case of changed instVars.
-newClass := Smalltalk at:realNewClassName.
+newClass := environment at:realNewClassName.
 newMetaclass := newClass class.
 aClass methodDictionary
 	keysAndValuesDo:[:sel :mthd |
 	    newClass compile:(mthd source) classified:(mthd category)
 	].
 ].
 movedInstMethods notEmpty ifTrue:[
 	aClass theNonMetaclass changed:#projectOrganization.
-	Smalltalk changed:#projectOrganization with:(Array with:aClass theNonMetaclass with:movedInstMethods).
+	environment changed:#projectOrganization with:(Array with:aClass theNonMetaclass with:movedInstMethods).
 ].
 movedClassMethods notEmpty ifTrue:[
 	aClass theMetaclass changed:#projectOrganization.
-	Smalltalk changed:#projectOrganization with:(Array with:aClass theMetaclass with:movedClassMethods).
+	environment changed:#projectOrganization with:(Array with:aClass theMetaclass with:movedClassMethods).
 ]
 "Modified: / 09-03-2012 / 23:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 classes do:[:eachClass |
 	|cls|
 	cls := eachClass theNonMetaclass.
 	cls isPrivate ifFalse:[
-	    Smalltalk changeCategoryOf:cls to:newCategory.
+	    environment changeCategoryOf:cls to:newCategory.
 	]
 ].
 LastCategoryRenames isNil ifTrue:[
 	LastCategoryRenames := OrderedCollection new.
 LastCategoryRenames remove:newCategory ifAbsent:nil.
 LastCategoryRenames addFirst:newCategory.
 LastCategoryRenames size > 10 ifTrue:[
 	LastCategoryRenames removeLast.
 ].
+"Modified: / 04-09-2013 / 17:45:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 moveClasses:classes toProject:newProject
 "change the packageID of the given classes
 (and optionally the packageID of any methods (if they are from different packages)"
 	    ].
 	].
 	anyMethodMoved ifTrue:[
 	    theClass changed:#projectOrganization.
 	    theClass theMetaclass changed:#projectOrganization.
-	    Smalltalk changed:#projectOrganization with:(Array with:theClass with:oldProject).
+	    environment changed:#projectOrganization with:(Array with:theClass with:oldProject).
 	].
 ].
 anyClassMoved ifTrue:[
-	Smalltalk changed:#projectOrganization.
+	environment changed:#projectOrganization.
 ].
 self rememberLastProjectMoveTo:newProject
 "Modified: / 02-08-2013 / 14:26:03 / cg"
 !
 			].
 		].
 	    symOutsideNamespace := eachNonMetaClassInQuestion name.
-	    refsHere := findRefs value:(Smalltalk allClasses) value:symOutsideNamespace value:symOutsideNamespace.
+	    refsHere := findRefs value:(environment allClasses) value:symOutsideNamespace value:symOutsideNamespace.
 	    allRefs addAll:refsHere.
 	    (eachNonMetaClassInQuestion nameSpace notNil
 	    and:[ eachNonMetaClassInQuestion nameSpace ~~ Smalltalk ]) ifTrue:[
 		symInsideNamespace := eachNonMetaClassInQuestion nameWithoutNameSpacePrefix asSymbol.
 currentMethod := self theSingleSelectedMethod.
 cls := currentMethod mclass.
 selector := currentMethod selector.
 "/ how many senders are there ?
-senders := SystemBrowser findSendersOf:selector in:(Smalltalk allClasses) ignoreCase:false match:false.
+senders := SystemBrowser findSendersOf:selector in:(environment allClasses) ignoreCase:false match:false.
 nSenders := senders size.
 tree := cls parseTreeFor:selector.
 tree isNil ifTrue:[
 	self warn: 'Could not parse the method'.
 			addParameterToMethod:selector
 			in:cls
 			newSelector:newSelector
 			initializer:initializer.
-(self findSendersOf:selector in:(Smalltalk allClasses) andConfirmRefactoring:refactoring) ifTrue:[
+(self findSendersOf:selector in:(environment allClasses) andConfirmRefactoring:refactoring) ifTrue:[
 	self performRefactoring:refactoring.
 	self switchToSelector:newSelector
 ]
 "Modified: / 09-02-2011 / 13:54:16 / cg"
 |varName cls refactoring|
 varName := self codeView selectionAsString.
 (varName isValidSmalltalkIdentifier
 and:[ varName isUppercaseFirst
-and:[ (Smalltalk includesKey:varName) not
+and:[ (environment includesKey:varName) not
 and:[ (cls := self theSingleSelectedClass) notNil
 and:[ (cls theNonMetaclass classVarNames includes:varName) not
 ]]]]) ifFalse:[
 	^ self.
 ].
 "/    refactoring model name:('inline %1 into %2' bindWith:inlinedSelector with:selector).
 rslt := self performRefactoring:refactoring.
 rslt isNil ifTrue:[^ self ].
 senders := self class findSendersOf:inlinedSelector
-		    in:Smalltalk allClasses
+		    in:environment allClasses
 		    ignoreCase:false
 		    match:false.
 senders isEmpty ifTrue:[
 	(self confirm:('There seem to be no more senders of ', inlinedSelector , '.\\Remove the implementation in ' , cls name , ' ?') withCRs)
 	self performRefactoring:refactoring.
 	immediateUpdate value:false.
 	"/ must reselect manually here
-	newClass := Smalltalk classNamed:(mClass name).
+	newClass := environment classNamed:(mClass name).
 	newMethod := newClass compiledMethodAt:mSelector.
 	newClass ~~ self theSingleSelectedClass ifTrue:[
 	    self selectClass:newClass.
 	].
 	newMethod ~~ self theSingleSelectedMethod ifTrue:[
 "Modified: / 20-11-2006 / 12:31:12 / cg"
 !
 findSendersOf:selector andConfirmRefactoring:refactoring
-^ self findSendersOf:selector in:(Smalltalk allClasses) andConfirmRefactoring:refactoring
+^ self findSendersOf:selector in:(environment allClasses) andConfirmRefactoring:refactoring
 "Modified: / 28-02-2007 / 21:20:23 / cg"
 !
 findSendersOf:selector in:aSetOfClasses andConfirmRefactoring:refactoring
 	    InstrumentationInfo allInfosOfClass:cls do:[:info |
 		info cleanInfoWithChange:false
 	    ]
 	].
 ].
-Smalltalk changed:#coverageInfo.
+environment changed:#coverageInfo.
 self showCoverageInformation changed.   "/ to force update
 !
 commonTraceHelperWith:aSelector with:argumentOrNil clear:doClearAnyPreviousWrap
 "install a break/trace or countPoint for the current method(s).
 "clear all coverage information"
 self withWaitCursorDo:[
 	InstrumentedMethod cleanAllInfoWithChange:false
 ].
-Smalltalk changed:#coverageInfo.
+environment changed:#coverageInfo.
 self showCoverageInformation changed.   "/ to force update
 "Created: / 27-04-2010 / 19:00:32 / cg"
 !
 "
 |selectedNameSpaces selectedNameSpaceClasses|
 selectedNameSpaces := self selectedNamespaces value.
-selectedNameSpaceClasses := Smalltalk allClasses select:[:eachClass |
+selectedNameSpaceClasses := environment allClasses select:[:eachClass |
 								  eachClass isPrivate not
 								  and:[selectedNameSpaces includes:eachClass nameSpace name]
 							     ] .
 self checkOutClasses:selectedNameSpaceClasses askForRevision:true
 nm := Dialog request:(resources string:'Name of new NameSpace:').
 (nm isNil or:[(nm := nm withoutSeparators) size == 0]) ifTrue:[
 	^ self
 ].
-existing := Smalltalk at:nm asSymbol ifAbsent:nil.
+existing := environment at:nm asSymbol ifAbsent:nil.
 existing notNil ifTrue:[
 	existing isNameSpace ifTrue:[
 	    self warn:'A NameSpace named ''%1'' alread exists.' with:nm.
 	    ^ self
 	].
 ns isNil ifTrue:[
 	self warn:'Could not create new NameSpace ''%1''.' with:nm.
 	^ self
 ].
 self selectedNamespaces value:(Array with:nm)
+"Modified: / 04-09-2013 / 17:45:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 nameSpaceMenuRemove
 "remove the selected namespace(s)"
 self selectedNamespacesValue do:[:nm |
 	|ns|
 	nm ~= BrowserList nameListEntryForALL ifTrue:[
-	    ns := Smalltalk at:nm asSymbol.
+	    ns := environment at:nm asSymbol.
-	    Smalltalk removeClass:ns.
+	    environment removeClass:ns.
 	]
 ].
 !
 nameSpaceMenuRename
 setupDefaultType :=
 	[:package |
 	    |classesInPackage|
-	    classesInPackage := Smalltalk allClassesInPackage:package.
+	    classesInPackage := environment allClassesInPackage:package.
 	    classesInPackage isEmpty ifTrue:[
 		defaultProjectType := LastNewProjectType ? ProjectDefinition guiApplicationType
 	    ] ifFalse:[
 		(classesInPackage contains:[:cls | cls isBrowserStartable]) ifTrue:[
 		    (classesInPackage contains:[:cls | cls isVisualStartable])
 	    mgr := SourceCodeManager
 	] ifFalse:[
 	    mgr := SourceCodeManagerUtilities sourceCodeManagerFor:definitionClass
 	].
-	classes := Smalltalk allClassesInPackage:eachPackageID.
+	classes := environment allClassesInPackage:eachPackageID.
 	classes := classes reject:[:cls | cls isPrivate ].
 	self checkOutClasses:classes askForRevision:false usingManager: mgr.
 ].
 "/    self checkOutClasses:(self selectedProjectClasses) askForRevision:false.
 ^ self.
 "/        perProjectInfo := SourceCodeManager newestRevisionsInModule:module directory:directory.
 "/        perProjectInfo := perProjectInfo ? #().
 "/        perProjectInfo := perProjectInfo select:[:info | info key asFilename hasSuffix:'st'].
 "/        perProjectInfo := Dictionary withAssociations:perProjectInfo.
 "/
-"/        classesInImage := Smalltalk allClassesInPackage:eachProject.
+"/        classesInImage := environment allClassesInPackage:eachProject.
 "/        filesInImage := (classesInImage collect:[:cls | cls classBaseFilename]) asSet.
 "/        "/ any differences ?
 "/        classesNotInRepository := classesInImage reject:[:cls | (perProjectInfo includesKey:cls classBaseFilename)].
 "/        classesDeletedInRepository := classesInImage select:[:cls | (perProjectInfo at:cls classBaseFilename ifAbsent:nil) == #deleted].
 "/        perProjectInfo := perProjectInfo reject:[:v | v == #deleted].
 	    otherFiles := containers reject:[:each | (each asFilename hasSuffix:'st') ].
 	    containers removeAllFoundIn:otherFiles.
 	    classesInProject := IdentitySet new.
 	    needExtensionsContainer := false.
-	    Smalltalk allClassesDo:[:aClass |
+	    environment allClassesDo:[:aClass |
 		(packageToCheck = aClass package) ifTrue:[
 		    aClass isPrivate ifFalse:[
 			classesInProject add:aClass .
 		    ]
 		] ifFalse:[
 self projectMenuFileOutAsWithFormat:nil
 !
 projectMenuFileOutAsWithFormat:aFormatSymbolOrNil
-|currentProject selectedProjects suffix saveName fileName "methodsToFileOut fileNameForExtensions" mgr s classesToFileout|
+|currentProject selectedProjects suffix saveName fileName mgr s classesToFileout|
 selectedProjects := self selectedProjectsValue.
 currentProject := self theSingleSelectedProject.
 currentProject notNil ifTrue:[
 	fileName := currentProject asString copy replaceAny:' :/' with:$_.
 ] ifFalse:[
 	fileName := 'someProjects'
 ].
-aFormatSymbolOrNil == #cypress ifTrue:[
+aFormatSymbolOrNil == #xml ifTrue:[
-	suffix := ''.
+	suffix := '.xml'
 ] ifFalse:[
-	aFormatSymbolOrNil == #xml ifTrue:[
-	suffix := '.xml'
-	] ifFalse:[
 	aFormatSymbolOrNil == #sif ifTrue:[
 	    suffix := '.sif'
 	] ifFalse:[
 	    aFormatSymbolOrNil == #binary ifTrue:[
 		suffix := '.cls'
 	    ] ifFalse:[
 		suffix := '.st'
 	    ]
 	]
-	].
 ].
 fileName := fileName , suffix.
 aFormatSymbolOrNil == #binary ifTrue:[
 	self error:'binary must go into separate files' mayProceed:true.
 	^ self
 ].
-aFormatSymbolOrNil == #cypress ifTrue:[
-	saveName := Dialog
-	    requestDirectoryName: (resources string:'FileOut %1 in:' with:(currentProject ? 'selected projects'))
-	    "default: (FileSelectionBox lastFileSelectionDirectory)"
-] ifFalse:[
 saveName := Dialog
 	requestFileNameForSave:(resources string:'FileOut %1 as:' with:(currentProject ? 'selected projects'))
 	default:fileName
 	fromDirectory:(FileSelectionBox lastFileSelectionDirectory).
-].
 "/    fileBox := FileSelectionBox
 "/                    title:(resources string:'FileOut %1 as:' with:(currentProject ? 'selected projects'))
 "/                    okText:(resources string:'FileOut')
 "/                    abortText:(resources string:'Cancel')
 	mgr := SmalltalkInterchangeFileManager newForFileOut.
 	mgr fileName: fileName.
 	self selectedProjectClasses do:[:eachClass |
 	    mgr addClass:eachClass.
 	].
-	Smalltalk allClassesDo:[:eachClass |
+	environment allClassesDo:[:eachClass |
 	    eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
 		|mPckg|
 		mPckg := mthd package.
 		mPckg ~= eachClass package ifTrue:[
 	classesToFileout do:[:eachClass |
 	    eachClass fileOutOn:s.
 	].
-	Smalltalk allClassesDo:[:eachClass |
+	environment allClassesDo:[:eachClass |
 	    eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
 		|mPckg|
 		mPckg := mthd package.
 		(mPckg = currentProject and:[mPckg ~= eachClass package]) ifTrue:[
 	s close.
 	self normalLabel.
 	^ self.
 ].
-aFormatSymbolOrNil == #cypress ifTrue:[
-	mgr := (Smalltalk at:#CypressWriter) new.
-	self showMessage: (resources string:'Writing Cypress package...')
-		   while: [ mgr writePackage: currentProject asCypressPackage to: saveName asFilename ]
-	    inBackground: true.
-	^ self
-].
 self shouldImplement.
 "Modified: / 27-10-2010 / 11:34:45 / cg"
-"Modified: / 02-10-2012 / 11:23:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 projectMenuFileOutBuildSupportFiles
 self selectedProjectsDo:[:packageToCheckIn |
 	self projectMenuFileOutBuildSupportFilesForProject:packageToCheckIn
 	in:dirName
 	withFormat:aFormatSymbolOrNil.
 "/ extensions...
 methodsToFileOut := OrderedCollection new.
-Smalltalk allClassesDo:[:eachClass |
+environment allClassesDo:[:eachClass |
 	eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
 	    |mPckg|
 	    mPckg := mthd package.
 	    (mPckg = currentProject and:[mPckg ~= eachClass package]) ifTrue:[
 	    perProjectInfo := SourceCodeManager revisionsInModule:module directory:directory taggedAs:aSymbolicTag.
 	    perProjectInfo := perProjectInfo ? #().
 	    perProjectInfo := perProjectInfo select:[:info | info key asFilename hasSuffix:'st'].
 	    perProjectInfo := Dictionary withAssociations:perProjectInfo.
-	    classesInImage := Smalltalk allClassesInPackage:eachProject.
+	    classesInImage := environment allClassesInPackage:eachProject.
 	    autoloadedClassesInImage := classesInImage reject:[:cls | cls isLoaded].
 	    classesInImage := classesInImage select:[:cls | cls isLoaded and:[cls isPrivate not]].
 "/            filesInImage := classesInImage collect:[:cls | cls classBaseFilename] as:Set.
 "/            autoloadedFilesInImage := autoloadedClassesInImage collect:[:cls | cls classBaseFilename] as:Set.
 "/            "/ any differences ?
 	projectDefinitionClass isApplicationDefinition ifTrue:[
 	    appClassName := Dialog
 				request:(resources stringWithCRs:'Create initial application class?\(Enter name or cancel)').
 	    appClassName notEmptyOrNil ifTrue:[
-		(appClass := Smalltalk classNamed:appClassName) notNil ifTrue:[
+		(appClass := environment classNamed:appClassName) notNil ifTrue:[
 		    Dialog warn:(resources stringWithCRs:'Application class already exists\(in "%1")' with:appClass package).
 		] ifFalse:[
 		    theCode := '
 ApplicationModel subclass: #''%1''
 instanceVariableNames:'' ''
 		    ] ifFalse:[
 			self
 			    doAcceptClassDefinition:theCode
 			    usingCompiler:Compiler.
 		    ].
-		    appClass := Smalltalk classNamed:appClassName.
+		    appClass := environment classNamed:appClassName.
 		    appClass package:package.
 		    self classMenuGenerateApplicationCodeForClasses:{ appClass }.
 		    appClass instAndClassMethodsDo:[:m | m package:package].
 		].
 	    ] ifFalse:[
 		appClassName := nil "/ for xxx below
 	    ].
 	    defaultStartupClassName := (appClassName ? 'xxx'),'Start'.
-	    (Smalltalk classNamed:defaultStartupClassName) notNil ifTrue:[
+	    (environment classNamed:defaultStartupClassName) notNil ifTrue:[
 		defaultStartupClassName := nil
 	    ].
 	    startupClassName := Dialog
 				    request:(resources
 					stringWithCRs:'Create startup class (e.g. main)?\(Enter name or cancel)')
 				    initialAnswer:defaultStartupClassName.
 	    startupClassName notEmptyOrNil ifTrue:[
-		(startupClass := Smalltalk classNamed:startupClassName) notNil ifTrue:[
+		(startupClass := environment classNamed:startupClassName) notNil ifTrue:[
 		    Dialog warn:(resources stringWithCRs:'Startup class already exists\(in "%1")' with:startupClass package).
 		] ifFalse:[
 		    theCode := '
 StandaloneStartup subclass: #''%1''
 instanceVariableNames:'' ''
 			change name:('Create startup class %1' bindWith:startupClassName).
 			RefactoryChangeManager performChange:change
 		    ] ifFalse:[
 			self doAcceptClassDefinition:theCode usingCompiler:Compiler.
 		    ].
-		    (startupClass := Smalltalk classNamed:startupClassName) notNil ifTrue:[
+		    (startupClass := environment classNamed:startupClassName) notNil ifTrue:[
 			startupClass package:package.
 		    ]
 		].
 		"/ update the classList, again
 	    self selectClass:(appClass ? startupClass ? projectDefinitionClass).
 	]
 ].
 "Modified: / 23-07-2012 / 13:44:04 / cg"
+"Modified: / 04-09-2013 / 17:46:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 projectMenuProperties
 |project defClass|
 classesToRemove := IdentitySet new.
 methodsToRemove := IdentitySet new.
 "/ classes ...
 "/ ... and individual methods (extensions)
-Smalltalk allClassesDo:[:aClass |
+environment allClassesDo:[:aClass |
 	(aClass package = projectToRemove) ifTrue:[
 	    classesToRemove add:aClass.
 	] ifFalse:[
 	    aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
 		(mthd package = projectToRemove) ifTrue:[
 (missingName := defClass allClassNames "compiled_classNames"
 	detect:[:aName |
 	    |cls|
-	    cls := Smalltalk at:aName asSymbol.
+	    cls := environment at:aName asSymbol.
 	    cls isNil
 	]
 	ifNone:nil)
 notNil ifTrue:[
 	(Dialog confirm:(resources stringWithCRs:'Some class (%1) from the list of compiled classes is missing in the image!!\\Continue anyway ?'
 whichFile = 'abbrev.stc' ifTrue:[
 	(defClass compiled_classNames
 	    contains:[:aName |
 		|cls|
-		cls := Smalltalk at:aName asSymbol.
+		cls := environment at:aName asSymbol.
 		cls notNil and:[cls isLoaded not]
 	    ])
 	ifTrue:[
 	    (Dialog confirm:'Autoload missing class(es) ?\\Notice: generated abbrev.stc file is wrong if autoloaded classes are unloaded' withCRs) ifTrue:[
 		defClass compiled_classNames do:[:aName |
-		    (Smalltalk at:aName asSymbol) autoload
+		    (environment at:aName asSymbol) autoload
 		].
 	    ].
 	].
 ].
 (missingName := defClass allClassNames "compiled_classNames"
 	detect:[:aName |
 	    |cls|
-	    cls := Smalltalk at:aName asSymbol.
+	    cls := environment at:aName asSymbol.
 	    cls isNil
 	]
 	ifNone:nil)
 notNil ifTrue:[
 	(Dialog confirm:(resources stringWithCRs:'Some class (%1) from the list of compiled classes is missing in the image!!\\Continue anyway ?'
 whichFile = 'abbrev.stc' ifTrue:[
 	(defClass compiled_classNames
 	    contains:[:aName |
 		|cls|
-		cls := Smalltalk at:aName asSymbol.
+		cls := environment at:aName asSymbol.
 		cls notNil and:[cls isLoaded not]
 	    ])
 	ifTrue:[
 	    (Dialog confirm:'Autoload missing class(es) ?\\Notice: generated abbrev.stc file is wrong if autoloaded classes are unloaded' withCRs) ifTrue:[
 		defClass compiled_classNames do:[:aName |
-		    (Smalltalk at:aName asSymbol) autoload
+		    (environment at:aName asSymbol) autoload
 		].
 	    ].
 	].
 ].
 "/            containers := SourceCodeManager getExistingContainersInModule:module package:package.
 "/            containers := containers select:[:each | (each startsWith:'.') not].
 	    classesInProject := IdentitySet new.
-	    Smalltalk allClassesDo:[:aClass |
+	    environment allClassesDo:[:aClass |
 		(packageToCheck = aClass package) ifTrue:[
 		    aClass isPrivate ifFalse:[
 			aClass isObsolete ifTrue:[
 			    Transcript showCR:'skipping obsolete class: ' , aClass name.
 			] ifFalse:[
 projectListView2 := ApplicationSubView new client:projectList2.
 projectList1 selectedProjects value:packagesToFindMissing.
 projectList2 selectedProjects value:#('stx').
-packageHull := [:packageIDs | Smalltalk allProjectIDs select:[:p | packageIDs
+packageHull := [:packageIDs | environment allProjectIDs select:[:p | packageIDs
 									contains:[:packageId |
 									    p = packageId
 									    or:[ (p startsWith:packageId,':')
 									    or:[ (p startsWith:packageId,'/') ]]]
 								  ]
 ].
 packagesToFindMissing := projectList1 selectedProjects value.
 packagesToFindCalled := projectList2 selectedProjects value.
-classesToFindMissing := Smalltalk allClasses select:[:cls |
+classesToFindMissing := environment allClasses select:[:cls |
 				|p|
 				p := cls package.
 				p notNil
 				    and:[cls isPrivate not
 										or:[(p startsWith:(p2,'/'))
 										or:[p startsWith:(p2,':')]]]]]
 			    ].
 classesToFindMissing := classesToFindMissing asOrderedCollection sort:[:a :b | a name < b name].
-classesToFindCalled := Smalltalk allClasses select:[:cls |
+classesToFindCalled := environment allClasses select:[:cls |
 				|p|
 				p := cls package.
 				p notNil
 				    and:[cls isPrivate not
 selectedProjectsDo:aBlock
 |selectedProjects allProjects|
 selectedProjects := self selectedProjects value ? #().
 (selectedProjects includes:(BrowserList nameListEntryForALL)) ifTrue:[
-	allProjects := Smalltalk allClasses collect:[:eachClass | eachClass package] as:Set.
+	allProjects := environment allClasses collect:[:eachClass | eachClass package] as:Set.
 	selectedProjects := allProjects select:[:each| each notNil].
 ].
 selectedProjects := selectedProjects asOrderedCollection.
 selectedProjects sort do:aBlock
 !
 	where is: #newBrowser - open a new browser showing the projects
 	where is: #newBuffer  - add a new buffer showing the projects"
 |classes title|
-classes := Smalltalk allClasses
+classes := environment allClasses
-		select:[:each | (projects includes:each package) not].
+		reject:[:each | (projects includes:each package) ].
 projects size == 1 ifTrue:[
 	title := 'Extensions for Project ''' , projects first , ''''
 ] ifFalse:[
 	title := 'Extensions for Projects'
 		    list:list
 		    entryCompletionBlock:(DoWhatIMeanSupport classNameEntryCompletionBlock).
 newClassName isNil ifTrue:[^ self].
 (newClassName startsWith:'---- ') ifTrue:[^ self].
-newClass := Smalltalk classNamed:newClassName.
+newClass := environment classNamed:newClassName.
 newClass isNil ifTrue:[
 	self warn:'no such class: ', newClassName.
 	^ self
 ].
 LastNewProtocols notEmptyOrNil ifTrue:[
 	suggestion := LastNewProtocols first.
 ].
 "/    allMethodCategories := Set new.
-"/    Smalltalk allBehaviorsDo:[:eachClass |
+"/    environment allBehaviorsDo:[:eachClass |
 "/        allMethodCategories addAll:eachClass categories
 "/    ].
 "/
 SharedMethodCategoryCache isNil ifTrue:[
 	SharedMethodCategoryCache := MethodCategoryCache new
 ].
 someCategories := someCategories asOrderedCollection sort.
 someCategories notEmpty ifTrue:[
 	someCategories add:''.
 ].
-someCategories addAll:(Smalltalk allMethodCategories select:[:cat | (someCategories includes:cat) not]) asOrderedCollection sort.
+someCategories addAll:(environment allMethodCategories reject:[:cat | (someCategories includes:cat) ]) asOrderedCollection sort.
 newCategory := self
 			askForMethodCategory:msg
 			title:'Rename MethodCategory'
 			okLabel:'Rename'
 pattern := Dialog request:'Match pattern for protocols:' initialAnswer:(self theSingleSelectedProtocol ? '').
 pattern size == 0 ifTrue:[^ self].
 pattern := pattern string.
 matchingProtocols := Set new.
-Smalltalk allClassesAndMetaclassesDo:[:eachClass |
+environment allClassesAndMetaclassesDo:[:eachClass |
 	eachClass isLoaded ifTrue:[
 	    eachClass categories do:[:cat |
 		(pattern match:cat) ifTrue:[
 		    matchingProtocols add:cat.
 		]
 				protocols := protocolList.
 				"/ protocols := (brwsr selectedProtocols value) ? protocolList.
 				all := protocols includes:(BrowserList nameListEntryForALL).
 				self withWaitCursorDo:[
-				    Smalltalk allClassesAndMetaclassesDo:[:eachClass |
+				    environment allClassesAndMetaclassesDo:[:eachClass |
 					eachClass categories do:[:cat |
 					    (all or:[protocols includes:cat]) ifTrue:[
 						whatToDo value:eachClass value:cat.
 					    ]
 					]
 singleClass ifTrue:[
 	className includesMatchCharacters ifFalse:[
 	    currentNamespace := self currentNamespace.
-	    aliases := Smalltalk
+	    aliases := environment
 			keysAndValuesSelect:[:nm :val | (nm sameAs:classNameArg) ]
 			thenCollect:[:nm :val | val isNil
 						    ifTrue:[ nil ]
 						    ifFalse:[
 							val isBehavior
 	].
 	^ self.
 ].
 className includesMatchCharacters ifFalse:[
-	class := Smalltalk at:className asSymbol.
+	class := environment at:className asSymbol.
 	class isBehavior ifTrue:[
 	    classes := IdentitySet with:class
 	]
 ] ifTrue:[
-	classes := Smalltalk allClasses select:[:each | className match:each name] as:IdentitySet.
+	classes := environment allClasses select:[:each | className match:each name] as:IdentitySet.
 ].
 classes size == 0 ifTrue:[
 	^ self warn:'No className matches'.
 ].
 	    |searchPattern matchingSelectors|
 	    searchPattern := box contents.
 	    searchPattern includesMatchCharacters ifTrue:[
 		matchingSelectors := Set new.
-		Smalltalk allMethodsWithSelectorDo:[:eachMethod :eachSelector |
+		environment allMethodsWithSelectorDo:[:eachMethod :eachSelector |
 		    (searchPattern match:eachSelector) ifTrue:[
 			matchingSelectors add:eachSelector.
 		    ].
 		].
 		box list:(matchingSelectors asOrderedCollection sort).
 	    box topView withWaitCursorDo:[
 		s := contents withoutSpaces.
 		s includesMatchCharacters ifTrue:[
 		    matchBlock value
 		] ifFalse:[
-		    what := Smalltalk selectorCompletion:s.
+		    what := DoWhatIMeanSupport selectorCompletion:s inEnvironment:environment.
 		    longest := what first.
 		    matching := what last.
 		    box list:matching.
 		    box contents:longest.
 		    matching size ~~ 1 ifTrue:[
 	box contents size > 0 ifTrue:[
 	    entryCompletionBlock value:(box contents).
 	].
 	box showAtPointer.
 ] valueWithRestart
+"Modified: / 04-09-2013 / 17:41:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 searchMenuFindResponseTo
 self
 	askForSelector:'Goto implementation of (if sent to instances of selected class):\(the list below represents the full protocol)' withCRs
 	m := self anySelectedMethod.
 	currentClass := m mclass.
 ].
 LastMethodMoveOrCopyTargetClass notNil ifTrue:[
-	initial := Smalltalk classNamed:LastMethodMoveOrCopyTargetClass.
+	initial := environment classNamed:LastMethodMoveOrCopyTargetClass.
 	initial notNil ifTrue:[
 	    (currentClass notNil and:[currentClass theNonMetaclass name = initial name]) ifTrue:[
 		initial := nil
 	    ]
 	].
 self rememberLastProjectMoveTo:newProject.
 classesChanged do:[:eachClass |
 	eachClass changed:#projectOrganization.
-	Smalltalk changed:#projectOrganization with:(Array with:eachClass theNonMetaclass with:(methods select:[:m | m mclass == eachClass])).
+	environment changed:#projectOrganization with:(Array with:eachClass theNonMetaclass with:(methods select:[:m | m mclass == eachClass])).
 ].
 "Created: / 17-02-2000 / 23:04:45 / cg"
 "Modified: / 23-11-2006 / 17:02:10 / cg"
 !
 !
 renameMethod:oldSelector in:aClass
 |newSelector tree dialog args newArgs map refactoring rslt
 renameSelectedMethodsOnly renameOnly rewriteLocalSendersOnly
+rewritePackageLocalSendersOnly
 affectedClasses classesOfSelectedMethods suggestion|
 RBParser isNil ifTrue:[
 	Dialog warn:'Missing class: RBParser'.
 	^ self
 LastRenamedNew := newSelector.
 renameSelectedMethodsOnly := dialog isRenameSelectedMethodsOnly.
 renameOnly := dialog isRenameOnly.
 rewriteLocalSendersOnly := dialog isRewritingLocalSendersOnly.
+rewritePackageLocalSendersOnly := dialog isRewritingPackageLocalSendersOnly.
 refactoring := RenameMethodRefactoring
 				renameMethod: oldSelector
 				in: aClass
 				to: newSelector
 				permuation: map.
 refactoring suppressRewriteOfSenders:renameOnly.
 renameOnly ifFalse:[
 	affectedClasses := rewriteLocalSendersOnly
-				ifTrue:[ Smalltalk allClasses ]
+				ifTrue:[ environment allClasses ]
-				ifFalse:[ aClass withAllSubclasses ].
+				ifFalse:[
+				    rewritePackageLocalSendersOnly
+					ifTrue:[ environment allClassesInPackage:aClass package ]
+					ifFalse:[ aClass withAllSubclasses ]].
 	"/ ask if so many methods should be rewritten; give chance to cancel
-	"/ JV: but not if refactorings are confimed anyway in performRefactoring:...
-	UserPreferences current confirmRefactorings ifFalse:[
 	(self findSendersOf:oldSelector in:affectedClasses andConfirmRefactoring:refactoring) ifFalse:[ ^ self ].
-	].
 ].
 renameSelectedMethodsOnly ifTrue:[
 	(self selectedMethodsValue collect:[:m | m selector] as:Set) size == 1 ifFalse:[
 	    Dialog warn:'Multiple different selectors selected'.
 dialog browseChangedMethodsHolder value ifTrue:[
 	self spawnMethodImplementorsBrowserFor:(Array with:newSelector) match:false in:#newBrowser
 ].
 "Modified: / 28-02-2012 / 16:28:12 / cg"
-"Modified: / 10-05-2012 / 13:06:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 selectVariableForMoveMethod
 self halt:'not yet needed'.
 ^ nil.
 "/ a good default is the grand majority of other implementations (works often)
 "/ majority is defined: more than 2/3 of the other impls are in a particular package:
 projectsOfOtherImplementations := affectedMethods
 					collectAll:[:eachMethod |
-					    (Smalltalk allImplementorsOf:eachMethod selector)
+					    (environment allImplementorsOf:eachMethod selector)
 						collect:[:cls | (cls compiledMethodAt:eachMethod selector) package]
 					] as: Bag.
 "/ Transcript show:'all: '; show:projectsOfOtherImplementations size; show:' this: '; showCR:projectsOfOtherImplementations sortedCounts first.
 (projectsOfOtherImplementations notEmpty
 	    initialAnswer := 'testing'.
 	].
 ].
 "/ add actual categories of selected methods
-(SystemBrowser findImplementorsOfAny:selectors in:(Smalltalk allClasses) ignoreCase:false)
+(SystemBrowser findImplementorsOfAny:selectors in:(environment allClasses) ignoreCase:false)
 do:[:otherMethod |
 	|cat|
 	(methodSelection includesIdentical:otherMethod) ifFalse:[
 	    cat := otherMethod category.
 methodsToRemove := self selectedMethodsValue copy.
 self withSearchCursorDo:[
 	"/ search through all of the system
-	Smalltalk allMethodsDo:[:mthd |
+	environment allMethodsDo:[:mthd |
 	    |sent resources newFound any|
 	    any := false.
 	    mthd literalsDo:[:eachLiteral |
 		 (selectorsToRemove includes:eachLiteral) ifTrue:[any := true].
 	    |methodListGenerator generator theMethodList|
 	    searchBlock := [:whichMethod |
 				| sentMessages |
 				sentMessages := whichMethod messagesSent.
-				self class findImplementorsOfAny:sentMessages in:(Smalltalk allClasses) ignoreCase:false.
+				self class findImplementorsOfAny:sentMessages in:(environment allClasses) ignoreCase:false.
 			   ].
 	    generator := Iterator on:[:whatToDo |
 					    theMethodList isNil ifTrue:[
 						theMethodList := searchBlock value:aMethod.
 self
 	spawnMethodImplementorsBrowserFor:aSelectorCollection
 	match:doMatch
 	in:openHow
-	classes:Smalltalk allClasses
+	classes:environment allClasses
 	label:'Implementors'
 "Modified: / 05-09-2006 / 11:07:20 / cg"
 !
 						    ignoreCase:false
 						)
 				] ifFalse:[
 				    list addAll:(self class
 						    findImplementorsOf:aSelector
-						    in:Smalltalk allClasses
+						    in:environment allClasses
 						    ignoreCase:false
 						)
 				].
 			    ].
 			    list := list asOrderedCollection
 "open a new browser or add a buffer showing the selected methods senders only"
 self
 	spawnMethodSendersBrowserFor:aSelectorCollection
 	in:openHow
-	classes:Smalltalk allClasses
+	classes:environment allClasses
 	label:'Senders'
 "Modified: / 13-02-2012 / 13:17:20 / cg"
 !
 			    cachedList notNil ifTrue:[
 				l := cachedList.
 				cachedList := nil
 			    ] ifFalse:[
 				l := OrderedCollection new.
-				Smalltalk allClasses
+				environment allClasses
 				    do:[:eachClass |
 					l addAll:(eachClass extensions
 						    select:[:extensionMethod |
 							(packages includes:extensionMethod package)])
 				    ].
 	    searchBlock := [:whichMethod | |selector|
 				selector := whichMethod selector.
 				selector isNil ifTrue:[
 				    #()
 				] ifFalse:[
-				    self class allCallsOn:selector in:(Smalltalk allClasses) ignoreCase:false match:false.
+				    self class allCallsOn:selector in:(environment allClasses) ignoreCase:false match:false.
 				].
 			   ].
 	    generator := Iterator on:[:whatToDo |
 					    theMethodList isNil ifTrue:[
 classes := self classesToSearchForVariable.
 varType == #poolVarNames ifTrue:[
 	"/ also check classes which refer to that pool
 	copyOfClasses := IdentitySet withAll:classes.
-	Smalltalk allClassesDo:[:someOtherClass |
+	environment allClassesDo:[:someOtherClass |
 	    (someOtherClass sharedPools includesAny:copyOfClasses) ifTrue:[
 		classes add:someOtherClass.
 	    ]
 	].
 ].
 		instCount := instCount + 1.
 	    ] ifFalse:[
 		subInstCount := subInstCount + 1
 	    ]
 	].
-	classes := classes collect:[:eachName | Smalltalk classNamed:eachName].
+	classes := classes collect:[:eachName | environment classNamed:eachName].
 	(instCount == 0 and:[subInstCount == 0]) ifTrue:[
 	    self warn:(resources
 			string:'There are currently no instances or subInstances of %1.'
 			with:currentClass name allBold).
 		itemLabel := self historyMenuItemLabelFor:entry.
 		item := MenuItem label:itemLabel.
 		item itemValue:#'switchToFindHistoryEntry:' argument:entry.
 		m addItem:item.
-		(Smalltalk classNamed:(entry className ? '?')) isBehavior ifFalse:[
+		(environment classNamed:(entry className ? '?')) isBehavior ifFalse:[
 		    item enabled:false.
 		    item label:(LabelAndIcon icon:(ToolbarIconLibrary erase16x16Icon2) string:itemLabel)
 		].
 	    ].
 	].
 self selectedMethodsDo:[:m |
 	m literalsDo:[:lit |
 	    |cls ns|
 	    lit isSymbol ifTrue:[
-		(((cls := Smalltalk at:lit) notNil and:[ cls isBehavior ])
+		(((cls := environment at:lit) notNil and:[ cls isBehavior ])
 		"JV@2011-11-25: Added check if the nameSpace is really a namespace, it may be
 		 a class if m mclass is a privateClass...
 		 ---------------------------------------------v"
 		or:[ m mclass notNil
 		     and:[ (ns := m mclass nameSpace) notNil
 	m addItem:item.
 ].
 ^ m
 "Created: / 26-10-2011 / 18:15:01 / cg"
-"Modified (comment): / 25-11-2011 / 21:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 09-09-2012 / 13:17:27 / cg"
+"Modified: / 04-09-2013 / 17:43:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 goBackInGlobalHistoryMenu
 <resource: #programMenu>
 |classes sel box theClassName|
 classes := OrderedCollection new.
 (sel := aSelectorString asSymbolIfInterned) notNil ifTrue:[
-	Smalltalk allClassesDo:[:aClass |
+	environment allClassesDo:[:aClass |
 	    (aClass includesSelector:sel) ifTrue:[
 		classes add:aClass.
 	    ].
 	    (aClass class includesSelector:sel) ifTrue:[
 		classes add:aClass class.
 !
 switchToClassNameMatching:aMatchString
 |className class|
-class := Smalltalk classNamed:aMatchString.
+class := environment classNamed:aMatchString.
 class notNil ifTrue:[
 	self switchToClass:class
 ] ifFalse:[
 	className := self askForClassNameMatching:aMatchString.
 aMatchString isEmptyOrNil ifTrue:[
 	^ self.
 ].
 aMatchString knownAsSymbol ifTrue:[
-	class := Smalltalk classNamed:aMatchString.
+	class := environment classNamed:aMatchString.
 	class notNil ifTrue:[
 	    self switchToClass:class.
 	    ^ self.
 	].
-	classesMatchingCaseless := Smalltalk keys select:[:nm | nm sameAs:aMatchString].
+	classesMatchingCaseless := environment keys select:[:nm | nm sameAs:aMatchString].
 "/        matchStringLowercase := aMatchString asLowercase.
-"/        classesWithPrefixCaseless := Smalltalk keys select:[:nm | nm asLowercase startsWith:aMatchString].
+"/        classesWithPrefixCaseless := environment keys select:[:nm | nm asLowercase startsWith:aMatchString].
-"/        impl := Smalltalk allImplementorsOf:aMatchString asSymbol.
+"/        impl := environment allImplementorsOf:aMatchString asSymbol.
 "/        impl notEmptyOrNil ifTrue:[
 "/        ].
 	(aMatchString first isLetter not
 	 or:[ aMatchString first isLowercase]) ifTrue:[
-	    implementors := SystemBrowser findImplementorsMatching:aMatchString in:(Smalltalk allClasses) ignoreCase:true.
+	    implementors := SystemBrowser findImplementorsMatching:aMatchString in:(environment allClasses) ignoreCase:true.
 	    implementors size > 0 ifTrue:[
 		(classesMatchingCaseless isEmpty and:[implementors size == 1]) ifTrue:[
 		    answer := Dialog
 			confirm:(resources
 					stringWithCRs:'No class named "%1".\But "%2" implements it. Go there ?'
 		answer == #browseAllImplementors ifTrue:[
 		    self
 			spawnMethodBrowserForSearch:[
 				SystemBrowser
 				    findImplementorsOf:aMatchString
-				    in:Smalltalk allClasses
+				    in:environment allClasses
 				    ignoreCase:false.
 			    ]
 			sortBy:#class
 			in:#newBuffer
 			label:(resources string:'Implementors of %1' string with:aMatchString).
 		    ^ self
 		].
 		answer ~~ #searchClass ifTrue:[
 		    answer isSymbol ifTrue:[
-			self switchToClass:(Smalltalk classNamed:answer).
+			self switchToClass:(environment classNamed:answer).
 		    ] ifFalse:[
 			self switchToClass:(answer mclass) selector:(answer selector).
 		    ].
 		    ^ self.
 		].
 	    ].
 	].
 ].
-"Look for Java class..."
-(JAVA notNil and:[aMatchString includes: $.]) ifTrue:[
-	| javaClass |
-	javaClass := Java at: aMatchString.
-	javaClass notNil ifTrue:[
-	    self switchToClass: javaClass.
-	    ^self
-	].
-].
 className := self askForClassNameMatching:aMatchString.
 className notNil ifTrue:[
 	self switchToClassNamed:className.
 ]
 "Modified: / 04-07-2006 / 18:48:25 / fm"
 "Modified (comment): / 07-03-2012 / 12:05:07 / cg"
-"Modified: / 20-04-2012 / 19:44:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 switchToClassNamed:aString
 |str theClass|
 |cls|
 entry isNil ifTrue:[^ self].
-cls := Smalltalk at:entry className.
+cls := environment at:entry className.
 cls isNil ifTrue:[
 	self warn:'Oops - class is gone'.
 	^ self
 ].
 entry meta ifTrue:[
 or a block, or a pair containing class- and methodlist search selectors.
 searchWhat is a symbol such as #selector, #code etc.
 "
-|restart dialog|
+|dialog|
 dialog := SearchDialog new
 	showMetaFilter:true;
 	setupToAskForMethodSearchTitle:title
 	forBrowser:self
 	allowFind:(self navigationState isMethodBrowser)
 	allowBuffer:true
 	allowBrowser:true
 	withTextEntry:withTextEntry.
-restart := Signal new.
+[:restart|
-restart
+	dialog askThenDo:[
-	handle:[:ex |
+	    |classes string ignoreCase openHow match methods isMethod searchAction|
-	    ex restart
-	]
+	    classes := dialog classesToSearch.
-	do:[
+	    string := dialog selectorToSearch.
-	    dialog askThenDo:[
+	    ignoreCase := dialog searchIgnoringCase.
-		|classes string ignoreCase openHow match methods isMethod searchAction|
+	    openHow := dialog openHow.
+	    match := dialog searchWithMatch.
-		classes := dialog classesToSearch.
+	    methods := dialog methodsToSearch.
-		string := dialog selectorToSearch.
+	    isMethod := dialog matchMethods.
-		ignoreCase := dialog searchIgnoringCase.
-		openHow := dialog openHow.
+	    self withSearchCursorDo:[
-		match := dialog searchWithMatch.
+		|initialList list newBrowser numFound label
-		methods := dialog methodsToSearch.
+		 selector entities arguments numArgs answer
-		isMethod := dialog matchMethods.
+		 alternativeSelector question altArguments t|
-		self withSearchCursorDo:[
+		aSelectorOrBlock isArray ifTrue:[
-		    |initialList list newBrowser numFound label
+		    classes notNil ifTrue:[
-		     selector entities arguments numArgs answer
+			selector := aSelectorOrBlock first.
-		     alternativeSelector question altArguments t|
+			entities := classes.
+		    ] ifFalse:[
-		    aSelectorOrBlock isArray ifTrue:[
+			selector := aSelectorOrBlock second.
-			classes notNil ifTrue:[
+			entities := methods.
-			    selector := aSelectorOrBlock first.
+		    ].
-			    entities := classes.
+		    numArgs := selector numArgs.
+		] ifFalse:[
+		    entities := classes.
+		    aSelectorOrBlock isSymbol ifTrue:[
+			selector := aSelectorOrBlock.
+		    ] ifFalse:[
+			selector := nil
+		    ].
+		    numArgs := aSelectorOrBlock numArgs.
+		].
+		(selector notNil
+		and:[ (selector numArgs == 1)
+		and:[ (selector endsWith:'In:') or:[ selector endsWith:'inMethods:' ]]]) ifTrue:[
+		    arguments := Array with:entities
+		] ifFalse:[
+		    arguments := (Array
+					with:string
+					with:entities
+					with:((selector notNil and:[selector endsWith:'isMethod:']) ifTrue:[isMethod] ifFalse:[ignoreCase])
+					with:match
+				  ) copyTo:numArgs.
+		].
+		searchAction :=
+		    [
+			|result moreResults extensionMethods arguments2|
+			selector notNil ifTrue:[
+			    result := self class perform:selector withArguments:arguments.
 			] ifFalse:[
-			    selector := aSelectorOrBlock second.
+			    result := aSelectorOrBlock valueWithArguments:arguments
-			    entities := methods.
 			].
-			numArgs := selector numArgs.
+			"/ sorry for this special case: when searching in a package,
-		    ] ifFalse:[
+			"/ also search extensionMethods
-			entities := classes.
+			dialog searchAreaSelected == #currentPackage ifTrue:[
-			aSelectorOrBlock isSymbol ifTrue:[
+			    aSelectorOrBlock isArray ifTrue:[
-			    selector := aSelectorOrBlock.
+				"/ findSendersOf:inMethods:ignoreCase:match:
+				extensionMethods := environment allExtensionsForPackage:(dialog currentPackage).
+				arguments2 := arguments copy.
+				arguments2 at:2 put:extensionMethods.
+				moreResults := self class perform:(aSelectorOrBlock at:2) withArguments:arguments2.
+				result := result , moreResults.
+			    ]
+			].
+			dialog metaclassesOnly ifTrue:[
+			    result := result select:[:m | m mclass isMeta]
 			] ifFalse:[
-			    selector := nil
+			    dialog classesOnly ifTrue:[
-			].
+				result := result reject:[:m | m mclass isMeta]
-			numArgs := aSelectorOrBlock numArgs.
-		    ].
-		    (selector notNil
-		    and:[ (selector numArgs == 1)
-		    and:[ (selector endsWith:'In:') or:[ selector endsWith:'inMethods:' ]]]) ifTrue:[
-			arguments := Array with:entities
-		    ] ifFalse:[
-			arguments := (Array
-					    with:string
-					    with:entities
-					    with:((selector notNil and:[selector endsWith:'isMethod:']) ifTrue:[isMethod] ifFalse:[ignoreCase])
-					    with:match
-				      ) copyTo:numArgs.
-		    ].
-		    searchAction :=
-			[
-			    |result moreResults extensionMethods arguments2|
-			    selector notNil ifTrue:[
-				result := self class perform:selector withArguments:arguments.
-			    ] ifFalse:[
-				result := aSelectorOrBlock valueWithArguments:arguments
-			    ].
-			    "/ sorry for this special case: when searching in a package,
-			    "/ also search extensionMethods
-			    dialog searchAreaSelected == #currentPackage ifTrue:[
-				aSelectorOrBlock isArray ifTrue:[
-				    "/ findSendersOf:inMethods:ignoreCase:match:
-				    extensionMethods := Smalltalk allExtensionsForPackage:(dialog currentPackage).
-				    arguments2 := arguments copy.
-				    arguments2 at:2 put:extensionMethods.
-				    moreResults := self class perform:(aSelectorOrBlock at:2) withArguments:arguments2.
-				    result := result , moreResults.
-				]
-			    ].
-			    dialog metaclassesOnly ifTrue:[
-				result := result select:[:m | m mclass isMeta]
-			    ] ifFalse:[
-				dialog classesOnly ifTrue:[
-				    result := result select:[:m | m mclass isMeta not]
-				].
-			    ].
-			    result
-			].
-		    t := TimeDuration toRun:
-			[
-			    false "classes size > 1" ifTrue:[
-				self
-				    showMessage:'Searching...'
-				    while:[
-					initialList := searchAction value.
-				    ]
-			    ] ifFalse:[
-				initialList := searchAction value.
 			    ].
 			].
+			result
-		    label := labelHolderOrBlock value.
+		    ].
-		    numFound := initialList size.
+		t := TimeDuration toRun:
-		    numFound == 0 ifTrue:[
+		    [
-			question := resources stringWithCRs:label with:((string ? '') allBold colorizeAllWith:Color red darkened).
+			false "classes size > 1" ifTrue:[
-			question := question , (resources string:' - none found.').
+			    self
+				showMessage:'Searching...'
-			((selector == #findImplementors:in:ignoreCase:match:)
+				while:[
-			and:[ (arguments first numArgs == 0)
+				    initialList := searchAction value.
-			and:[
+				]
-				string := ((arguments at:1),':') asSymbol.
-				altArguments := arguments copy.
-				altArguments at:1 put:string.
-				initialList := self class perform:selector withArguments:altArguments.
-				numFound := initialList size.
-				numFound ~~ 0
-			]]) ifTrue:[
-			    question := question,(resources stringWithCRs:'\\But there are %1 implementations of %2 (with colon).\Browse those ?' with:numFound with:(altArguments first)).
-			    answer := Dialog
-				confirmWithCancel:question
-				labels:(resources array:#('Cancel' 'Search Again' 'Yes'))
-				default:2.
-			    answer isNil ifTrue:[
-				^ self
-			    ].
-			    answer ifFalse:[
-				restart raiseRequest
-			    ].
-			    arguments := altArguments.
 			] ifFalse:[
-			    answer := Dialog
+			    initialList := searchAction value.
-				confirm:question
-				yesLabel:(resources string:'Search Again')
-				noLabel:(resources string:'Cancel').
-			    answer ifFalse:[
-				^ self
-			    ].
-			    restart raiseRequest
 			].
 		    ].
-		    (initialList asSet = self selectedMethodsValue asSet)
+		label := labelHolderOrBlock value.
-		    "/ (numFound == 1 and:[initialList first == self theSingleSelectedMethod])
-		    ifTrue:[
+		numFound := initialList size.
+		numFound == 0 ifTrue:[
+		    question := resources stringWithCRs:label with:((string ? '') allBold colorizeAllWith:Color red darkened).
+		    question := question , (resources string:' - none found.').
+		    ((selector == #findImplementors:in:ignoreCase:match:)
+		    and:[ (arguments first numArgs == 0)
+		    and:[
+			    string := ((arguments at:1),':') asSymbol.
+			    altArguments := arguments copy.
+			    altArguments at:1 put:string.
+			    initialList := self class perform:selector withArguments:altArguments.
+			    numFound := initialList size.
+			    numFound ~~ 0
+		    ]]) ifTrue:[
+			question := question,(resources stringWithCRs:'\\But there are %1 implementations of %2 (with colon).\Browse those ?' with:numFound with:(altArguments first)).
 			answer := Dialog
-			    confirmWithCancel:((resources stringWithCRs:label with:(string ? 'messages') allBold)
+			    confirmWithCancel:question
-					       , '.\\' withCRs
+			    labels:(resources array:#('Cancel' 'Search Again' 'Yes'))
-					       , (resources stringWithCRs:'Only the selected method(s) found.\Browse anyway ?'))
-			    labels:(resources array:#('Cancel' 'Search Again' 'Yes' ))
-			    values:#(nil #again true)
 			    default:2.
-			answer == nil ifTrue:[
+			answer isNil ifTrue:[
 			    ^ self
 			].
-			answer == #again ifTrue:[
+			answer ifFalse:[
-			    restart raiseRequest
+			    restart value.
-			]
+			].
+			arguments := altArguments.
+		    ] ifFalse:[
+			answer := Dialog
+			    confirm:question
+			    yesLabel:(resources string:'Search Again')
+			    noLabel:(resources string:'Cancel').
+			answer ifFalse:[
+			    ^ self
+			].
+			restart value.
 		    ].
+		].
-		    newBrowser := self
-				    spawnMethodBrowserForSearch:[
+		(initialList asSet = self selectedMethodsValue asSet)
-					    initialList notNil ifTrue:[
+		"/ (numFound == 1 and:[initialList first == self theSingleSelectedMethod])
-						list := initialList.
+		ifTrue:[
-						initialList := nil
+		    answer := Dialog
-					    ] ifFalse:[
+			confirmWithCancel:((resources stringWithCRs:label with:(string ? 'messages') allBold)
-						list := searchAction value
+					   , '.\\' withCRs
-					    ].
+					   , (resources stringWithCRs:'Only the selected method(s) found.\Browse anyway ?'))
-					    list
+			labels:(resources array:#('Cancel' 'Search Again' 'Yes' ))
-					]
+			values:#(nil #again true)
-				    sortBy:#class
+			default:2.
-				    in:openHow
-				    label:(resources string:label string with:string).
+		    answer == nil ifTrue:[
+			^ self
-		    setSearchPatternAction notNil ifTrue:[
-			setSearchPatternAction value:newBrowser value:string value:((selector notNil and:[selector endsWith:'isMethod:']) ifTrue:[isMethod] ifFalse:[ignoreCase]) value:match.
 		    ].
-		    t > 5 seconds ifTrue:[
+		    answer == #again ifTrue:[
-			newBrowser methodListApp autoUpdateOnChange: false.
+			restart value.
-		    ].
+		    ]
-		    ^ newBrowser.
 		].
+		newBrowser := self
+				spawnMethodBrowserForSearch:[
+					initialList notNil ifTrue:[
+					    list := initialList.
+					    initialList := nil
+					] ifFalse:[
+					    list := searchAction value
+					].
+					list
+				    ]
+				sortBy:#class
+				in:openHow
+				label:(resources string:label string with:string).
+		setSearchPatternAction notNil ifTrue:[
+		    setSearchPatternAction value:newBrowser value:string value:((selector notNil and:[selector endsWith:'isMethod:']) ifTrue:[isMethod] ifFalse:[ignoreCase]) value:match.
+		].
+		t > 5 seconds ifTrue:[
+		    newBrowser methodListApp autoUpdateOnChange: false.
+		].
+		^ newBrowser.
 	    ].
 	].
+] valueWithRestart.
 "Modified: / 20-08-2012 / 13:26:06 / cg"
+"Modified: / 04-09-2013 / 17:39:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 askForMethodAndSpawnSearchTitle:title browserLabel:labelHolderOrBlock searchWith:aSelectorOrBlock searchWhat:searchWhat searchArea:whereDefault
 withCaseIgnore:withCaseIgnore withTextEntry:withTextEntry withMethodList:withMethodList setSearchPattern:setSearchPatternAction
 "convenient helper method: setup an enterBox with text from codeView or selected
 	best := what first.
 	box contents:best.
 	idx := shownCategories findFirst:[:l | l startsWith:best].
 	idx == 0 ifTrue:[
 	    allMethodCategories isNil ifTrue:[
-		allMethodCategories := Smalltalk allMethodCategories asArray sort.
+		allMethodCategories := environment allMethodCategories asArray sort.
 	    ].
 	    box list:allMethodCategories.
 	    shownCategories := allMethodCategories.
 	    idx := shownCategories findFirst:[:l | l startsWith:best].
 	].
 "helper for move-class-to-project and move-method-to-ptoject;
 Ask for the new project (package-id)"
 |offered already allProjects classesProjects selectedClasses selectedMethods|
-allProjects := Smalltalk allProjectIDs.
+allProjects := environment allProjectIDs.
 selectedClasses := self selectedClassesValue.
 selectedClasses notNil ifTrue:[
 	classesProjects := selectedClasses
 			    collectAll:[:cls |
 box entryCompletionBlock:[:contents |
 	|s what longest matching|
 	box topView withWaitCursorDo:[
 	    s := contents withoutSpaces.
-	    what := Smalltalk selectorCompletion:s.
+	    what := DoWhatIMeanSupport selectorCompletion:s inEnvironment:environment .
 	    longest := what first.
 	    matching := what last.
 	    box list:matching.
 	    box contents:longest.
 	    matching size ~~ 1 ifTrue:[
 	aBlock value:selector asSymbol value:openHow
 ].
 ^ selector
 "Modified (comment): / 29-08-2013 / 12:16:12 / cg"
+"Modified: / 04-09-2013 / 17:40:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 askIfModified
 "if codeView was modified, return the answer from asking question;
 otherwise, return true"
 classIfValidNonMetaClassName:aClassName
 |class selectedClass ns|
 aClassName isNil ifTrue:[^ nil].
-class := Smalltalk classNamed:aClassName.
+class := environment classNamed:aClassName.
 class isNil ifTrue:[
 	selectedClass := self theSingleSelectedClass.
 	selectedClass notNil ifTrue:[
 	    selectedClass isPrivate ifTrue:[
 		class := (selectedClass owningClass privateClassesAt:aClassName).
 currentNamespace := self theSingleSelectedNamespace.
 listOfNamespaces := self selectedNamespaces value.
 currentNamespace = (BrowserList nameListEntryForALL) ifTrue:[
-	(cls := Smalltalk at:nameSym) notNil ifTrue:[
+	(cls := environment at:nameSym) notNil ifTrue:[
 	    meta ifTrue:[^ cls class].
 	    ^ cls
 	]
 ].
 ("(Array with:Smalltalk) ," (self listOfNamespaces)) do:[:aNamespace |
 		^ cls
 	    ]
 	]
 ].
 currentNamespace ~= (BrowserList nameListEntryForALL) ifTrue:[
-	(cls := Smalltalk at:nameSym) notNil ifTrue:[
+	(cls := environment at:nameSym) notNil ifTrue:[
 	    meta ifTrue:[^ cls class].
 	    ^ cls
 	]
 ].
 (nm startsWith:'Smalltalk::') ifTrue:[
-	cls := Smalltalk classNamed:(nm copyFrom:'Smalltalk::' size + 1).
+	cls := environment classNamed:(nm withoutPrefix:'Smalltalk::').
 	cls notNil ifTrue:[
 	    meta ifTrue:[^ cls class].
 	    ^ cls
 	]
 ].
-"JV@2012-07-30: Search for Java class as well"
-(JAVA notNil and:[nm includes: $/]) ifTrue:[
-	"/Try primordial class loader...
-	cls := JavaVM classNamed: aClassName definedBy: nil.
-	cls notNil ifTrue:[ ^ cls ].
-	"/Try system class loader...
-	cls := JavaVM classNamed: aClassName definedBy: JavaVM systemClassLoader.
-	cls notNil ifTrue:[ ^ cls ].
-].
 ^ nil
-"Created: / 13-02-2000 / 21:15:29 / cg"
+"Created: / 13.2.2000 / 21:15:29 / cg"
-"Modified: / 24-02-2000 / 13:49:44 / cg"
+"Modified: / 24.2.2000 / 13:49:44 / cg"
-"Modified: / 30-07-2012 / 16:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 findClassNamedInNameSpace:aClassName
 "search through current namespaces for aClassName.
 Return the class or nil, if not found."
 |sel nSel mthd classes|
 sel := self selectionInCodeView.
 sel notNil ifTrue:[
-	(sel knownAsSymbol and:[Smalltalk includesKey:sel asSymbol]) ifTrue:[
+	(sel knownAsSymbol and:[environment includesKey:sel asSymbol]) ifTrue:[
 	    ^ sel
 	].
 	"/ validate
 	nSel := (Parser new findBestVariablesFor:sel) first.
 "return a list of considered namespaces"
 |currentNamespace|
 currentNamespace := self currentNamespace.
-currentNamespace isNil ifTrue:[
+(currentNamespace isNil and:[environment == Smalltalk]) ifTrue:[
 	^ Array with:Smalltalk
 ].
 currentNamespace = (BrowserList nameListEntryForALL) ifTrue:[
-	^ self listOfAllNamespaces
+	^ environment listOfAllNamespaces
 ].
 ^ Array with:currentNamespace
-"Modified: / 24.2.2000 / 13:49:20 / cg"
+"Modified: / 24-02-2000 / 13:49:20 / cg"
+"Modified: / 04-09-2013 / 17:44:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 newBrowserOrBufferDependingOn:openHowWanted label:labelOrNil forSpec:spec setupWith:aBlock
 |brwsr openHow|
 (includeChangedPseudoCategory := aCollectionOfCategories includes:(ClassCategoryList nameListEntryForChanged)) ifTrue:[
 	changedClasses := ChangeSet current changedClasses collect:[:cls | cls theNonMetaclass].
 ].
-^ Smalltalk allClassesForWhich:[:aClass |
+^ environment allClassesForWhich:[:aClass |
 	(allCategories
 	    or:[(aCollectionOfCategories includes:aClass category)
 	    or:[includeChangedPseudoCategory and:[changedClasses includes:aClass]]])
 	and:[ (nameSpaceFilter isNil or:[nameSpaceFilter includes:aClass nameSpace name])
 	and:[ (packageFilter isNil or:[packageFilter includes:aClass package]) ]].
 |selectedProjects setOfClasses allIncluded|
 selectedProjects := self selectedProjects value.
 allIncluded := selectedProjects includes:(BrowserList nameListEntryForALL).
-allIncluded ifTrue:[ ^ Smalltalk allClasses ].
+allIncluded ifTrue:[ ^ environment allClasses ].
 setOfClasses := IdentitySet new.
-Smalltalk allClassesDo:[:aClass |
+environment allClassesDo:[:aClass |
 	(selectedProjects includes:aClass package) ifTrue:[
 	    setOfClasses add:aClass .
 	]
 ].
 ^ setOfClasses
 protocols := self selectedProtocolsValue.
 protocols := protocols collect:[:each | each string].
 allIncluded := protocols includes:(BrowserList nameListEntryForALL).
 navigationState isFullProtocolBrowser ifTrue:[
-	targets := Smalltalk allClassesAndMetaclasses
+	targets := environment allClassesAndMetaclasses
 ] ifFalse:[
 	targets := self selectedClassesValue
 ].
 targets isEmptyOrNil ifTrue:[^self].
 |protocols targets allIncluded|
 protocols := self selectedProtocolsValue.
 navigationState isFullProtocolBrowser ifTrue:[
-	targets := Smalltalk allClassesAndMetaclasses
+	targets := environment allClassesAndMetaclasses
 ] ifFalse:[
 	targets := self selectedClassesValue
 ].
 allIncluded := protocols includes:(BrowserList nameListEntryForALL).
 explainTookTooLong := false.
 withTimeout ifTrue:[
 	explanation :=
 	    [ self explanationForCode:code short:short ]
 		    valueWithWatchDog:[explainTookTooLong := true]
-		    afterMilliseconds:100.
+		    afterMilliseconds:200.
 ] ifFalse:[
 	explanation := self explanationForCode:code short:short
 ].
 self activityNotification:nil.
 explainTookTooLong ifTrue:[
 	self showInfo:'Explain took too long - cancelled.'.
 	^ self.
 ].
-explanation notNil ifTrue:[
+explanation notEmptyOrNil ifTrue:[
 	short ifTrue:[
 	    self showInfo:explanation
 	] ifFalse:[
 	    self information:explanation
 	].
 methodImplementorsInfoFor:aMethod
 |implementors msg senders msg2|
 implementors := SystemBrowser
 	findImplementorsOf:aMethod selector
-	in:(Smalltalk allClasses)
+	in:(environment allClasses)
 	ignoreCase:false.
 implementors notEmpty ifTrue:[
 	msg := 'Only implemented here.'.
 	implementors remove:aMethod ifAbsent:nil.
 ].
 false ifTrue:[  "/ too slow
 senders := SystemBrowser
 	findSendersOf:aMethod selector
-	in:(Smalltalk allClasses)
+	in:(environment allClasses)
 	ignoreCase:false.
 senders notEmpty ifTrue:[
 	msg2 := 'Sent from ' , senders size printString, ' methods.'.
 ] ifFalse:[
 	msg2 := 'No senders.'.
 ^[:partialName| | env |
 env := self theSingleSelectedNamespace ? #Smalltalk.
 env = NavigatorModel nameListEntryForALL
 	ifTrue:[env := #Smalltalk].
-env := Smalltalk at: env.
+env := environment at: env.
 partialName isEmptyOrNil
 	ifTrue:
 	    [#('' #())]
 	ifFalse:
 	    [partialName first isUppercase
 	    [
 		syntaxColoringProcessRunning := true.
 		cls := methodsClass.
 		(cls notNil and:[cls isObsolete]) ifTrue:[
 		    cls isMeta ifTrue:[
-			cls := (Smalltalk at:cls theNonMetaclass name) class
+			cls := (environment at:cls theNonMetaclass name) class
 		    ] ifFalse:[
-			cls := Smalltalk at:cls name
+			cls := environment at:cls name
 		    ].
 		].
 		"check after every lengthy operation if modified by user in the meantime..."
 		codeView modified ifFalse:[
 		    oldCodeList := codeView list copy.
 "/ no need to fixup here - I am always installed as subcanvas
 "/ (via noteBookView)
 super postBuildWith:aBuilder.
-Smalltalk addDependent:self.
+environment addDependent:self.
 self codeInfoVisible value ifTrue:[ self codeInfoVisibilityChanged ].
 (self toolBarVisibleHolder value or:[self bookmarkBarVisibleHolder value])
 	    ifTrue:[ self toolBarOrBookmarkBarVisibilityChanged ].
 	(m := navigationState theSingleSelectedMethod) notNil ifTrue:[
 	    self class addToRecentlyClosedHistory:m mclass selector:m selector
 	].
 ].
-Smalltalk removeDependent:self.
+environment removeDependent:self.
 super closeRequest.
 "Created: / 11-02-2000 / 13:23:00 / cg"
 "Modified: / 09-09-2012 / 10:26:14 / cg"
 !
 Class nameSpaceQuerySignal
 answer:(self currentNamespace)
 do:[
 			    ("self canUseRefactoringSupport"
 			     language isSmalltalk
-			     and:[(Smalltalk at:cls theNonMetaclass name)==cls
+			     and:[(environment at:cls theNonMetaclass name)==cls
 			     and:[cls programmingLanguage == language
 			     and:[InteractiveAddMethodChange notNil]]]
 			    ) ifTrue:[
 				"/ cg: Q: is the AddMethodChange prepared for languages ?
 				change := InteractiveAddMethodChange compile:code in:cls classified:cat.
 			    "/ self selectedProtocols setValue:(Array with:rslt category).
 			   self selectProtocols:(Array with:lastMethodCategory).
 			]
 		    ].
-		    "Must check also for protocol as we may be accepting
+		    oldSelector ~= rslt selector ifTrue:[
-		     a method in '* required *' pseudo-protocol and in this case,
-		     method category will change too!!"
-		    (oldSelector ~= rslt selector or:[oldMethod category ~= rslt category]) ifTrue:[
 			self selectedMethods value:(Array with:rslt).
 			"/ self switchToSelector:rslt selector
 		    ] ifFalse:[
 "/                            "/ do not notify myself (to avoid scroll-to-top)
 "/
 ].
 ^ returnValue.
 "Created: / 30-12-2009 / 20:01:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 02-08-2012 / 09:37:29 / cg"
-"Modified: / 07-08-2013 / 13:00:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 04-09-2013 / 17:38:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 askForInitialApplicationCodeFor:aClass
 |cls mcls codeAspect msg|
 	].
 	className = '*' ifTrue:[
 	    ^ classes asArray.
 	].
-	cls := Smalltalk at:className asSymbol.
+	cls := environment at:className asSymbol.
 	cls isNil ifTrue:[
 	    self warn:'No such class - try again'.
 	    ^ nil
 	].
 ].
 		    with:getSelector allBold
 		    with:setSelector allBold) withCRs.
 ].
 [
-	Smalltalk removeDependent:self.   "/ avoid update
+	environment removeDependent:self.   "/ avoid update
 	ClassDescription updateHistoryLineQuerySignal answer:true do:[
 	    (ClassDescription updateChangeFileQuerySignal
 	    , ClassDescription updateChangeListQuerySignal) answer:self suppressChangeSetUpdate not
 	    do:[
 		currentClass perform:setSelector with:theCode asString string.
 	].
 	codeView contents:(currentClass perform:getSelector).
 	codeView modified:false.
 	navigationState realModifiedState:false.
 ] ensure:[
-	Smalltalk addDependent:self.
+	environment addDependent:self.
 ].
 self codeAspect:aspect.
 "Modified: / 01-03-2007 / 20:53:42 / cg"
 |classes names|
 classes := self selectedClassesValue.
 names := classes collect:[:cls | cls name].
 self unloadClasses:classes.
-self loadClasses:(names collect:[:nm | Smalltalk classNamed:nm]).
+self loadClasses:(names collect:[:nm | environment classNamed:nm]).
 "/ to force update.
 "/ (I guess, this is not needed)
 self selectedClasses value:(self selectedClassesValue copy).
 ! !
 !NewSystemBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1972 2013-09-02 15:16:51 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1975 2013-09-05 22:48:24 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1972 2013-09-02 15:16:51 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1975 2013-09-05 22:48:24 cg Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'
 !
 version_SVN
-^ '$Id: Tools__NewSystemBrowser.st,v 1.1972 2013-09-02 15:16:51 cg Exp $'
+^ '$Id: Tools__NewSystemBrowser.st,v 1.1975 2013-09-05 22:48:24 cg Exp $'
 ! !
 NewSystemBrowser initialize!

branch	jv
changeset 13530	2269bce1636d
parent 13491	b3afe831ff0a
parent 13512	16ba5d93100b
child 13595	36f49da4fa11