Merge jv
authorMerge Script
Sun, 17 Jan 2016 06:49:20 +0100
branchjv
changeset 3703 f8b242e15ffe
parent 3688 8d5e44850166 (current diff)
parent 3702 f56a28de296a (diff)
child 3705 fce41f02fc98
Merge
Make.proto
Make.spec
bc.mak
libInit.cc
stx_libbasic2.st
--- a/.hgtags	Thu Jan 14 06:55:34 2016 +0100
+++ b/.hgtags	Sun Jan 17 06:49:20 2016 +0100
@@ -6,6 +6,7 @@
 051b5bef3be7cca43ae6fc8f0cafa827665a4e26 stx_6_2_2
 1465b5fed73effab35e7ed0fb99261b3783dd752 expeccoALM_1_9_0_1
 2ae8f1b57bc12adb6816eb61e797dc3634d064cd expecco_2_5_1
+2c6d35ee488da882bf52476a114ba1bb5aa762a4 expecco_ALM_1_9_7
 2dc6e31f014214093e237c5a450818ecadc0a471 rel5_4_6
 2e9ebced59e6e0395bd50c6defe1079c334d9294 stable
 35bc2d58019dadd6fac7745e583f5f684da29935 expeccoNET_1_6_0_0
--- a/AutoResizingOrderedCollection.st	Thu Jan 14 06:55:34 2016 +0100
+++ b/AutoResizingOrderedCollection.st	Sun Jan 17 06:49:20 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "{ Package: 'stx:libbasic2' }"
 
 "{ NameSpace: Smalltalk }"
@@ -19,6 +17,7 @@
     are added beyond the size. 
     I.e. if at:put: is sent for indexes > the current size, the receiver grows to
     the required index and missing fields are implicitly filled with nils.
+    Queries for non-existing elements are anwered with nil.
 "
 !
 
@@ -33,6 +32,12 @@
 "
 ! !
 
+!AutoResizingOrderedCollection class methodsFor:'instance creation'!
+
+newWithDefaultValue:defaultValue
+    ^ AutoResizingOrderedCollectionWithDefault new setDefaultValue:defaultValue
+! !
+
 !AutoResizingOrderedCollection methodsFor:'accessing'!
 
 at:index
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/AutoResizingOrderedCollectionWithDefault.st	Sun Jan 17 06:49:20 2016 +0100
@@ -0,0 +1,74 @@
+"{ Package: 'stx:libbasic2' }"
+
+"{ NameSpace: Smalltalk }"
+
+AutoResizingOrderedCollection subclass:#AutoResizingOrderedCollectionWithDefault
+	instanceVariableNames:'defaultValue'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Collections-Sequenceable'
+!
+
+!AutoResizingOrderedCollectionWithDefault class methodsFor:'documentation'!
+
+documentation
+"
+    I am an ordered collection which automatically resizes if elements
+    are added beyond the size. 
+    I.e. if at:put: is sent for indexes > the current size, the receiver grows to
+    the required index and missing fields are implicitly filled with a default value.
+    Queries for non-existing elements are anwered with the default value.
+"
+!
+
+examples
+"
+    |coll|
+
+    coll := AutoResizingOrderedCollectionWithDefault newWithDefaultValue:99.
+    coll at:4 put:'four'.
+    coll at:8 put:'eight'.
+    coll at:9
+"
+! !
+
+!AutoResizingOrderedCollectionWithDefault methodsFor:'accessing'!
+
+at:index
+    "fetch an object at index.
+     If index is beyond the actual size, return the default value
+     (i.e. this is an alias for at:index ifAbsent:[default value])"
+
+    index > self size ifTrue:[^ defaultValue].
+    ^ super at:index
+!
+
+at:index put:anObject
+    "store an object at index.
+     If required, grow the receiver to ensure that index is valid"
+
+    |oldSize|
+    
+    index > (oldSize := self size) ifTrue:[
+        self grow:index.
+        self from:oldSize+1 to:index put:defaultValue.
+    ].
+    super at:index put:anObject
+! !
+
+!AutoResizingOrderedCollectionWithDefault methodsFor:'initialization'!
+
+setDefaultValue:v
+    defaultValue := v
+! !
+
+!AutoResizingOrderedCollectionWithDefault class methodsFor:'documentation'!
+
+version
+    ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
+! !
+
--- a/Make.proto	Thu Jan 14 06:55:34 2016 +0100
+++ b/Make.proto	Sun Jan 17 06:49:20 2016 +0100
@@ -215,6 +215,7 @@
 $(OUTDIR)AATreeNode.$(O) AATreeNode.$(H): AATreeNode.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/BinaryTreeNode.$(H) $(STCHDR)
 $(OUTDIR)Arrow.$(O) Arrow.$(H): Arrow.st $(INCLUDE_TOP)/stx/libbasic/Geometric.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/LineSegment.$(H) $(STCHDR)
 $(OUTDIR)ArrowedSpline.$(O) ArrowedSpline.$(H): ArrowedSpline.st $(INCLUDE_TOP)/stx/libbasic/Geometric.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/Spline.$(H) $(STCHDR)
+$(OUTDIR)AutoResizingOrderedCollectionWithDefault.$(O) AutoResizingOrderedCollectionWithDefault.$(H): AutoResizingOrderedCollectionWithDefault.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic2/AutoResizingOrderedCollection.$(H) $(STCHDR)
 $(OUTDIR)BackgroundJob.$(O) BackgroundJob.$(H): BackgroundJob.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/AbstractBackgroundJob.$(H) $(STCHDR)
 $(OUTDIR)BackgroundPeriodicalJob.$(O) BackgroundPeriodicalJob.$(H): BackgroundPeriodicalJob.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/AbstractBackgroundJob.$(H) $(STCHDR)
 $(OUTDIR)BackgroundQueueProcessingJob.$(O) BackgroundQueueProcessingJob.$(H): BackgroundQueueProcessingJob.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/AbstractBackgroundJob.$(H) $(STCHDR)
--- a/Make.spec	Thu Jan 14 06:55:34 2016 +0100
+++ b/Make.spec	Sun Jan 17 06:49:20 2016 +0100
@@ -139,6 +139,7 @@
 	AATreeNode \
 	Arrow \
 	ArrowedSpline \
+	AutoResizingOrderedCollectionWithDefault \
 	BackgroundJob \
 	BackgroundPeriodicalJob \
 	BackgroundQueueProcessingJob \
@@ -267,6 +268,7 @@
     $(OUTDIR_SLASH)AATreeNode.$(O) \
     $(OUTDIR_SLASH)Arrow.$(O) \
     $(OUTDIR_SLASH)ArrowedSpline.$(O) \
+    $(OUTDIR_SLASH)AutoResizingOrderedCollectionWithDefault.$(O) \
     $(OUTDIR_SLASH)BackgroundJob.$(O) \
     $(OUTDIR_SLASH)BackgroundPeriodicalJob.$(O) \
     $(OUTDIR_SLASH)BackgroundQueueProcessingJob.$(O) \
--- a/Text.st	Thu Jan 14 06:55:34 2016 +0100
+++ b/Text.st	Sun Jan 17 06:49:20 2016 +0100
@@ -21,7 +21,7 @@
 		BoldOverlineEmphasis BoldUnderwaveEmphasis
 		ItalicUnderlineEmphasis ItalicUnderwaveEmphasis
 		UnderlineColorEmphasis StrikeoutColorEmphasis EtchColorEmphasis
-		FontEmphasis'
+		FontEmphasis Superscript Subscript'
 	poolDictionaries:''
 	category:'Collections-Text'
 !
@@ -46,10 +46,11 @@
 documentation
 "
     Texts add emphasis information to a string.
+    
     Texts and strings should behave interchanchably to the outside
     world, except that texts keep per-character emphasis information.
-    (strings return nil, when asked for an elements emphasis).
-    Use #string, to get a texts underlying string without any emphasis
+    (strings return nil, when asked for an element's emphasis).
+    Use #string, to get a text's underlying plain string without any emphasis
     information.
 
     Currently, the following attributes are supported:
@@ -66,7 +67,7 @@
     Attributes may be combined (pass an array of above) as emphasis.
     See examples.
 
-    This class is not yet fully implemented - being constructed.
+    This class is a hack and may need some massage.
 
     [author:]
         Claus Gittinger
@@ -78,51 +79,84 @@
 
 examples
 "
+  In a textView:
+                                                                        [exBegin]
+    |t v|
+
+    t := 'The quick brown fox jumps over the lazy dog' asText.
+    t emphasizeFrom:(t findString:'quick') 
+      count:5 with:#bold.
+      
+    t emphasizeFrom:(t findString:'brown') 
+      count:9 with:(Array with:#color->(Color name:'brown')
+                                                     with:#bold).
+    t emphasizeFrom:(t findString:'lazy') 
+      count:4 with:(Array with:#color->(Color red)
+                                                      with:#italic).
+    t emphasizeFrom:(t findString:'dog') 
+      count:3 with:#underline.
+
+    v := HVScrollableView for:EditTextView.
+    v contents:t.
+
+    v width:450.
+    v open.
+                                                                        [exEnd]
+
+                                                                        [exBegin]
+    |t v|
+    
+    t := 'a',('1' emphasizeAllWith:#subscript),'x',('3' emphasizeAllWith:#superscript)
+         ,'a',('2' emphasizeAllWith:#subscript),'x',('2' emphasizeAllWith:#superscript)
+         ,'a',('3' emphasizeAllWith:#subscript),'x',('n' emphasizeAllWith:#superscript).
+
+    Dialog information:t.
+                                                                        [exEnd]
+
   plain string (for comparison):
                                                                         [exBegin]
-    Dialog
-        warn:'hello'
+    Dialog information:'hello'
                                                                         [exEnd]
 
 
   emphasized strings as dialog titles:
                                                                         [exBegin]
-    Dialog
-        warn:((Text string:'hello') allBold)
+    Dialog 
+        information:((Text string:'hello') allBold)
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' emphasis:#italic)
+        information:(Text string:'hello' emphasis:#italic)
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' emphasis:#(underline))
+        information:(Text string:'hello' emphasis:#(underline))
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' emphasis:#(underwave))
+        information:(Text string:'hello' emphasis:#(underwave))
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' emphasis:#(bold underline))
+        information:(Text string:'hello' emphasis:#(bold underline))
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' 
+        information:(Text string:'hello' 
                  emphasis:(Array with:#bold
                                  with:#strikeout
                                  with:(#color->Color red)))
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' 
+        information:(Text string:'hello' 
                  emphasis:(Array with:(#color->Color black)
                                  with:#underwave
                                  with:(#underlineColor->Color red)))
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' 
+        information:(Text string:'hello' 
                  emphasis:(Array with:#bold
                                  with:#strikeout
                                  with:(#color->Color red)
@@ -130,30 +164,10 @@
                                                                         [exEnd]
                                                                         [exBegin]
     Dialog
-        warn:(Text string:'hello' color:(Color red))
+        information:(Text string:'hello' color:(Color red))
                                                                         [exEnd]
 
 
-  in an editTextView:
-                                                                        [exBegin]
-    |t v|
-
-    t := 'The quick brown fox jumps over the lazy dog' asText.
-    t emphasizeFrom:(t findString:'quick') count:5 with:#bold.
-    t emphasizeFrom:(t findString:'brown') count:9 
-                                         with:(Array with:#color->(Color name:'brown')
-                                                     with:#bold).
-    t emphasizeFrom:(t findString:'lazy') count:4 
-                                          with:(Array with:#color->(Color red)
-                                                      with:#italic).
-    t emphasizeFrom:(t findString:'dog') count:3 with:#underline.
-
-    v := HVScrollableView for:EditTextView.
-    v contents:t.
-
-    v width:450.
-    v open.
-                                                                        [exEnd]
 "
 ! !
 
@@ -188,6 +202,8 @@
     StrikeoutColorEmphasis := #strikeoutColor. 
     EtchColorEmphasis := #etchColor.
     FontEmphasis := #font.
+    Superscript := #superscript.
+    Subscript := #subscript.
 
     "
      Text initialize
@@ -746,16 +762,17 @@
 
 !Text methodsFor:'displaying'!
 
-displayOn:aGC x:x0 y:y opaque:opaqueWanted
-    "display the receiver on a GC"
+displayOn:aGC x:x0 y:yBase opaque:opaqueWanted
+    "display the receiver on a GC.
+     This is one of the ugliest pieces of code..."
 
     |savedFont savedPaint savedFgPaint savedBgPaint font color boldFont italicFont boldItalicFont 
      bgPaint etchColor ulPaint strikePaint
      wasItalic overline altFont
-     bold italic underline underwave strikeout reverse
+     bold italic underline underwave strikeout reverse subOrSuperscript
      pos    "{ Class: SmallInteger }"
      endPos "{ Class: SmallInteger }"
-     x      
+     x y    
      l      "{ Class: SmallInteger }"
      yL k value device opaque|
 
@@ -779,9 +796,10 @@
         wasItalic := italic.
         color := savedPaint.
         bold := italic := underline := underwave := strikeout := reverse := false.
-        altFont := nil.
+        altFont := subOrSuperscript := nil.
         bgPaint := savedBgPaint.
-
+        y := yBase.
+        
         emphasis isSymbol ifTrue:[
             emphasis == BoldEmphasis ifTrue:[bold := true]
             ifFalse:[emphasis == ItalicEmphasis ifTrue:[italic := true]
@@ -795,7 +813,9 @@
             ifFalse:[emphasis == BoldUnderwaveEmphasis ifTrue:[bold := underwave := true]
             ifFalse:[emphasis == ItalicUnderlineEmphasis ifTrue:[italic := underline := true]
             ifFalse:[emphasis == ItalicUnderwaveEmphasis ifTrue:[italic := underwave := true]
-            ]]]]]]]]]]]
+            ifFalse:[emphasis == Subscript ifTrue:[subOrSuperscript := Subscript]
+            ifFalse:[emphasis == Superscript ifTrue:[subOrSuperscript := Superscript]
+            ]]]]]]]]]]]]]
         ] ifFalse:[
             (emphasis isMemberOf:Association) ifTrue:[
                 value := emphasis value.
@@ -836,6 +856,8 @@
                         ifFalse:[emphasis == BoldUnderwaveEmphasis ifTrue:[bold := underwave := true]
                         ifFalse:[entry == ItalicUnderlineEmphasis ifTrue:[italic := underline := true]
                         ifFalse:[emphasis == ItalicUnderwaveEmphasis ifTrue:[italic := underwave := true]
+                        ifFalse:[emphasis == Subscript ifTrue:[subOrSuperscript := Subscript]
+                        ifFalse:[emphasis == Superscript ifTrue:[subOrSuperscript := Superscript]
                         ifFalse:[
                             (entry isMemberOf:Association) ifTrue:[
                                 value := entry value.
@@ -863,7 +885,7 @@
                                     ]]]]]]
                                 ]
                             ]
-                        ]]]]]]]]]]]
+                        ]]]]]]]]]]]]]
                     ]
                 ]
             ]
@@ -894,6 +916,14 @@
                 ]
             ].
         ].
+        subOrSuperscript notNil ifTrue:[
+            font := font asSize:(font size * 3 // 4).
+            subOrSuperscript == Superscript ifTrue:[
+                y := y - (font height // 3).
+            ] ifFalse:[                
+                y := y + (font height // 3).
+            ].    
+        ].    
         aGC basicFont:font.
         reverse ifTrue:[
             aGC paint:bgPaint on:color.
--- a/UnitConverter.st	Thu Jan 14 06:55:34 2016 +0100
+++ b/UnitConverter.st	Sun Jan 17 06:49:20 2016 +0100
@@ -313,7 +313,7 @@
     self addConversion:100         from:#are      to:#'meter^2'.
     self addConversion:100         from:#hectare  to:#are.
 
-    "/ german area - add your countries, and return to me...
+    "/ german area - add your countries, and return to me ...
     Aliases at:#'german-ar'      put:#are.
     Aliases at:#'german-hektar'  put:#hectare.
 
@@ -322,7 +322,7 @@
 
     self addConversion:231      from:#gallon to:#'inch^3'.
     self addConversion:(1/4)    from:#quart to:#gallon.  "/ well - at least here,
-                                                         "/ that's also 1/4th of a good wine ;-)
+                                                         "/ thats also 1/4th of a good wine ;-)
     self addConversion:(1/2)    from:#pint to:#quart.
     self addConversion:(1/16)   from:#floz to:#pint.
     self addConversion:(1/8)    from:#fldr to:#floz.
@@ -387,6 +387,11 @@
     self addConversion:[:d | d * 1.8 + 32] from:#celsius    to:#fahrenheit.
     self addConversion:[:f | (f - 32) / 1.8] from:#fahrenheit to:#celsius.
 
+    "/ ---------------- nature ---------------- 
+    Constants at:#planckLength   put:#(1.616e-35   #'m').
+    Constants at:#planckMass     put:#(2.176-8     #'Kg').
+    Constants at:#planckTime     put:#(5.391e-44   #'s').
+    
     "
      Conversions := nil.
      UnitConverter initializeConversions
--- a/abbrev.stc	Thu Jan 14 06:55:34 2016 +0100
+++ b/abbrev.stc	Sun Jan 17 06:49:20 2016 +0100
@@ -39,7 +39,6 @@
 LazyArray LazyArray stx:libbasic2 'Collections-Arrayed' 0
 LineSegment LineSegment stx:libbasic2 'Graphics-Geometry-Objects' 0
 List List stx:libbasic2 'Collections-Sequenceable' 0
-MacPlistBinaryDecoder MacPlistBinaryDecoder stx:libbasic2 'System-Support-FileFormats' 0
 MappedCollection MappedCollection stx:libbasic2 'Collections-Sequenceable' 0
 Monitor Monitor stx:libbasic2 'Kernel-Processes' 0
 MultiReadStream MultiReadStream stx:libbasic2 'Streams-Misc' 0
@@ -90,6 +89,7 @@
 AATreeNode AATreeNode stx:libbasic2 'Collections-Ordered-Trees' 0
 Arrow Arrow stx:libbasic2 'Graphics-Geometry-Objects' 0
 ArrowedSpline ArrowedSpline stx:libbasic2 'Graphics-Geometry-Objects' 0
+AutoResizingOrderedCollectionWithDefault AutoResizingOrderedCollectionWithDefault stx:libbasic2 'Collections-Sequenceable' 0
 BackgroundJob BackgroundJob stx:libbasic2 'System-Support' 0
 BackgroundPeriodicalJob BackgroundPeriodicalJob stx:libbasic2 'System-Support' 0
 BackgroundQueueProcessingJob BackgroundQueueProcessingJob stx:libbasic2 'System-Support' 0
@@ -125,6 +125,12 @@
 HttpURI HttpURI stx:libbasic2 'Net-Resources' 0
 IPv6SocketAddress IPv6SocketAddress stx:libbasic2 'OS-Sockets' 2
 SftpURI SftpURI stx:libbasic2 'Net-Resources' 0
+RandomKISS RandomKISS stx:libbasic2 'Magnitude-Numbers' 0
+RandomMT19937 RandomMT19937 stx:libbasic2 'Magnitude-Numbers' 0
+RandomParkMiller RandomParkMiller stx:libbasic2 'Magnitude-Numbers' 0
+TextClassifier TextClassifier stx:libbasic2 'Collections-Text-Support' 0
+BayesClassifier BayesClassifier stx:libbasic2 'Collections-Text-Support' 0
+MacPlistBinaryDecoder MacPlistBinaryDecoder stx:libbasic2 'System-Support-FileFormats' 0
 PriorityQueue PriorityQueue stx:libbasic2 'Collections-Ordered' 0
 AVLTree AVLTree stx:libbasic2 'Collections-Ordered-Trees' 0
 ActiveObject ActiveObject stx:libbasic2 'Kernel-Processes' 0
@@ -147,10 +153,7 @@
 PluggableSet PluggableSet stx:libbasic2 'Collections-Unordered' 0
 PowerSet PowerSet stx:libbasic2 'Collections-Unordered' 0
 RandomBlumBlumShub RandomBlumBlumShub stx:libbasic2 'Magnitude-Numbers' 0
-RandomKISS RandomKISS stx:libbasic2 'Magnitude-Numbers' 0
 RandomKISS2 RandomKISS2 stx:libbasic2 'Magnitude-Numbers' 0
-RandomMT19937 RandomMT19937 stx:libbasic2 'Magnitude-Numbers' 0
-RandomParkMiller RandomParkMiller stx:libbasic2 'Magnitude-Numbers' 0
 RandomRDRand RandomRDRand stx:libbasic2 'Magnitude-Numbers' 0
 SequenceableCollectionSorter SequenceableCollectionSorter stx:libbasic2 'Collections-Support' 0
 Trie Trie stx:libbasic2 'Collections-Ordered' 0
--- a/bc.mak	Thu Jan 14 06:55:34 2016 +0100
+++ b/bc.mak	Sun Jan 17 06:49:20 2016 +0100
@@ -174,6 +174,7 @@
 $(OUTDIR)AATreeNode.$(O) AATreeNode.$(H): AATreeNode.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\BinaryTreeNode.$(H) $(STCHDR)
 $(OUTDIR)Arrow.$(O) Arrow.$(H): Arrow.st $(INCLUDE_TOP)\stx\libbasic\Geometric.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\LineSegment.$(H) $(STCHDR)
 $(OUTDIR)ArrowedSpline.$(O) ArrowedSpline.$(H): ArrowedSpline.st $(INCLUDE_TOP)\stx\libbasic\Geometric.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\Spline.$(H) $(STCHDR)
+$(OUTDIR)AutoResizingOrderedCollectionWithDefault.$(O) AutoResizingOrderedCollectionWithDefault.$(H): AutoResizingOrderedCollectionWithDefault.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic2\AutoResizingOrderedCollection.$(H) $(STCHDR)
 $(OUTDIR)BackgroundJob.$(O) BackgroundJob.$(H): BackgroundJob.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\AbstractBackgroundJob.$(H) $(STCHDR)
 $(OUTDIR)BackgroundPeriodicalJob.$(O) BackgroundPeriodicalJob.$(H): BackgroundPeriodicalJob.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\AbstractBackgroundJob.$(H) $(STCHDR)
 $(OUTDIR)BackgroundQueueProcessingJob.$(O) BackgroundQueueProcessingJob.$(H): BackgroundQueueProcessingJob.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\AbstractBackgroundJob.$(H) $(STCHDR)
--- a/libInit.cc	Thu Jan 14 06:55:34 2016 +0100
+++ b/libInit.cc	Sun Jan 17 06:49:20 2016 +0100
@@ -115,6 +115,7 @@
 _AATreeNode_Init(pass,__pRT__,snd);
 _Arrow_Init(pass,__pRT__,snd);
 _ArrowedSpline_Init(pass,__pRT__,snd);
+_AutoResizingOrderedCollectionWithDefault_Init(pass,__pRT__,snd);
 _BackgroundJob_Init(pass,__pRT__,snd);
 _BackgroundPeriodicalJob_Init(pass,__pRT__,snd);
 _BackgroundQueueProcessingJob_Init(pass,__pRT__,snd);
--- a/libbasic2.rc	Thu Jan 14 06:55:34 2016 +0100
+++ b/libbasic2.rc	Sun Jan 17 06:49:20 2016 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic2.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,124
+  FILEVERSION     6,2,1,127
   PRODUCTVERSION  6,2,5,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 Additional Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.1.124\0"
+      VALUE "FileVersion", "6.2.1.127\0"
       VALUE "InternalName", "stx:libbasic2\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.5.0\0"
-      VALUE "ProductDate", "Thu, 01 Oct 2015 15:23:35 GMT\0"
+      VALUE "ProductDate", "Sat, 16 Jan 2016 14:14:08 GMT\0"
     END
 
   END
--- a/stx_libbasic2.st	Thu Jan 14 06:55:34 2016 +0100
+++ b/stx_libbasic2.st	Sun Jan 17 06:49:20 2016 +0100
@@ -252,9 +252,6 @@
         Promise
         Queue
         Random
-        (RandomKISS autoload)
-        (RandomMT19937 autoload)
-        (RandomParkMiller autoload)
         RandomTT800
         ReindexedCollection
         RunArray
@@ -279,7 +276,6 @@
         TSTreeNode
         TerminalSession
         Text
-        (TextClassifier autoload)
         TextStream
         TreeSet
         URI
@@ -294,12 +290,12 @@
         AATreeNode
         Arrow
         ArrowedSpline
+        AutoResizingOrderedCollectionWithDefault
         BackgroundJob
         BackgroundPeriodicalJob
         BackgroundQueueProcessingJob
         Base32Coder
         Base64Coder
-        (BayesClassifier autoload)
         Bezier2Segment
         BooleanArray
         CacheDictionaryWithFactory
@@ -330,6 +326,11 @@
         HttpURI
         IPv6SocketAddress
         SftpURI
+        (RandomKISS autoload)
+        (RandomMT19937 autoload)
+        (RandomParkMiller autoload)
+        (TextClassifier autoload)
+        (BayesClassifier autoload)
         (MacPlistBinaryDecoder autoload)
         (PriorityQueue autoload)
         (AVLTree autoload)