--- a/stx_libbasic2.st	Mon Oct 09 13:35:55 2006 +0200
+++ b/stx_libbasic2.st	Mon Oct 09 13:35:57 2006 +0200
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libbasic2' }"
 
 LibraryDefinition subclass:#stx_libbasic2
@@ -44,126 +43,11 @@
 
 !stx_libbasic2 class methodsFor:'description'!
 
-classNamesAndAttributes
+preRequisites
     ^ #(
-	"/ <className> or (<className> attributes...)
-	'ActorStream'
-	('AppletalkSocketAddress' #autoload)
-	('Archiver' #unix)
-	('Arrow' #autoload)
-	('ArrowedSpline' #autoload)
-	('BIG5EncodedString' #autoload)
-	('BZip2Stream' #unix)
-	'Base64Coder'
-	('Bezier' #autoload)
-	('Bezier2Segment' #autoload)
-	('BinaryTree' #autoload)
-	'BitArray'
-	'BooleanArray'
-	('CRC32Stream' #autoload)
-	'CacheDictionary'
-	'CacheDictionaryWithFactory'
-	('Circle' #autoload)
-	('CollectingSharedQueueStream' #autoload)
-	'CompressionStream'
-	('CompressionStreamTest' #autoload)
-	('Cons' #autoload)
-	('ConsStream' #autoload)
-	('Curve' #autoload)
-	('DecNetSocketAddress' #autoload)
-	'DirectoryContents'
-	('EllipticalArc' #autoload)
-	('EpsonFX1PrinterStream' #autoload)
-	('ExternalLong' #autoload)
-	'FileSorter'
-	('FileText' #autoload)
-	'FileURI'
-	'FourByteString'
-	'FtpURI'
-	('GBEncodedString' #autoload)
-	('HPLjetIIPrinterStream' #autoload)
-	('HandlerCollection' #autoload)
-	'HierarchicalURI'
-	'HostAddressLookupError'
-	'HostNameLookupError'
-	'HttpURI'
-	'IPSocketAddress'
-	'IPv6SocketAddress'
-	'IntegerArray'
-	('InterestConverterWithParameters' #autoload)
-	('InternalPipeStream' #autoload)
-	'Iterator'
-	'JISEncodedString'
-	('KSCEncodedString' #autoload)
-	('KeywordInContextIndexBuilder' #autoload)
-	('LazyArray' #autoload)
-	('LazyCons' #autoload)
-	('LazyValue' #autoload)
-	('LineSegment' #autoload)
-	'List'
-	'LongIntegerArray'
-	'MappedCollection'
-	('MessageChannel' #autoload)
-	'Monitor'
-	'NameLookupError'
-	('NumberSet' #autoload)
-	('OperationQueue' #autoload)
-	'OrderedDictionary'
-	'OrderedSet'
-	'Polygon'
-	'PostscriptPrinterStream'
-	('PowerSet' #autoload)
-	'PrinterStream'
-	('PrintfScanf' #autoload)
-	'Promise'
-	'Queue'
-	'Random'
-	'RandomGenerator'
-	('RandomParkMiller' #autoload)
-	('RandomTT800' #autoload)
-	'RunArray'
-	('SequenceableCollectionSorter' #autoload)
-	('SerialPort' #win32)
-	'SharedCollection'
-	'SharedQueue'
-	'SignedIntegerArray'
-	'SignedLongIntegerArray'
-	'SignedWordArray'
-	'Singleton'
-	'Socket'
-	'SocketAddress'
-	'SocketAddressInfo'
-	'SoundStream'
-	('Spline' #autoload)
-	('SplittingWriteStream' #autoload)
-	'Stack'
-	'Text'
-	'TextStream'
-	'TimeDuration'
-	'TimedPromise'
-	'TwoByteString'
-	'UDSocketAddress'
-	'URI'
-	'UUID'
-	'UnboxedIntegerArray'
-	'UndoSupport'
-	'Unicode16String'
-	'Unicode32String'
-	'UnitConverter'
-	('UnixPTYStream' #autoload)
-	('ValueLink' #autoload)
-	('VariableArray' #autoload)
-	('VariableString' #autoload)
-	('WinAPIFunction' #autoload)
-	'WordArray'
-	'ZipArchive'
-	('ZipStream' #unix)
-	'stx_libbasic2'
-    )
-!
-
-extensionMethodNames
-    ^ #(
+        #'stx:goodies/communication'
+        #'stx:libbasic'
+        #'stx:libtool'
     )
 ! !
 
@@ -209,6 +93,146 @@
     "Created: / 23-08-2006 / 11:06:17 / cg"
 ! !
 
+!stx_libbasic2 class methodsFor:'description - contents'!
+
+classNamesAndAttributes
+    "<className> or (<className> attributes...) in load order"
+
+    ^ #(
+        ActorStream
+        (AppletalkSocketAddress #autoload)
+        (Archiver #unix #autoload)
+        (Arrow #autoload)
+        (ArrowedSpline #autoload)
+        (BIG5EncodedString #autoload)
+        (BZip2Stream #unix #autoload)
+        Base64Coder
+        (Bezier #autoload)
+        (Bezier2Segment #autoload)
+        (BinaryTree #autoload)
+        BooleanArray
+        (CRC32Stream #autoload)
+        CacheDictionary
+        (Circle #autoload)
+        (CollectingSharedQueueStream #autoload)
+        CompressionStream
+        (CompressionStreamTest #autoload)
+        (Cons #autoload)
+        (ConsStream #autoload)
+        (Curve #autoload)
+        (DecNetSocketAddress #autoload)
+        DirectoryContents
+        (EllipticalArc #autoload)
+        (EpsonFX1PrinterStream #autoload)
+        (ExternalLong #autoload)
+        FileSorter
+        (FileText #autoload)
+        FourByteString
+        (GBEncodedString #autoload)
+        (HPLjetIIPrinterStream #autoload)
+        (HandlerCollection #autoload)
+        InterestConverterWithParameters
+        (InternalPipeStream #autoload)
+        Iterator
+        (KSCEncodedString #autoload)
+        (KeywordInContextIndexBuilder #autoload)
+        (LazyArray #autoload)
+        (LazyCons #autoload)
+        (LazyValue #autoload)
+        (LineSegment #autoload)
+        List
+        MappedCollection
+        (MessageChannel #autoload)
+        Monitor
+        NameLookupError
+        (NumberSet #autoload)
+        (OperationQueue #autoload)
+        OrderedDictionary
+        OrderedSet
+        Polygon
+        (PowerSet #autoload)
+        PrinterStream
+        (PrintfScanf #autoload)
+        Promise
+        Queue
+        Random
+        RandomGenerator
+        (RandomParkMiller #autoload)
+        (RandomTT800 #autoload)
+        ReindexedCollection
+        RunArray
+        (SequenceableCollectionSorter #autoload)
+        (SerialPort #win32)
+        SharedCollection
+        Singleton
+        Socket
+        SocketAddress
+        SocketAddressInfo
+        SoundStream
+        (Spline #autoload)
+        (SplittingWriteStream #autoload)
+        Stack
+        Text
+        TextStream
+        TimeDuration
+        TwoByteString
+        URI
+        UUID
+        UnboxedIntegerArray
+        UndoSupport
+        UnitConverter
+        (UnixPTYStream #autoload)
+        (ValueLink #autoload)
+        (VariableArray #autoload)
+        (VariableString #autoload)
+        (WinAPIFunction #autoload)
+        ZipArchive
+        (ZipStream #unix #autoload)
+        #'stx_libbasic2'
+        BitArray
+        CacheDictionaryWithFactory
+        HierarchicalURI
+        HostAddressLookupError
+        HostNameLookupError
+        IPSocketAddress
+        IntegerArray
+        JISEncodedString
+        LongIntegerArray
+        PostscriptPrinterStream
+        SharedQueue
+        SignedIntegerArray
+        SignedLongIntegerArray
+        SignedWordArray
+        TimedPromise
+        UDSocketAddress
+        Unicode16String
+        Unicode32String
+        WordArray
+        FileURI
+        FtpURI
+        HttpURI
+        IPv6SocketAddress
+    )
+!
+
+extensionMethodNames
+    ^ #(
+        Object addInterest:
+        Object expressInterestIn:for:sendBack:
+        Object interests
+        Object interestsFor:
+        Object onChangeEvaluate:
+        Object onChangeSend:to:
+        Object removeInterest:
+        Object retractInterestIn:for:
+        Object retractInterests
+        Object retractInterestsFor:
+        Object retractInterestsForWhich:
+        Object retractInterestsIn:
+        Object when:send:to:
+    )
+! !
+
 !stx_libbasic2 class methodsFor:'description - project information'!
 
 companyName
@@ -240,5 +264,5 @@
 !stx_libbasic2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.19 2006-09-14 13:54:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.20 2006-10-09 11:35:57 cg Exp $'
 ! !