Mercurial Mercurial > hg > stx-libwidg2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed dependency on stx:libboss, stx:libjava and stx:libjavascript jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 25 Sep 2015 07:41:07 +0100
branchjv
changeset 4845 6a5c44a7d42e
parent 4844 73f9b32f5380
child 4848 7c142518db5f
Removed dependency on stx:libboss, stx:libjava and stx:libjavascript
DoWhatIMeanSupport.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
bmake.bat file | annotate | diff | comparison | revisions
stx_libwidg2.st file | annotate | diff | comparison | revisions
vcmake.bat file | annotate | diff | comparison | revisions 
--- a/DoWhatIMeanSupport.st	Fri Sep 25 07:00:03 2015 +0200
+++ b/DoWhatIMeanSupport.st	Fri Sep 25 07:41:07 2015 +0100
@@ -1172,7 +1172,7 @@
                 language := method programmingLanguage
             ] ifFalse:[
                 contextOrNilArg isJavaContext ifTrue:[
-                    language := JavaLanguage instance
+                    language := (Smalltalk at:#JavaLanguage) instance
                 ] ifFalse:[
                     language := SmalltalkLanguage instance.
                 ].
@@ -1201,7 +1201,7 @@
     self breakPoint: #cg.
 
     "Created: / 27-09-2013 / 10:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-09-2015 / 21:49:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-09-2015 / 07:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 codeCompletionForLanguage: languageOrNil class: classOrNilArg context:contextOrNilArg codeView:codeViewArg
@@ -1263,21 +1263,21 @@
      or nil, if called from the browser.
      If nonNil, we can make better guesses, because we actually know what a variable's type is"
 
-    languageOrNil := STXJavaScriptLanguage instance.
+    languageOrNil := (Smalltalk at:#STXJavaScriptLanguage) instance.
     methodOrNil := methodOrNilArg.
     classOrNil := classOrNilArg.
     codeView := codeViewArg.
     contextOrNil := contextOrNilArg.
 
-    JavaScriptCompletionEngine notNil ifTrue:[
-        JavaScriptCompletionEngine new
+    (Smalltalk at:#STXJavaScriptLanguage) notNil ifTrue:[
+        (Smalltalk at:#STXJavaScriptLanguage) new
            completeForMethod: methodOrNil class: classOrNil context: contextOrNil codeView: codeView into: actionBlock.
     ].
 
     self information:'Not yet supported'.
 
     "Created: / 18-09-2013 / 16:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 25-09-2013 / 15:13:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-09-2015 / 07:37:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !DoWhatIMeanSupport methodsFor:'code completion - Smalltalk'!
@@ -4126,7 +4126,9 @@
                         rbTypes size > 1 ifTrue:[
                             rbTypes remove:ProtoObject ifAbsent:[].
                             rbTypes remove:Autoload ifAbsent:[].
-                            rbTypes remove:ObsoleteObject ifAbsent:[].
+                            (Smalltalk includesKey:#ObsoleteObject) ifTrue:[
+                                rbTypes remove:(Smalltalk at:#ObsoleteObject) ifAbsent:[].
+                            ]
                         ].
                         rbTypes size == 1 ifTrue:[
                             rbType := rbTypes first.
@@ -4433,8 +4435,8 @@
     ].
 
     "Created: / 10-11-2006 / 13:18:27 / cg"
-    "Modified: / 16-02-2010 / 10:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 28-08-2013 / 15:27:32 / cg"
+    "Modified: / 25-09-2015 / 07:39:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 codeCompletionForVariable:node inClass:classOrNil codeView:codeView
--- a/Make.proto	Fri Sep 25 07:00:03 2015 +0200
+++ b/Make.proto	Fri Sep 25 07:41:07 2015 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/browser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libboss -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libjavascript -I$(INCLUDE_TOP)/stx/libui -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/browser -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libui -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg
 
 
 # if you need any additional defines for embedded C code,
--- a/abbrev.stc	Fri Sep 25 07:00:03 2015 +0200
+++ b/abbrev.stc	Fri Sep 25 07:41:07 2015 +0100
@@ -93,7 +93,7 @@
 GraphColumnView GraphColumnView stx:libwidg2 'Views-Graphs' 2
 GraphColumnView2D GraphColumnView2D stx:libwidg2 'Views-Graphs' 2
 GraphColumnView2DSpec GraphColumnView2DSpec stx:libwidg2 'Interface-Support-UI-Specs' 0
-GraphColumnView3D GraphColumnView3D stx:libwidg2 'Views-Graphs' 0
+GraphColumnView3D GraphColumnView3D stx:libwidg2 'Views-Graphs' 2
 GraphColumnView3DSpec GraphColumnView3DSpec stx:libwidg2 'Interface-Support-UI-Specs' 0
 GraphColumnViewSpec GraphColumnViewSpec stx:libwidg2 'Interface-Support-UI-Specs' 0
 HorizontalScale HorizontalScale stx:libwidg2 'Views-Interactors' 2
--- a/bc.mak	Fri Sep 25 07:00:03 2015 +0200
+++ b/bc.mak	Fri Sep 25 07:41:07 2015 +0100
@@ -38,7 +38,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\browser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libboss -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libjavascript -I$(INCLUDE_TOP)\stx\libui -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\browser -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libui -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
--- a/bmake.bat	Fri Sep 25 07:00:03 2015 +0200
+++ b/bmake.bat	Fri Sep 25 07:41:07 2015 +0100
@@ -7,6 +7,7 @@
 @REM Kludge got Mercurial, cannot be implemented in Borland make
 @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
 make.exe -N -f bc.mak  %DEFINES% %*
 
 
--- a/stx_libwidg2.st	Fri Sep 25 07:00:03 2015 +0200
+++ b/stx_libwidg2.st	Fri Sep 25 07:41:07 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -105,9 +103,6 @@
 
     ^ #(
         #'stx:goodies/refactoryBrowser/browser'    "RefactoryTyper - referenced by DoWhatIMeanSupport>>codeCompletionForMessage:inClass:instance:context:codeView:"
-        #'stx:libboss'    "ObsoleteObject - referenced by DoWhatIMeanSupport>>codeCompletionForMessage:inClass:instance:context:codeView:"
-        #'stx:libjava'    "JavaLanguage - referenced by DoWhatIMeanSupport>>codeCompletionFor:language:method:orClass:context:codeView:into:"
-        #'stx:libjavascript'    "JavaScriptCompletionEngine - referenced by DoWhatIMeanSupport>>codeCompletionForJavascriptMethod:orClass:context:codeView:into:"
         #'stx:libui'    "ComboBoxSpec - referenced by ComboBoxView>>specClass"
     )
 !
--- a/vcmake.bat	Fri Sep 25 07:00:03 2015 +0200
+++ b/vcmake.bat	Fri Sep 25 07:41:07 2015 +0100
@@ -13,8 +13,9 @@
 @REM Kludge got Mercurial, cannot be implemented in Borland make
 @FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
+
 make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
 
 
 
-
hg/stx-libwidg2