Merged 5f39eba6a1e3 and ee7df84ebb4f
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 06 May 2014 08:29:55 +0100
changeset 338 0a04e7f6e747
parent 337 5f39eba6a1e3 (current diff)
parent 335 ee7df84ebb4f (diff)
child 339 68792a673783
Merged 5f39eba6a1e3 and ee7df84ebb4f
SmallSense__AbstractDIalog.st
SmallSense__AbstractSearchDialog.st
SmallSense__ClassSearchDialog.st
smallsense.rc
--- a/SmallSense__AbstractSearchDialog.st	Tue May 06 08:23:16 2014 +0100
+++ b/SmallSense__AbstractSearchDialog.st	Tue May 06 08:29:55 2014 +0100
@@ -18,18 +18,18 @@
 "
  The following class instance variables are inherited by this class:
 
-	SmallSense::AbstractDIalog - 
-	SimpleDialog - 
+	SmallSense::AbstractDIalog -
+	SimpleDialog -
 	ApplicationModel - ClassResources
-	Model - 
-	Object - 
+	Model -
+	Object -
 "
 !
 
 !AbstractSearchDialog class methodsFor:'accessing'!
 
 recentlySearchedObjects
-    recentlySearchedObjects isNil ifTrue:[ 
+    recentlySearchedObjects isNil ifTrue:[
         recentlySearchedObjects := OrderedSet new.
     ].
     ^ recentlySearchedObjects
@@ -38,7 +38,7 @@
 !
 
 recentlySearchedPatterns
-    recentlySearchedPatterns isNil ifTrue:[ 
+    recentlySearchedPatterns isNil ifTrue:[
         recentlySearchedPatterns := OrderedSet new.
     ].
     ^ recentlySearchedPatterns
@@ -62,10 +62,10 @@
 
     <resource: #canvas>
 
-    ^ 
+    ^
     #(FullSpec
        name: contentPaneSpec
-       window: 
+       window:
       (WindowSpec
          label: 'Search...'
          name: 'Search...'
@@ -73,7 +73,7 @@
          bounds: (Rectangle 0 0 708 404)
          menu: mainMenuSpec
        )
-       component: 
+       component:
       (SpecCollection
          collection: (
           (VerticalPanelViewSpec
@@ -81,12 +81,12 @@
              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
              horizontalLayout: fit
              verticalLayout: topSpaceFit
-             component: 
+             component:
             (SpecCollection
                collection: (
                 (ViewSpec
                    name: 'Box1'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -102,7 +102,7 @@
                          minorKey: optionsShowHideRightAlignedPaneSpec
                        )
                       )
-                    
+
                    )
                    extent: (Point 708 30)
                  )
@@ -146,11 +146,11 @@
                    postBuildCallback: postBuildMatchingObjectsView:
                  )
                 )
-              
+
              )
            )
           )
-        
+
        )
      )
 
@@ -310,16 +310,16 @@
 !
 
 matchPatternCompletionBlock
-    ^ [ :contents :field | 
+    ^ [ :contents :field |
         | completion |
-        (contents notEmptyOrNil and:[ matchingObjectsUpdateJob running not]) ifTrue:[ 
+        (contents notEmptyOrNil and:[ matchingObjectsUpdateJob running not]) ifTrue:[
             field topView withCursor:(Cursor questionMark) do:[
-                completion := self matchPatternCompletionFor: contents 
+                completion := self matchPatternCompletionFor: contents
             ].
         ].
         completion notNil ifTrue:[
             field contents: completion first.
-            completion second size == 1 ifTrue:[ 
+            completion second size == 1 ifTrue:[
                 self matchingObjectsSelection: completion second anElement
             ].
         ] ifFalse:[
@@ -367,7 +367,7 @@
 
 matchingObjectsSelectionHolder
     "return/create the 'matchingClassesSelectionHolder' value holder (automatically generated)"
-    
+
     matchingObjectsSelectionHolder isNil ifTrue:[
         matchingObjectsSelectionHolder := ValueHolder new.
         matchingObjectsSelectionHolder addDependent:self.
@@ -377,9 +377,9 @@
     "Modified: / 08-03-2013 / 14:05:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-matchingObjectsSelectionHolder:something 
+matchingObjectsSelectionHolder:something
     "set the 'matchingClassesSelectionHolder' value holder (automatically generated)"
-    
+
     matchingObjectsSelectionHolder := something.
 !
 
@@ -476,7 +476,7 @@
 
     matchingObjects := nil.
     environment := self environment.
-    self matchPatternHolder value notEmptyOrNil ifTrue:[ 
+    self matchPatternHolder value notEmptyOrNil ifTrue:[
         pattern := StringPattern fromString: self matchPatternHolder value.
     ].
 "/        [
@@ -508,7 +508,7 @@
 !
 
 updateNoResults: root
-    root children: 
+    root children:
         (Array with: ((HierarchicalItemWithLabel new parent: root; label:((resources string:'No search results...') asText colorizeAllWith: Color gray)))).
     root expand.
     ^self
@@ -626,7 +626,7 @@
 !
 
 canSelectIndex: selectionIndex
-    (selectionIndex between: 1 and: matchingObjectsTree size) ifTrue:[ 
+    (selectionIndex between: 1 and: matchingObjectsTree size) ifTrue:[
         ^ self canSelect: (matchingObjectsTree at: selectionIndex)
     ].
     ^ false
@@ -635,7 +635,7 @@
 !
 
 hasFilterAndClassNamedIsNotYetImported: binaryname
-    ^self hasFilter 
+    ^self hasFilter
         and:[masterApplication isNil or:[masterApplication hasFilterAndClassNamedIsNotYetImported: binaryname]]
 
     "Created: / 18-03-2013 / 14:40:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -682,7 +682,7 @@
     completion = contents ifTrue:[ ^ nil ].
     matchingPOs := OrderedCollection new.
     completionPOs with: completionPOLabels do:[:po :poLabel |
-        poLabel = completion ifTrue:[ 
+        poLabel = completion ifTrue:[
             matchingPOs add: po.
         ].
     ].
@@ -699,7 +699,7 @@
     "Created: / 30-04-2014 / 09:46:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-matchingObjectsForPattern:pattern inEnvironment:environment 
+matchingObjectsForPattern:pattern inEnvironment:environment
     self subclassResponsibility
 
     "Created: / 28-04-2014 / 23:20:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
--- a/smallsense.rc	Tue May 06 08:23:16 2014 +0100
+++ b/smallsense.rc	Tue May 06 08:29:55 2014 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: jv_smallsense.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,32767,32767
+  FILEVERSION     6,2,6984,6984
   PRODUCTVERSION  6,2,3,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.32767.32767\0"
+      VALUE "FileVersion", "6.2.6984.6984\0"
       VALUE "InternalName", "jv:smallsense\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Tue, 06 May 2014 07:21:54 GMT\0"
+      VALUE "ProductDate", "Fri, 02 May 2014 23:52:30 GMT\0"
     END
 
   END