hg/stx-libtool: comparison Tools_

equal deleted inserted replaced

-:32590d2e813d
+:8ec3d6230b65
 ].
 ].
 ].
 ].
+"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|
 "Created: / 04-12-2011 / 22:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 searchCompletionNewForClass: patternString
-| env pattern matcher matches relax withPrefix nmWihoutPrefix |
+| env pattern matcher matches relax withPrefix |
 patternString isEmptyOrNil ifTrue:[^#('' #())].
 env := self theSingleSelectedNamespace ? #Smalltalk.
 env = NavigatorModel nameListEntryForALL ifTrue:[env := #Smalltalk].
 withPrefix ifTrue:[
 matcher := [:cls|pattern match: cls name]
 ] ifFalse:[
-matcher := [:cls|pattern match: (nmWihoutPrefix := cls nameWithoutPrefix)]
+matcher := [:cls|pattern match: cls nameWithoutPrefix]
 ].
 relax := 1.
 [ matches isEmptyOrNil and:[relax <= 3] ] whileTrue:[
 matches := OrderedCollection new.
 env keysDo:[:nm|
 | cls |
 cls := env at: nm.
-(cls notNil and:[cls isBehavior]) ifTrue:[
+(cls notNil and:[cls isBehavior and:[(matches includesIdentical: cls)not]]) ifTrue:[
 (matcher value: cls) ifTrue:[
-matches add: (self searchCompletionEntryForClass: cls showPrefix: withPrefix)
+matches add: cls
 ].
 ].
 ].
 relax := relax + 1.
 ].
 matches isEmpty ifTrue:[
 ^ #(nil #())
 ] ifFalse:[
+matches := matches collect:[:cls|self searchCompletionEntryForClass: cls showPrefix: withPrefix].
 ^ { matches first . matches }
 ]
 "Created: / 06-04-2012 / 12:56:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 ! !
 !NewSystemBrowser::ClassCompletionEntry methodsFor:'converting'!
 asString
+^klass isJavaClass ifTrue:[
-^klass name
+klass javaName
+] ifFalse:[
+klass name
+].
 "Created: / 04-04-2012 / 13:00:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !NewSystemBrowser::ClassCompletionEntry methodsFor:'displaying'!
 showPrefix ifTrue:[
 name := klass name.
 namespace := nil
 ] ifFalse:[
 name := klass nameWithoutPrefix.
-namespace := klass  nameSpace name.
+klass isJavaClass ifFalse:[
+namespace := klass  nameSpace name.
+] ifTrue:[
+namespace := klass javaPackage.
+]
 ].
 name displayOn:aGC x:x y:y opaque:opaque.
 (namespace notNil and:[namespace ~~ #Smalltalk]) ifTrue:[
 aGC paint: fg.
 ]
 ]
 "Created: / 04-04-2012 / 13:03:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+displayString
+| name |
+showPrefix ifTrue:[
+name := klass name.
+] ifFalse:[
+name := klass nameWithoutPrefix.
+].
+^name
+"Created: / 20-04-2012 / 18:19:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !NewSystemBrowser::ClassCompletionEntry methodsFor:'printing & storing'!
 printOn:aStream
 ! !
 !NewSystemBrowser class methodsFor:'documentation'!
 version
-^ '$Id: Tools__NewSystemBrowser.st 7979 2012-04-13 18:16:04Z vranyj1 $'
+^ '$Id: Tools__NewSystemBrowser.st 7985 2012-04-21 08:36:31Z vranyj1 $'
 !
 version_CVS
 ^ '�Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1738 2012/04/06 14:00:08 stefan Exp �'
 !
 version_SVN
-^ '$Id: Tools__NewSystemBrowser.st 7979 2012-04-13 18:16:04Z vranyj1 $'
+^ '$Id: Tools__NewSystemBrowser.st 7985 2012-04-21 08:36:31Z vranyj1 $'
 ! !
 NewSystemBrowser initialize!

branch	jv
changeset 12236	8ec3d6230b65
parent 12230	5568874ba4cf
child 12240	a2a5f4c906de