Fixes in search dialogs w.r.t. multiselect
--- a/SmallSense__AbstractSearchDialog.st Fri Jun 20 13:56:46 2014 +0100
+++ b/SmallSense__AbstractSearchDialog.st Fri Jun 20 14:25:09 2014 +0100
@@ -369,7 +369,11 @@
completion notNil ifTrue:[
field contents: completion first.
completion second size == 1 ifTrue:[
- self matchingObjectsSelection: completion second anElement
+ matchingObjectsMultiselect ifTrue:[
+ self matchingObjectsSelection: completion second asArray
+ ] ifFalse:[
+ self matchingObjectsSelection: completion second anElement.
+ ].
].
] ifFalse:[
matchingObjectsView flash.
@@ -377,7 +381,7 @@
]
"Created: / 28-04-2014 / 22:30:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 02-05-2014 / 12:27:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-06-2014 / 14:12:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
matchPatternHolder
@@ -562,11 +566,15 @@
children:matchingPOs;
expand.
matchingPOs size == 1 ifTrue:[
- self matchingObjectsSelection: matchingPOs anElement
+ matchingObjectsMultiselect ifTrue:[
+ self matchingObjectsSelection: matchingPOs
+ ] ifFalse:[
+ self matchingObjectsSelection: matchingPOs anElement
+ ]
].
"Created: / 30-04-2014 / 09:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 02-05-2014 / 12:27:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-06-2014 / 14:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
updateMatchingObjectsIgnorePattern
--- a/SmallSense__ClassSearchDialog.st Fri Jun 20 13:56:46 2014 +0100
+++ b/SmallSense__ClassSearchDialog.st Fri Jun 20 14:25:09 2014 +0100
@@ -183,11 +183,12 @@
objects add: cls.
].
].
- recent := recent collect:[ :cls | objects includes: cls ].
+ recent := recent select:[ :cls | objects includes: cls ].
matchingObjects := recent.
self updateMatchingObjects: recent.
"Created: / 10-05-2014 / 11:49:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-06-2014 / 14:15:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ClassSearchDialog methodsFor:'hooks'!
--- a/SmallSense__MethodSearchDialog.st Fri Jun 20 13:56:46 2014 +0100
+++ b/SmallSense__MethodSearchDialog.st Fri Jun 20 14:25:09 2014 +0100
@@ -115,12 +115,12 @@
!MethodSearchDialog methodsFor:'searching'!
matchingObjectPOsFor: objects
- ^ (objects collect:[:each | MethodPO name:each selector class: each mclass ])
- sort:[ :a :b | a name == b name ifTrue:[ a klass name < b klass name] ifFalse:[ a name < b name ] ];
+ ^ (objects collect:[:each | PO forClass: each mclass selector: each selector ])
+ sort:[ :a :b | a label == b label ifTrue:[ a classes anElement name < b classes anElement name] ifFalse:[ a label < b label ] ];
yourself
"Created: / 30-04-2014 / 09:50:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 06-05-2014 / 00:31:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 20-06-2014 / 14:21:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
matchingObjectsForPattern:pattern inEnvironment:environment
--- a/smallsense.rc Fri Jun 20 13:56:46 2014 +0100
+++ b/smallsense.rc Fri Jun 20 14:25:09 2014 +0100
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.4.0\0"
- VALUE "ProductDate", "Fri, 20 Jun 2014 12:53:25 GMT\0"
+ VALUE "ProductDate", "Fri, 20 Jun 2014 13:24:34 GMT\0"
END
END