Merge
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 26 Oct 2017 12:35:22 +0000
changeset 1059 acfcb242f75e
parent 1053 75f684c8517a (current diff)
parent 1058 6d4bf422a7dd (diff)
child 1060 af3a048f9618
Merge
--- a/Make.spec	Sun Oct 22 03:41:12 2017 +0000
+++ b/Make.spec	Thu Oct 26 12:35:22 2017 +0000
@@ -22,7 +22,7 @@
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
+#  -Dxxx       : defines passed to CC for inline C-code
 #  -Ixxx       : include path passed to CC for inline C-code
 #  +optspace   : optimized for space
 #  +optspace2  : optimized more for space
@@ -136,87 +136,87 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR_SLASH)SmallSense__AbstractDIalog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__AbstractSearchProcessor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CodeHighlightingService.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CodeNavigationService.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CompletionContext.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CompletionController.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CompletionEngine.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CompletionResult.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CompletionView.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CriticsWindow.$(O) \
-    $(OUTDIR_SLASH)SmallSense__EditService.$(O) \
-    $(OUTDIR_SLASH)SmallSense__EditSupport.$(O) \
-    $(OUTDIR_SLASH)SmallSense__Info.$(O) \
-    $(OUTDIR_SLASH)SmallSense__Manager.$(O) \
-    $(OUTDIR_SLASH)SmallSense__NavigatorStep.$(O) \
-    $(OUTDIR_SLASH)SmallSense__PO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ParseTreeIndex.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ParseTreeIndexEntry.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ParseTreeInspector.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SelectorNode.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SettingsAppl.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkChecker.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkInferencerParameters.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkLintService.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkParseNodeVisitor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkParser.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkQuickFixer.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkSyntaxHighlighter.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkUnacceptedMethodEnvironment.$(O) \
-    $(OUTDIR_SLASH)SmallSense__TokenPatternMatcher.$(O) \
-    $(OUTDIR_SLASH)SmallSense__TokenPatternParser.$(O) \
-    $(OUTDIR_SLASH)SmallSense__TokenPatternToken.$(O) \
-    $(OUTDIR_SLASH)SmallSense__TokenPatternTokenSet.$(O) \
-    $(OUTDIR_SLASH)SmallSense__TokenStream.$(O) \
-    $(OUTDIR_SLASH)SmallSense__Type.$(O) \
-    $(OUTDIR_SLASH)SmallSense__TypeHolder.$(O) \
-    $(OUTDIR_SLASH)stx_goodies_smallsense.$(O) \
-    $(OUTDIR_SLASH)SmallSense__AbstractJavaCompletionEngine.$(O) \
-    $(OUTDIR_SLASH)SmallSense__AbstractListDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ClassInfo.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ClassPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ClassSearchProcessor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ClassType.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CompositeProcessor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ConstantPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__GenericEditSupport.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ImplementorSearchProcessor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__JavaEditSupport.$(O) \
-    $(OUTDIR_SLASH)SmallSense__JavaImportPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__MethodBindingPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__MethodInfo.$(O) \
-    $(OUTDIR_SLASH)SmallSense__MethodPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__PackagePO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__PluggablePO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__PluggableSearchProcessor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkCompletionEngine.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkEditSupport.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkInferencer.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SmalltalkParseNodeFinder.$(O) \
-    $(OUTDIR_SLASH)SmallSense__SnippetPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__UnionType.$(O) \
-    $(OUTDIR_SLASH)SmallSense__UnknownType.$(O) \
-    $(OUTDIR_SLASH)SmallSense__VariableBindingPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__VariablePO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__AbstractJavaCompletionEngineSimple.$(O) \
-    $(OUTDIR_SLASH)SmallSense__AbstractSearchDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__AbstractSelectDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__GroovyEditSupport.$(O) \
-    $(OUTDIR_SLASH)SmallSense__JavaCompletionEngine.$(O) \
-    $(OUTDIR_SLASH)SmallSense__JavaConstructorPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__MethodKeywordRestPO.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CetegoryOrProtocolSelectDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ClassSearchDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__JavaCompletionEngineSimple.$(O) \
-    $(OUTDIR_SLASH)SmallSense__MethodSearchDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__Navigator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__PackageSelectDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CategorySelectDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__GroovyCompletionEngineSimple.$(O) \
-    $(OUTDIR_SLASH)SmallSense__ProtocolSelectDialog.$(O) \
-    $(OUTDIR_SLASH)extensions.$(O) \
+    $(OUTDIR)SmallSense__AbstractDIalog.$(O) \
+    $(OUTDIR)SmallSense__AbstractSearchProcessor.$(O) \
+    $(OUTDIR)SmallSense__CodeHighlightingService.$(O) \
+    $(OUTDIR)SmallSense__CodeNavigationService.$(O) \
+    $(OUTDIR)SmallSense__CompletionContext.$(O) \
+    $(OUTDIR)SmallSense__CompletionController.$(O) \
+    $(OUTDIR)SmallSense__CompletionEngine.$(O) \
+    $(OUTDIR)SmallSense__CompletionResult.$(O) \
+    $(OUTDIR)SmallSense__CompletionView.$(O) \
+    $(OUTDIR)SmallSense__CriticsWindow.$(O) \
+    $(OUTDIR)SmallSense__EditService.$(O) \
+    $(OUTDIR)SmallSense__EditSupport.$(O) \
+    $(OUTDIR)SmallSense__Info.$(O) \
+    $(OUTDIR)SmallSense__Manager.$(O) \
+    $(OUTDIR)SmallSense__NavigatorStep.$(O) \
+    $(OUTDIR)SmallSense__PO.$(O) \
+    $(OUTDIR)SmallSense__ParseTreeIndex.$(O) \
+    $(OUTDIR)SmallSense__ParseTreeIndexEntry.$(O) \
+    $(OUTDIR)SmallSense__ParseTreeInspector.$(O) \
+    $(OUTDIR)SmallSense__SelectorNode.$(O) \
+    $(OUTDIR)SmallSense__SettingsAppl.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkChecker.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkInferencerParameters.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkLintService.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkParseNodeVisitor.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkParser.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkQuickFixer.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkSyntaxHighlighter.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkUnacceptedMethodEnvironment.$(O) \
+    $(OUTDIR)SmallSense__TokenPatternMatcher.$(O) \
+    $(OUTDIR)SmallSense__TokenPatternParser.$(O) \
+    $(OUTDIR)SmallSense__TokenPatternToken.$(O) \
+    $(OUTDIR)SmallSense__TokenPatternTokenSet.$(O) \
+    $(OUTDIR)SmallSense__TokenStream.$(O) \
+    $(OUTDIR)SmallSense__Type.$(O) \
+    $(OUTDIR)SmallSense__TypeHolder.$(O) \
+    $(OUTDIR)stx_goodies_smallsense.$(O) \
+    $(OUTDIR)SmallSense__AbstractJavaCompletionEngine.$(O) \
+    $(OUTDIR)SmallSense__AbstractListDialog.$(O) \
+    $(OUTDIR)SmallSense__ClassInfo.$(O) \
+    $(OUTDIR)SmallSense__ClassPO.$(O) \
+    $(OUTDIR)SmallSense__ClassSearchProcessor.$(O) \
+    $(OUTDIR)SmallSense__ClassType.$(O) \
+    $(OUTDIR)SmallSense__CompositeProcessor.$(O) \
+    $(OUTDIR)SmallSense__ConstantPO.$(O) \
+    $(OUTDIR)SmallSense__GenericEditSupport.$(O) \
+    $(OUTDIR)SmallSense__ImplementorSearchProcessor.$(O) \
+    $(OUTDIR)SmallSense__JavaEditSupport.$(O) \
+    $(OUTDIR)SmallSense__JavaImportPO.$(O) \
+    $(OUTDIR)SmallSense__MethodBindingPO.$(O) \
+    $(OUTDIR)SmallSense__MethodInfo.$(O) \
+    $(OUTDIR)SmallSense__MethodPO.$(O) \
+    $(OUTDIR)SmallSense__PackagePO.$(O) \
+    $(OUTDIR)SmallSense__PluggablePO.$(O) \
+    $(OUTDIR)SmallSense__PluggableSearchProcessor.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkCompletionEngine.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkEditSupport.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkInferencer.$(O) \
+    $(OUTDIR)SmallSense__SmalltalkParseNodeFinder.$(O) \
+    $(OUTDIR)SmallSense__SnippetPO.$(O) \
+    $(OUTDIR)SmallSense__UnionType.$(O) \
+    $(OUTDIR)SmallSense__UnknownType.$(O) \
+    $(OUTDIR)SmallSense__VariableBindingPO.$(O) \
+    $(OUTDIR)SmallSense__VariablePO.$(O) \
+    $(OUTDIR)SmallSense__AbstractJavaCompletionEngineSimple.$(O) \
+    $(OUTDIR)SmallSense__AbstractSearchDialog.$(O) \
+    $(OUTDIR)SmallSense__AbstractSelectDialog.$(O) \
+    $(OUTDIR)SmallSense__GroovyEditSupport.$(O) \
+    $(OUTDIR)SmallSense__JavaCompletionEngine.$(O) \
+    $(OUTDIR)SmallSense__JavaConstructorPO.$(O) \
+    $(OUTDIR)SmallSense__MethodKeywordRestPO.$(O) \
+    $(OUTDIR)SmallSense__CetegoryOrProtocolSelectDialog.$(O) \
+    $(OUTDIR)SmallSense__ClassSearchDialog.$(O) \
+    $(OUTDIR)SmallSense__JavaCompletionEngineSimple.$(O) \
+    $(OUTDIR)SmallSense__MethodSearchDialog.$(O) \
+    $(OUTDIR)SmallSense__Navigator.$(O) \
+    $(OUTDIR)SmallSense__PackageSelectDialog.$(O) \
+    $(OUTDIR)SmallSense__CategorySelectDialog.$(O) \
+    $(OUTDIR)SmallSense__GroovyCompletionEngineSimple.$(O) \
+    $(OUTDIR)SmallSense__ProtocolSelectDialog.$(O) \
+    $(OUTDIR)extensions.$(O) \
 
 
 
--- a/SmallSense__EditSupportTests.st	Sun Oct 22 03:41:12 2017 +0000
+++ b/SmallSense__EditSupportTests.st	Thu Oct 26 12:35:22 2017 +0000
@@ -22,7 +22,7 @@
 
 AbstractTestCase subclass:#EditSupportTests
 	instanceVariableNames:'codeView codeViewInteractor editService editSupport'
-	classVariableNames:''
+	classVariableNames:'TriedOpenDisplay'
 	poolDictionaries:''
 	category:'SmallSense-Tests'
 !
@@ -50,6 +50,28 @@
 "
 ! !
 
+!EditSupportTests class methodsFor:'initialization'!
+
+initialize
+    "Invoked at system start or when the class is dynamically loaded."
+
+    "/ please change as required (and remove this comment)
+
+    TriedOpenDisplay := false.
+
+    "Modified: / 17-10-2017 / 23:24:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!EditSupportTests class methodsFor:'queries'!
+
+isAbstract
+    "Return if this class is an abstract class.
+     True is returned here for myself only; false for subclasses.
+     Abstract subclasses must redefine this again."
+
+    ^ self == SmallSense::EditSupportTests.
+! !
+
 !EditSupportTests methodsFor:'accessing-classes'!
 
 editSupportClass
@@ -65,7 +87,15 @@
 
     super setUp.
 
-    Smalltalk loadPackage: 'stx:goodies/sunitext/ui'.
+    TriedOpenDisplay ifFalse:[
+        TriedOpenDisplay := true.
+        Screen current isNil ifTrue:[
+            Smalltalk openDisplay
+        ].
+    ].
+    self skipIf: Screen current isNil description:'No display connection'.
+
+    Smalltalk loadPackage: 'stx:goodies/sunit/ext/ui'.
 
     topView := StandardSystemView new.
     topView extent: 320 @ 200.
@@ -83,7 +113,7 @@
     topView waitUntilVisible.
 
     "Created: / 23-07-2014 / 07:15:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified (format): / 04-03-2015 / 09:42:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-10-2017 / 23:25:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 tearDown
@@ -105,3 +135,5 @@
     ^ '$Changeset: <not expanded> $'
 ! !
 
+
+EditSupportTests initialize!
--- a/SmallSense__SmalltalkInferencer.st	Sun Oct 22 03:41:12 2017 +0000
+++ b/SmallSense__SmalltalkInferencer.st	Thu Oct 26 12:35:22 2017 +0000
@@ -223,12 +223,13 @@
 infer
     Phase1 process:tree in:class manager:manager.
     Phase2 process:tree in:class manager:manager.
+    Phase3 process:tree in:class manager:manager.
 
     "
      (SmallSenseParseNodeInspector new node: tree source: source) open"
 
     "Created: / 26-11-2011 / 12:51:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 21-08-2015 / 15:45:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 06-07-2017 / 16:21:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 parse
@@ -710,6 +711,32 @@
 "
 ! !
 
+!SmalltalkInferencer::Phase3 methodsFor:'visiting'!
+
+visitVariableNode:anObject
+    | name className |
+
+    name := anObject name.
+    (name size > 1 and:[name first == $a]) ifTrue:[ 
+        (name size > 2 and: [name second == $n and:[ name third isUppercase ]]) ifTrue:[ 
+            className := (name copyFrom: 3) asSymbolIfInterned.
+        ] ifFalse:[ name second isUppercase ifTrue:[
+            className := (name copyFrom: 2) asSymbolIfInterned.
+        ]].
+        className notNil ifTrue:[
+            | cls |
+            cls := Smalltalk at: className.
+            cls notNil ifTrue:[ 
+                anObject inferedType type: (Type withClass: cls) type
+            ].
+        ].
+
+    ].
+
+    "Created: / 06-07-2017 / 16:15:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-10-2017 / 23:39:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !SmalltalkInferencer class methodsFor:'documentation'!
 
 version_HG
--- a/abbrev.stc	Sun Oct 22 03:41:12 2017 +0000
+++ b/abbrev.stc	Thu Oct 26 12:35:22 2017 +0000
@@ -1,7 +1,7 @@
 # automagically generated by the project definition
 # this file is needed for stc to be able to compile modules independently.
 # it provides information about a classes filename, category and especially namespace.
-SmallSense::AbstractDIalog SmallSense__AbstractDIalog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
+SmallSense::AbstractDIalog SmallSense__AbstractDIalog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
 SmallSense::AbstractSearchProcessor SmallSense__AbstractSearchProcessor stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
 SmallSense::CodeHighlightingService SmallSense__CodeHighlightingService stx:goodies/smallsense 'SmallSense-Core-Services' 0
 SmallSense::CodeNavigationService SmallSense__CodeNavigationService stx:goodies/smallsense 'SmallSense-Core-Services' 0
@@ -10,7 +10,7 @@
 SmallSense::CompletionEngine SmallSense__CompletionEngine stx:goodies/smallsense 'SmallSense-Core' 0
 SmallSense::CompletionResult SmallSense__CompletionResult stx:goodies/smallsense 'SmallSense-Core' 0
 SmallSense::CompletionView SmallSense__CompletionView stx:goodies/smallsense 'SmallSense-Core-Interface' 2
-SmallSense::CriticsWindow SmallSense__CriticsWindow stx:goodies/smallsense 'SmallSense-Core-Interface' 1
+SmallSense::CriticsWindow SmallSense__CriticsWindow stx:goodies/smallsense 'SmallSense-Core-Interface' 2
 SmallSense::EditService SmallSense__EditService stx:goodies/smallsense 'SmallSense-Core-Services' 0
 SmallSense::EditSupport SmallSense__EditSupport stx:goodies/smallsense 'SmallSense-Core-Services' 0
 SmallSense::Info SmallSense__Info stx:goodies/smallsense 'SmallSense-Smalltalk-Types-Info' 0
@@ -19,9 +19,9 @@
 SmallSense::PO SmallSense__PO stx:goodies/smallsense 'SmallSense-Core-Interface-PO' 0
 SmallSense::ParseTreeIndex SmallSense__ParseTreeIndex stx:goodies/smallsense 'SmallSense-Core-Index' 0
 SmallSense::ParseTreeIndexEntry SmallSense__ParseTreeIndexEntry stx:goodies/smallsense 'SmallSense-Core-Index' 0
-SmallSense::ParseTreeInspector SmallSense__ParseTreeInspector stx:goodies/smallsense 'SmallSense-Core-Interface' 1
+SmallSense::ParseTreeInspector SmallSense__ParseTreeInspector stx:goodies/smallsense 'SmallSense-Core-Interface' 2
 SmallSense::SelectorNode SmallSense__SelectorNode stx:goodies/smallsense 'SmallSense-Smalltalk' 0
-SmallSense::SettingsAppl SmallSense__SettingsAppl stx:goodies/smallsense 'SmallSense-Core-Interface' 1
+SmallSense::SettingsAppl SmallSense__SettingsAppl stx:goodies/smallsense 'SmallSense-Core-Interface' 2
 SmallSense::SmalltalkChecker SmallSense__SmalltalkChecker stx:goodies/smallsense 'SmallSense-Smalltalk-Lint' 0
 SmallSense::SmalltalkInferencerParameters SmallSense__SmalltalkInferencerParameters stx:goodies/smallsense 'SmallSense-Smalltalk-Types-Inference' 0
 SmallSense::SmalltalkLintService SmallSense__SmalltalkLintService stx:goodies/smallsense 'SmallSense-Smalltalk-Lint' 0
@@ -39,7 +39,7 @@
 SmallSense::TypeHolder SmallSense__TypeHolder stx:goodies/smallsense 'SmallSense-Smalltalk-Types' 0
 stx_goodies_smallsense stx_goodies_smallsense stx:goodies/smallsense '* Projects & Packages *' 3
 SmallSense::AbstractJavaCompletionEngine SmallSense__AbstractJavaCompletionEngine stx:goodies/smallsense 'SmallSense-Java' 0
-SmallSense::AbstractListDialog SmallSense__AbstractListDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
+SmallSense::AbstractListDialog SmallSense__AbstractListDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
 SmallSense::ClassInfo SmallSense__ClassInfo stx:goodies/smallsense 'SmallSense-Smalltalk-Types-Info' 0
 SmallSense::ClassPO SmallSense__ClassPO stx:goodies/smallsense 'SmallSense-Core-Interface-PO' 0
 SmallSense::ClassSearchProcessor SmallSense__ClassSearchProcessor stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
@@ -66,25 +66,26 @@
 SmallSense::VariableBindingPO SmallSense__VariableBindingPO stx:goodies/smallsense 'SmallSense-Java-Interface-PO' 0
 SmallSense::VariablePO SmallSense__VariablePO stx:goodies/smallsense 'SmallSense-Core-Interface-PO' 0
 SmallSense::AbstractJavaCompletionEngineSimple SmallSense__AbstractJavaCompletionEngineSimple stx:goodies/smallsense 'SmallSense-Java' 2
-SmallSense::AbstractSearchDialog SmallSense__AbstractSearchDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
-SmallSense::AbstractSelectDialog SmallSense__AbstractSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
+SmallSense::AbstractSearchDialog SmallSense__AbstractSearchDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 3
+SmallSense::AbstractSelectDialog SmallSense__AbstractSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
 SmallSense::GroovyEditSupport SmallSense__GroovyEditSupport stx:goodies/smallsense 'SmallSense-Groovy' 0
 SmallSense::JavaCompletionEngine SmallSense__JavaCompletionEngine stx:goodies/smallsense 'SmallSense-Java' 0
 SmallSense::JavaConstructorPO SmallSense__JavaConstructorPO stx:goodies/smallsense 'SmallSense-Java-Interface-PO' 0
 SmallSense::MethodKeywordRestPO SmallSense__MethodKeywordRestPO stx:goodies/smallsense 'SmallSense-Core-Interface-PO' 0
-SmallSense::CetegoryOrProtocolSelectDialog SmallSense__CetegoryOrProtocolSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
-SmallSense::ClassSearchDialog SmallSense__ClassSearchDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
+SmallSense::CetegoryOrProtocolSelectDialog SmallSense__CetegoryOrProtocolSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
+SmallSense::ClassSearchDialog SmallSense__ClassSearchDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 3
 SmallSense::JavaCompletionEngineSimple SmallSense__JavaCompletionEngineSimple stx:goodies/smallsense 'SmallSense-Java' 2
-SmallSense::MethodSearchDialog SmallSense__MethodSearchDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
-SmallSense::Navigator SmallSense__Navigator stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
-SmallSense::PackageSelectDialog SmallSense__PackageSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
-SmallSense::CategorySelectDialog SmallSense__CategorySelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
+SmallSense::MethodSearchDialog SmallSense__MethodSearchDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 3
+SmallSense::Navigator SmallSense__Navigator stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 3
+SmallSense::PackageSelectDialog SmallSense__PackageSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
+SmallSense::CategorySelectDialog SmallSense__CategorySelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
 SmallSense::GroovyCompletionEngineSimple SmallSense__GroovyCompletionEngineSimple stx:goodies/smallsense 'SmallSense-Groovy' 2
-SmallSense::ProtocolSelectDialog SmallSense__ProtocolSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 1
-SmallSense::AbstractJavaCompletionEngineTests SmallSense__AbstractJavaCompletionEngineTests stx:goodies/smallsense 'SmallSense-Tests' 1
+SmallSense::ProtocolSelectDialog SmallSense__ProtocolSelectDialog stx:goodies/smallsense 'SmallSense-Core-Interface-Search' 2
 SmallSense::AbstractTestCase SmallSense__AbstractTestCase stx:goodies/smallsense 'SmallSense-Tests' 1
+SmallSense::TestCase SmallSense__TestCase stx:goodies/smallsense 'SmallSense-Tests-Obsolete' 1
+SmallSense::CompletionEngineTests SmallSense__CompletionEngineTests stx:goodies/smallsense 'SmallSense-Tests' 1
+SmallSense::AbstractJavaCompletionEngineTests SmallSense__AbstractJavaCompletionEngineTests stx:goodies/smallsense 'SmallSense-Tests' 1
 SmallSense::BaseTestClass SmallSense__BaseTestClass stx:goodies/smallsense 'SmallSense-Tests-Obsolete' 1
-SmallSense::CompletionEngineTests SmallSense__CompletionEngineTests stx:goodies/smallsense 'SmallSense-Tests' 1
 SmallSense::EditSupportTests SmallSense__EditSupportTests stx:goodies/smallsense 'SmallSense-Tests' 1
 SmallSense::FinderTests SmallSense__FinderTests stx:goodies/smallsense 'SmallSense-Tests-Obsolete' 1
 SmallSense::GroovyCompletionEngineSimpleTests SmallSense__GroovyCompletionEngineSimpleTests stx:goodies/smallsense 'SmallSense-Tests' 1
@@ -96,5 +97,4 @@
 SmallSense::SmalltalkEditSupportTests SmallSense__SmalltalkEditSupportTests stx:goodies/smallsense 'SmallSense-Tests' 1
 SmallSense::SmalltalkInferencerTests SmallSense__SmalltalkInferencerTests stx:goodies/smallsense 'SmallSense-Tests' 1
 SmallSense::SmalltalkParserTests SmallSense__SmalltalkParserTests stx:goodies/smallsense 'SmallSense-Tests-Obsolete' 1
-SmallSense::TestCase SmallSense__TestCase stx:goodies/smallsense 'SmallSense-Tests-Obsolete' 1
 SmallSense::TokenPatternMatcherTests SmallSense__TokenPatternMatcherTests stx:goodies/smallsense 'SmallSense-Tests' 1
--- a/bc.mak	Sun Oct 22 03:41:12 2017 +0000
+++ b/bc.mak	Thu Oct 26 12:35:22 2017 +0000
@@ -31,7 +31,7 @@
 
 LIBNAME=libstx_goodies_smallsense
 MODULE_PATH=goodies\smallsense
-RESFILES=smallsense.$(RES)
+RESFILES=stx_goodies_smallsenseWINrc.$(RES)
 
 
 
@@ -79,7 +79,7 @@
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
         
 clean::
-	del *.$(CSUFFIX)
+	-del *.$(CSUFFIX)
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
--- a/bmake.bat	Sun Oct 22 03:41:12 2017 +0000
+++ b/bmake.bat	Thu Oct 26 12:35:22 2017 +0000
@@ -11,3 +11,5 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 
+
+
--- a/libInit.cc	Sun Oct 22 03:41:12 2017 +0000
+++ b/libInit.cc	Thu Oct 26 12:35:22 2017 +0000
@@ -97,6 +97,7 @@
 extern void _SmallSense__GroovyCompletionEngineSimple_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _SmallSense__ProtocolSelectDialog_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
+extern void _stx_137goodies_137smallsense_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
 void _libstx_goodies_smallsense_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
 {
--- a/mingwmake.bat	Sun Oct 22 03:41:12 2017 +0000
+++ b/mingwmake.bat	Thu Oct 26 12:35:22 2017 +0000
@@ -14,3 +14,5 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
+
+
--- a/refactoring_custom/Make.spec	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/Make.spec	Thu Oct 26 12:35:22 2017 +0000
@@ -22,7 +22,7 @@
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
+#  -Dxxx       : defines passed to CC for inline C-code
 #  -Ixxx       : include path passed to CC for inline C-code
 #  +optspace   : optimized for space
 #  +optspace2  : optimized more for space
@@ -120,71 +120,71 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR_SLASH)SmallSense__CustomChangeManager.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomClassQuery.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomCodeGeneratorOrRefactoring.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomContext.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomManager.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomMenuBuilder.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomMock.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomNamespace.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomParseTreeRewriter.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomPerspective.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomRefactoryBuilder.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSourceCodeFormatter.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSourceCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSourceCodeSelection.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomTestCaseHelper.$(O) \
-    $(OUTDIR_SLASH)stx_goodies_smallsense_refactoring_custom.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomBrowserChangeManager.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomBrowserContext.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomLocalChangeManager.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomNoneSourceCodeFormatter.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomRBLocalSourceCodeFormatter.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomRefactoring.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSilentDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSubContext.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomUserDialog.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomAccessMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomCodeSelectionRefactoring.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomInspectorTabCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomIsAbstractCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomJavaSimpleSetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomNewClassGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomReplaceIfNilWithIfTrueRefactoring.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSubclassResponsibilityCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomTestCaseCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomTestCaseMethodCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomTestCaseSetUpCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomTestCaseTearDownCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomUpdateTestCaseCategoryRefactoring.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomVisitorCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomChangeNotificationAccessMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomChangeNotificationSetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomCodeGeneratorClassGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomCodeGeneratorOrRefactoringTestCaseCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomCodeSelectionToResourceTranslation.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomDefaultGetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomLazyInitializationAccessMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomLazyInitializationGetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomMultiSetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomPrintCodeSelectionRefactoring.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomRefactoringClassGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSimpleAccessMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSimpleGetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomSimpleSetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomUITestCaseCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomUITestCaseSetUpCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomValueHolderAccessMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomValueHolderGetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomValueHolderWithChangeNotificationAccessMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomValueHolderWithChangeNotificationGetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomValueHolderWithChangeNotificationSetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomVisitorCodeGeneratorAcceptVisitor.$(O) \
-    $(OUTDIR_SLASH)SmallSense__CustomJavaScriptSimpleSetterMethodsCodeGenerator.$(O) \
-    $(OUTDIR_SLASH)extensions.$(O) \
+    $(OUTDIR)SmallSense__CustomChangeManager.$(O) \
+    $(OUTDIR)SmallSense__CustomClassQuery.$(O) \
+    $(OUTDIR)SmallSense__CustomCodeGeneratorOrRefactoring.$(O) \
+    $(OUTDIR)SmallSense__CustomContext.$(O) \
+    $(OUTDIR)SmallSense__CustomDialog.$(O) \
+    $(OUTDIR)SmallSense__CustomManager.$(O) \
+    $(OUTDIR)SmallSense__CustomMenuBuilder.$(O) \
+    $(OUTDIR)SmallSense__CustomMock.$(O) \
+    $(OUTDIR)SmallSense__CustomNamespace.$(O) \
+    $(OUTDIR)SmallSense__CustomParseTreeRewriter.$(O) \
+    $(OUTDIR)SmallSense__CustomPerspective.$(O) \
+    $(OUTDIR)SmallSense__CustomRefactoryBuilder.$(O) \
+    $(OUTDIR)SmallSense__CustomSourceCodeFormatter.$(O) \
+    $(OUTDIR)SmallSense__CustomSourceCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomSourceCodeSelection.$(O) \
+    $(OUTDIR)SmallSense__CustomTestCaseHelper.$(O) \
+    $(OUTDIR)stx_goodies_smallsense_refactoring_custom.$(O) \
+    $(OUTDIR)SmallSense__CustomBrowserChangeManager.$(O) \
+    $(OUTDIR)SmallSense__CustomBrowserContext.$(O) \
+    $(OUTDIR)SmallSense__CustomCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomLocalChangeManager.$(O) \
+    $(OUTDIR)SmallSense__CustomNoneSourceCodeFormatter.$(O) \
+    $(OUTDIR)SmallSense__CustomRBLocalSourceCodeFormatter.$(O) \
+    $(OUTDIR)SmallSense__CustomRefactoring.$(O) \
+    $(OUTDIR)SmallSense__CustomSilentDialog.$(O) \
+    $(OUTDIR)SmallSense__CustomSubContext.$(O) \
+    $(OUTDIR)SmallSense__CustomUserDialog.$(O) \
+    $(OUTDIR)SmallSense__CustomAccessMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomCodeSelectionRefactoring.$(O) \
+    $(OUTDIR)SmallSense__CustomInspectorTabCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomIsAbstractCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomJavaSimpleSetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomNewClassGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomReplaceIfNilWithIfTrueRefactoring.$(O) \
+    $(OUTDIR)SmallSense__CustomSubclassResponsibilityCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomTestCaseCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomTestCaseMethodCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomTestCaseSetUpCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomTestCaseTearDownCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomUpdateTestCaseCategoryRefactoring.$(O) \
+    $(OUTDIR)SmallSense__CustomVisitorCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomChangeNotificationAccessMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomChangeNotificationSetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomCodeGeneratorClassGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomCodeGeneratorOrRefactoringTestCaseCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomCodeSelectionToResourceTranslation.$(O) \
+    $(OUTDIR)SmallSense__CustomDefaultGetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomLazyInitializationAccessMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomLazyInitializationGetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomMultiSetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomPrintCodeSelectionRefactoring.$(O) \
+    $(OUTDIR)SmallSense__CustomRefactoringClassGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomSimpleAccessMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomSimpleGetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomSimpleSetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomUITestCaseCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomUITestCaseSetUpCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomValueHolderAccessMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomValueHolderGetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomValueHolderWithChangeNotificationAccessMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomValueHolderWithChangeNotificationGetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomValueHolderWithChangeNotificationSetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)SmallSense__CustomVisitorCodeGeneratorAcceptVisitor.$(O) \
+    $(OUTDIR)SmallSense__CustomJavaScriptSimpleSetterMethodsCodeGenerator.$(O) \
+    $(OUTDIR)extensions.$(O) \
 
 
 
--- a/refactoring_custom/SmallSense__CustomTestCaseSetUpCodeGenerator.st	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/SmallSense__CustomTestCaseSetUpCodeGenerator.st	Thu Oct 26 12:35:22 2017 +0000
@@ -124,48 +124,37 @@
 
 !CustomTestCaseSetUpCodeGenerator methodsFor:'executing'!
 
-buildForClass: class
-    | source category superHasSetup current package |
+buildForClass:class 
+    | source  category  superHasSetup  current  package |
 
     current := class.
     superHasSetup := false.
-    [ superHasSetup not and:[ current isNil not ] ] whileTrue:[
-        superHasSetup := current includesSelector: #setUp.
+    [
+        superHasSetup not and:[ current isNil not ]
+    ] whileTrue:[
+        superHasSetup := current includesSelector:#setUp.
         superHasSetup ifFalse:[
             current := current superclass.
         ].
     ].
-    superHasSetup ifTrue:[ 
-        source := 'setUp
-    super setUp.
-
-    "Add your own code here..."
-'.
-        category := (current compiledMethodAt: #setUp) category.
-    ] ifFalse:[ 
-        source := 'setUp
-    "/ super setUp.
-
-    "Add your own code here..."
-'.
-        category := ((Smalltalk at:#TestCase) compiledMethodAt: #setUp) category.
+    source := self methodSource:superHasSetup.
+    superHasSetup ifTrue:[
+        category := (current compiledMethodAt:#setUp) category.
+    ] ifFalse:[
+        category := ((Smalltalk at:#TestCase) compiledMethodAt:#setUp) category.
     ].
-
     package := PackageId noProjectID.
-    samePackageAsTestedClass ? self defaultSamePackageAsTestedClass ifTrue: [ 
+    samePackageAsTestedClass ? self defaultSamePackageAsTestedClass ifTrue:[
         package := class package
     ].
-
-    model createMethod
-        class: class;
-        source: source;
-        category: category;
-        package: package;
+    (model createMethod)
+        class:class;
+        source:source;
+        category:category;
+        package:package;
         compile.
 
-    "Created: / 05-08-2014 / 14:17:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 31-01-2015 / 18:32:53 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
-    "Modified: / 12-06-2015 / 20:46:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 07-08-2017 / 14:21:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 buildInContext:aCustomContext
@@ -178,3 +167,24 @@
     "Modified: / 12-06-2015 / 20:46:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!CustomTestCaseSetUpCodeGenerator methodsFor:'private'!
+
+methodSource:callSuper 
+    | source |
+
+    callSuper ifTrue:[
+        source := 'setUp
+    super setUp.
+
+    "Add your own code here..."
+'.
+    ] ifFalse:[
+        source := 'setUp
+    "/ super setUp.
+
+    "Add your own code here..."
+'.
+    ].
+    ^ source
+! !
+
--- a/refactoring_custom/SmallSense__CustomUITestCaseSetUpCodeGenerator.st	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/SmallSense__CustomUITestCaseSetUpCodeGenerator.st	Thu Oct 26 12:35:22 2017 +0000
@@ -66,3 +66,37 @@
     "Created: / 16-09-2014 / 11:23:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!CustomUITestCaseSetUpCodeGenerator methodsFor:'private'!
+
+methodSource:callSuper 
+    | source |
+
+    callSuper ifTrue:[
+        source := 'setUp
+    self skipIf: Screen current isNil description: ''No display connection''.
+    Smalltalk loadPackage: ''stx:goodies/sunit/ext/ui''.
+    super setUp.
+
+    "Add your own code here..."
+'.
+    ] ifFalse:[
+        source := 'setUp
+    self skipIf: Screen current isNil description: ''No display connection''.
+    Smalltalk loadPackage: ''stx:goodies/sunit/ext/ui''.
+    "/ super setUp.
+
+    "Add your own code here..."
+'.
+    ].
+    ^ source
+
+    "Created: / 07-08-2017 / 15:09:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!CustomUITestCaseSetUpCodeGenerator class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/refactoring_custom/bc.mak	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/bc.mak	Thu Oct 26 12:35:22 2017 +0000
@@ -31,7 +31,7 @@
 
 LIBNAME=libstx_goodies_smallsense_refactoring_custom
 MODULE_PATH=goodies\smallsense\refactoring_custom
-RESFILES=refactoring_custom.$(RES)
+RESFILES=stx_goodies_smallsense_refactoring_customWINrc.$(RES)
 
 
 
@@ -76,7 +76,7 @@
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
         
 clean::
-	del *.$(CSUFFIX)
+	-del *.$(CSUFFIX)
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
--- a/refactoring_custom/bmake.bat	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/bmake.bat	Thu Oct 26 12:35:22 2017 +0000
@@ -11,3 +11,5 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 
+
+
--- a/refactoring_custom/libInit.cc	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/libInit.cc	Thu Oct 26 12:35:22 2017 +0000
@@ -81,6 +81,7 @@
 extern void _SmallSense__CustomVisitorCodeGeneratorAcceptVisitor_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _SmallSense__CustomJavaScriptSimpleSetterMethodsCodeGenerator_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
+extern void _stx_137goodies_137smallsense_137refactoring_137custom_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
 void _libstx_goodies_smallsense_refactoring_custom_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
 {
--- a/refactoring_custom/mingwmake.bat	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/mingwmake.bat	Thu Oct 26 12:35:22 2017 +0000
@@ -14,3 +14,5 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/refactoring_custom/stx_goodies_smallsense_refactoring_customWINrc.rc	Thu Oct 26 12:35:22 2017 +0000
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_goodies_smallsense_refactoring_custom.
+//
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION     8,0,32767,32767
+  PRODUCTVERSION  8,0,0,0
+#if (__BORLANDC__)
+  FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
+  FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+  FILEOS          VOS_NT_WINDOWS32
+  FILETYPE        VFT_DLL
+  FILESUBTYPE     VS_USER_DEFINED
+#endif
+
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "My Company\0"
+      VALUE "FileDescription", "Class Library (LIB)\0"
+      VALUE "FileVersion", "8.0.32767.32767\0"
+      VALUE "InternalName", "stx:goodies/smallsense/refactoring_custom\0"
+      VALUE "LegalCopyright", "Copyright Jakub Nesveda 2013-2015 & Jan Vrany 2013-now\0"
+      VALUE "ProductName", "ProductName\0"
+      VALUE "ProductVersion", "8.0.0.0\0"
+      VALUE "ProductDate", "Wed, 18 Oct 2017 10:32:40 GMT\0"
+    END
+
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN                               //  Language   |    Translation
+    VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+  END
+END
--- a/refactoring_custom/vcmake.bat	Sun Oct 22 03:41:12 2017 +0000
+++ b/refactoring_custom/vcmake.bat	Thu Oct 26 12:35:22 2017 +0000
@@ -19,3 +19,4 @@
 
 
 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stx_goodies_smallsenseWINrc.rc	Thu Oct 26 12:35:22 2017 +0000
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_goodies_smallsense.
+//
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION     8,0,32767,32767
+  PRODUCTVERSION  8,0,0,0
+#if (__BORLANDC__)
+  FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
+  FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+  FILEOS          VOS_NT_WINDOWS32
+  FILETYPE        VFT_DLL
+  FILESUBTYPE     VS_USER_DEFINED
+#endif
+
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "Jan Vrany\0"
+      VALUE "FileDescription", "Smalltalk/X IDE Productivity Tool (LIB)\0"
+      VALUE "FileVersion", "8.0.32767.32767\0"
+      VALUE "InternalName", "stx:goodies/smallsense\0"
+      VALUE "LegalCopyright", "Copyright Jan Vrany 2013-2014\0"
+      VALUE "ProductName", "SmallSense\0"
+      VALUE "ProductVersion", "8.0.0.0\0"
+      VALUE "ProductDate", "Wed, 18 Oct 2017 10:32:30 GMT\0"
+    END
+
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN                               //  Language   |    Translation
+    VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+  END
+END
--- a/vcmake.bat	Sun Oct 22 03:41:12 2017 +0000
+++ b/vcmake.bat	Thu Oct 26 12:35:22 2017 +0000
@@ -19,3 +19,4 @@
 
 
 
+