Merge jv
authorMerge Script
Wed, 03 Aug 2016 07:05:29 +0200
branchjv
changeset 20206 51652e7f46dd
parent 20205 03e626304d06 (current diff)
parent 20203 21227fea15dc (diff)
child 20210 b265371d06f7
Merge
AbstractOperatingSystem.st
AbstractTime.st
ApplicationDefinition.st
CharacterArray.st
ClassBuilder.st
Delay.st
ExceptionHandlerSet.st
False.st
Stream.st
String.st
True.st
--- a/AbstractOperatingSystem.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/AbstractOperatingSystem.st	Wed Aug 03 07:05:29 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
 	      All Rights Reserved
@@ -868,14 +870,14 @@
 !
 
 fork
-    "fork a new (HEAVY-weight) unix process.
+    "fork a new (HEAVY-weight) Unix process.
      Not supported with MSDOS & VMS systems.
-     Dont confuse this with Block>>fork, which creates
+     Do not confuse this with Block>>fork, which creates
      lightweight smalltalk processes. This method will return
      0 to the child process, and a non-zero number (which is the childs
      unix-process-id) to the parent (original) process.
 
-     In normal situations, you dont need to use this low level entry; see
+     In normal situations, you do not need to use this low level entry; see
      #startProcess: and #executCommand: for higher level interfaces."
 
     "/
@@ -2991,7 +2993,7 @@
 mountPoints
     "return a collection of mountPoints (aka. topDirectories of mounted file systems)"
 
-    ^ #()  "/ dont know here
+    ^ #()  "/ don't know here
 !
 
 parentDirectoryName
@@ -3141,11 +3143,11 @@
 
 defaultSignal:signalNumber
     "revert to the default action on arrival of a (Unix-)signal.
-     Dont confuse Unix signals with smalltalk signals.
+     Do not confuse Unix signals with smalltalk signals.
      WARNING: for some signals, it is no good idea to revert to default;
      for example, the default for SIGINT (i.e. ^C) is to exit; while the
      default for SIGQUIT (^ \) is to dump core.
-     Also, NOTICE that signal numbers are not portable between unix
+     Also, NOTICE that signal numbers are not portable between Unix
      systems - use OperatingSystem sigXXX to get the numeric value for
      a signal."
 
@@ -3171,11 +3173,11 @@
 
 disableSignal:signalNumber
     "disable (Unix-) signal processing for signalNumber.
-     Dont confuse Unix signals with smalltalk signals.
+     Do not confuse Unix signals with smalltalk signals.
      WARNING: for some signals, it is no good idea to disable
      them; for example, disabling the SIGINT signal turns off ^C
      handling.
-     Also, NOTICE that signal numbers are not portable between unix
+     Also, NOTICE that signal numbers are not portable between Unix
      systems - use OperatingSystem sigXXX to get the numeric value for
      a signal.
      Use only for fully debugged stand alone applications."
@@ -4227,7 +4229,7 @@
     "return a string giving the type of system we're running on.
      This is almost the same as getOSType, but the returned string
      is slightly different for some systems (i.e. iris vs. irix).
-     Dont depend on this - use getOSType. I dont really see a point
+     Do not depend on this - use getOSType. I dont really see a point
      here ...
      (except for slight differences between next/mach and other machs)"
 
@@ -6108,10 +6110,10 @@
      Use the millisecondTimeXXX:-methods to compare and add time deltas - these know about the wrap.
 
      BAD DESIGN:
-	This should be changed to return some instance of RelativeTime,
-	and these computations moved there.
-
-     Dont use this method in application code since it is an internal (private)
+        This should be changed to return some instance of RelativeTime,
+        and these computations moved there.
+
+     Do not use this method in application code since it is an internal (private)
      interface. For compatibility with ST-80, use Time millisecondClockValue.
     "
 
@@ -6125,7 +6127,7 @@
      others since 1900. The Time classes are prepared for this, and
      converts as appropriate (by using my fromOSTime: conversion methods).
 
-     Dont use this method in application code since it is an internal (private)
+     Do not use this method in application code since it is an internal (private)
      interface. For compatibility with ST-80, use Time>>millisecondClockValue.
      or use instances of Time, Date or Timestamp to work with.
     "
@@ -6182,7 +6184,7 @@
 
 millisecondTimeAdd:msTime1 and:msTime2
     "Add two millisecond times (such as returned getMillisecondTime).
-     The returned value is msTime1 + msTime2 where a wrap occurs 
+     The returned value is msTime1 + msTime2 where a wrap occurs
      at:16r1FFFFFFF (32-bit systems) or:16r1FFFFFFFFFFFFFFF (64-bit systems).
 
      This should really be moved to some RelativeTime class."
--- a/AbstractTime.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/AbstractTime.st	Wed Aug 03 07:05:29 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
               All Rights Reserved
@@ -260,8 +262,8 @@
 
     ^ Timestamp now utcSecondsSince1901
 
-    "                                                 
-     Timestamp primSecondsClock 
+    "
+     Timestamp primSecondsClock
     "
 ! !
 
@@ -302,7 +304,7 @@
 fromSeconds:seconds
     "return an instance that is constructed from seconds.
      This method is only allowed for second values as returned by
-     getSeconds, possibly adding/subtracting to that. 
+     getSeconds, possibly adding/subtracting to that.
      Never depend on any specific interpretation of the seconds,
      since it depends on how the OperatingSystem counts time
      (some start at 1900, others with 1970 ...)"
@@ -315,7 +317,7 @@
                                     on others: dont know
      (Timestamp day:1 month:1 year:1970 hour:1 minutes:0 seconds:0)
         getSeconds                  on UNIX: returns 0
-                                    on others: dont know
+                                    on others: don't know
     "
 
     "Modified: 1.7.1996 / 13:39:30 / cg"
@@ -1067,36 +1069,36 @@
         %t      seconds within hour  (unpadded)
         %T      seconds from midNight  (unpadded)
 
-        %(milli1) milliseconds, truncated to 1/10th of a second 0..9         
-        %(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2        
+        %(milli1) milliseconds, truncated to 1/10th of a second 0..9
+        %(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2
         %(milli3) milliseconds, same as %i for convenience
 
      Timestamp only:
-        %(Day)         - day - unpadded                    
-        %(Month)       - month - unpadded                    
+        %(Day)         - day - unpadded
+        %(Month)       - month - unpadded
         %(yearOrTime)  - year or time 5 digits    as in unix-ls:
                                                   year if it is not the current year;
                                                   time otherwise
         %(weekDay)      - day in week (1->monday, 2->tuesday, ... ,7->sunday)
 
-        %(dayName)      - full day name     
-        %(DayName)      - full day name, first character uppercase      
-        %(DAYNAME)      - full day name, all uppercase       
+        %(dayName)      - full day name
+        %(DayName)      - full day name, first character uppercase
+        %(DAYNAME)      - full day name, all uppercase
 
-        %(monthName)    - full month name     
-        %(MonthName)    - full month name, first character uppercase      
-        %(MONTHNAME)    - full month name, all uppercase       
+        %(monthName)    - full month name
+        %(MonthName)    - full month name, first character uppercase
+        %(MONTHNAME)    - full month name, all uppercase
 
-        %(shortDayName) - short (abbreviated) day name     
-        %(ShortDayName) - short (abbreviated) day name, first character uppercase      
-        %(SHORTDAYNAME) - short (abbreviated) day name, all uppercase       
+        %(shortDayName) - short (abbreviated) day name
+        %(ShortDayName) - short (abbreviated) day name, first character uppercase
+        %(SHORTDAYNAME) - short (abbreviated) day name, all uppercase
 
-        %(shortMonthName) - short (abbreviated) month name     
-        %(ShortMonthName) - short (abbreviated) month name, first character uppercase      
-        %(SHORTMONTHNAME) - short (abbreviated) month name, all uppercase       
+        %(shortMonthName) - short (abbreviated) month name
+        %(ShortMonthName) - short (abbreviated) month name, first character uppercase
+        %(SHORTMONTHNAME) - short (abbreviated) month name, all uppercase
 
-        %(nth)          - counting day-in-month (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
-        %(weekDayNth)   - counting day-in-week (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
+        %(nth)          - counting day-in-month (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
+        %(weekDayNth)   - counting day-in-week (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
         %(weekNth)      - counting week-in-year (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
 
 
@@ -1105,29 +1107,29 @@
        Year:
           YYYY (eg 1997)
                 Date today printStringFormat:'%(year)'
-                Timestamp now printStringFormat:'%(year)'  
+                Timestamp now printStringFormat:'%(year)'
 
        Year and month:
           YYYY-MM (eg 1997-07)
-                Date today printStringFormat:'%(year)-%(month)'  
-                Timestamp now printStringFormat:'%(year)-%(month)'  
+                Date today printStringFormat:'%(year)-%(month)'
+                Timestamp now printStringFormat:'%(year)-%(month)'
 
        Complete date:
           YYYY-MM-DD (eg 1997-07-16)
-                Date today printStringFormat:'%(year)-%(month)-%(day)'    
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'  
+                Date today printStringFormat:'%(year)-%(month)-%(day)'
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'
 
        Complete date plus hours and minutes:
           YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'  
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'
 
        Complete date plus hours, minutes and seconds:
           YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'  
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'
 
        Complete date plus hours, minutes, seconds and a decimal fraction of a second
           YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'  
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'
 
     "
 
@@ -1202,42 +1204,42 @@
         %t      seconds within hour  (unpadded)
         %T      seconds from midNight  (unpadded)
 
-        %(TZD)  timeZone delta of the receiver from UTC in the format +/-hh:mm  
+        %(TZD)  timeZone delta of the receiver from UTC in the format +/-hh:mm
 
-        %(milli1) milliseconds, truncated to 1/10th of a second 0..9         
-        %(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2        
+        %(milli1) milliseconds, truncated to 1/10th of a second 0..9
+        %(milli2) milliseconds, truncated to 1/100th of a second 00..99 0-padded to length 2
         %(milli3) milliseconds, same as %i for convenience
 
      Timestamp only:
-        %(Day)         - day - unpadded                    
-        %(Month)       - month - unpadded                    
+        %(Day)         - day - unpadded
+        %(Month)       - month - unpadded
         %(yearOrTime)  - year or time 5 digits    as in unix-ls:
                                                   year if it is not the current year;
                                                   time otherwise
         %(weekDay)      - day in week (1->monday, 2->tuesday, ... ,7->sunday)
 
-        %(dayName)      - full day name     
-        %(DayName)      - full day name, first character uppercase      
-        %(DAYNAME)      - full day name, all uppercase       
+        %(dayName)      - full day name
+        %(DayName)      - full day name, first character uppercase
+        %(DAYNAME)      - full day name, all uppercase
 
-        %(monthName)    - full month name     
-        %(MonthName)    - full month name, first character uppercase      
-        %(MONTHNAME)    - full month name, all uppercase       
+        %(monthName)    - full month name
+        %(MonthName)    - full month name, first character uppercase
+        %(MONTHNAME)    - full month name, all uppercase
 
-        %(shortDayName) - short (abbreviated) day name     
-        %(ShortDayName) - short (abbreviated) day name, first character uppercase      
-        %(SHORTDAYNAME) - short (abbreviated) day name, all uppercase       
+        %(shortDayName) - short (abbreviated) day name
+        %(ShortDayName) - short (abbreviated) day name, first character uppercase
+        %(SHORTDAYNAME) - short (abbreviated) day name, all uppercase
 
-        %(shortMonthName) - short (abbreviated) month name     
-        %(ShortMonthName) - short (abbreviated) month name, first character uppercase      
-        %(SHORTMONTHNAME) - short (abbreviated) month name, all uppercase       
+        %(shortMonthName) - short (abbreviated) month name
+        %(ShortMonthName) - short (abbreviated) month name, first character uppercase
+        %(SHORTMONTHNAME) - short (abbreviated) month name, all uppercase
 
-        %(nth)          - counting day-in-month (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
-        %(weekDayNth)   - counting day-in-week (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')      
+        %(nth)          - counting day-in-month (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
+        %(weekDayNth)   - counting day-in-week (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
         %(weekNth)      - counting week-in-year (1->'st'; 2->'nd'; 3->'rd'; 4...->'th')
 
-        %(yearRoman)    - year, in roman letters                    
-        %(monthRoman)   - month, in roman letters                    
+        %(yearRoman)    - year, in roman letters
+        %(monthRoman)   - month, in roman letters
 
 
      The ISO8601 printString are generated with:
@@ -1245,29 +1247,29 @@
        Year:
           YYYY (eg 1997)
                 Date today printStringFormat:'%(year)'
-                Timestamp now printStringFormat:'%(year)'  
+                Timestamp now printStringFormat:'%(year)'
 
        Year and month:
           YYYY-MM (eg 1997-07)
-                Date today printStringFormat:'%(year)-%(month)'  
-                Timestamp now printStringFormat:'%(year)-%(month)'  
+                Date today printStringFormat:'%(year)-%(month)'
+                Timestamp now printStringFormat:'%(year)-%(month)'
 
        Complete date:
           YYYY-MM-DD (eg 1997-07-16)
-                Date today printStringFormat:'%(year)-%(month)-%(day)'    
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'  
+                Date today printStringFormat:'%(year)-%(month)-%(day)'
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)'
 
        Complete date plus hours and minutes:
           YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'  
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m%(TZD)'
 
        Complete date plus hours, minutes and seconds:
           YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'  
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s%(TZD)'
 
        Complete date plus hours, minutes, seconds and a decimal fraction of a second
           YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
-                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'  
+                Timestamp now printStringFormat:'%(year)-%(month)-%(day)T%h:%m:%s.%(milli2)%(TZD)'
 
     "
 
@@ -1293,7 +1295,7 @@
     ] ifFalse:[
         s := tzDelta < 0 ifTrue:[ '-' ] ifFalse:[ '+' ].
         tzDelta := tzDelta abs.
-        s := s  , ((tzDelta // 60) printStringLeftPaddedTo:2 with:$0), 
+        s := s  , ((tzDelta // 60) printStringLeftPaddedTo:2 with:$0),
             ':' , ((tzDelta \\ 60) printStringLeftPaddedTo:2 with:$0).
     ].
     aDictionary at:#TZD put:s
--- a/ApplicationDefinition.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/ApplicationDefinition.st	Wed Aug 03 07:05:29 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -102,8 +100,8 @@
 appSourcesProjects
     "Returns only the application projects (which are included in the application module)"
 
-    ^ self effectivePreRequisites 
-        select:[:each | 
+    ^ self effectivePreRequisites
+        select:[:each |
             (self moduleFor: each) = self module
         ].
 
@@ -401,7 +399,7 @@
     "answer the base-name of the application icon (i.e. 'app' in <app>.ico).
 
      Subclasses MUST redefine this to either return the name of the icon file or
-     nil, if they dont have one.
+     nil, if they do not have one.
      We NO LONGER SUPPORT THE PREVIOUS APPNAME-DEFAULT,
      because users tend to forget to add the icon file and then get a failing build. "
 
@@ -425,8 +423,8 @@
     ^ self applicationNameFromPackage
 
     "
-     bosch_dapasx_application applicationName     
-     stx_projects_smalltalk applicationName     
+     bosch_dapasx_application applicationName
+     stx_projects_smalltalk applicationName
     "
 
     "Created: / 08-08-2006 / 20:25:39 / fm"
@@ -603,9 +601,9 @@
     ^ path last
 
     "
-     bosch_dapasx_application applicationName     
-     stx_projects_smalltalk applicationName     
-     alspa_batch_application applicationName    
+     bosch_dapasx_application applicationName
+     stx_projects_smalltalk applicationName
+     alspa_batch_application applicationName
     "
 
     "Created: / 08-08-2006 / 20:25:39 / fm"
@@ -621,9 +619,9 @@
     ^self module, ':', self applicationNameFromPackage
 
     "
-     bosch_dapasx_application applicationPackage     
-     stx_projects_smalltalk applicationPackage     
-     alspa_batch_application applicationPackage            
+     bosch_dapasx_application applicationPackage
+     stx_projects_smalltalk applicationPackage
+     alspa_batch_application applicationPackage
     "
 
     "Created: / 08-08-2006 / 20:25:39 / fm"
@@ -954,9 +952,9 @@
 bmake_dot_mak_mappings
     ^ super bmake_dot_mak_mappings
         at:'SKIP_IF_ARG_IS_APP_TARGET' put:'
-@IF "%%1" EQU "exe" exit /b 0
-@IF "%%1" EQU "setup" exit /b 0
-@IF "%%1" EQU "pluginSetup" exit /b 0
+@IF "%1" EQU "exe" exit /b 0
+@IF "%1" EQU "setup" exit /b 0
+@IF "%1" EQU "pluginSetup" exit /b 0
 ';
         yourself
 
@@ -2932,7 +2930,7 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 
-LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
+LangString appOpen ${LANG_GERMAN}  "Mit %(PRODUCT_NAME) öffnen"
 LangString appOpen ${LANG_ENGLISH} "Open with %(PRODUCT_NAME)"
 
 LangString DESC_Section1 ${LANG_ENGLISH} "Program components of %(PRODUCT_NAME)"
@@ -2966,7 +2964,7 @@
 
 Function un.onInit
 !!insertmacro MUI_UNGETLANGUAGE
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie %(PRODUCT_NAME) und alle seine Komponenten deinstallieren?" IDYES +2
   Abort
 FunctionEnd
 
--- a/CharacterArray.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/CharacterArray.st	Wed Aug 03 07:05:29 2016 +0200
@@ -44,7 +44,7 @@
 "
     CharacterArray is a superclass for all kinds of Strings (i.e.
     (singleByte-)Strings, TwoByteStrings, UnicodeStrings
-    and whatever my come in the future.
+    and whatever may come in the future.
 
     This class is abstract, meaning that there are no instances of it;
     concrete subclasses define how the characters are stored (i.e. either as
@@ -53,30 +53,30 @@
     All this class does is provide common protocol for concrete subclasses.
 
     Notice:
-	internally, ST/X uses a unicode encoding for ALL characters - both
-	for individual chatacter entities and for strings of characters.
-	When reading/writing files in different encodings, the conversion is
-	done at read/write time by use of a CharacterEncoder instance.
-	These know how to convert to a wide range of encodings.
+        internally, ST/X uses a unicode encoding for ALL characters - both
+        for individual chatacter entities and for strings of characters.
+        When reading/writing files in different encodings, the conversion is
+        done at read/write time by use of a CharacterEncoder instance.
+        These know how to convert to a wide range of encodings.
 
     Also notice:
-	UTF8 and UTF16 are external encodings of a Unicode string; they are never
-	used internally. When interacting with a UTF8 interface (OS-API or files),
-	you should convert UTF8 into the internal full Unicode right at the interface.
-	Do not keep UTF8 around internally as String instances.
-	The reason is that UTF8 makes it harder to manipulate strings (for example
-	to insert/extract substrings or to get its size. Of such operations would
-	require a scan of the UTF8, which would complicate them).
-	Of course, there may be rare exceptions to this, for example if a file's contents
-	is treated as raw data, and the strings have to be copied/shuffled around only,
-	without any real processing on it.
+        UTF8 and UTF16 are external encodings of a Unicode string; they are never
+        used internally. When interacting with a UTF8 interface (OS-API or files),
+        you should convert UTF8 into the internal full Unicode right at the interface.
+        Do not keep UTF8 around internally as String instances.
+        The reason is that UTF8 makes it harder to manipulate strings (for example
+        to insert/extract substrings or to get its size. Of such operations would
+        require a scan of the UTF8, which would complicate them).
+        Of course, there may be rare exceptions to this, for example if a file's contents
+        is treated as raw data, and the strings have to be copied/shuffled around only,
+        without any real processing on it.
 
     [author:]
-	Claus Gittinger
+        Claus Gittinger
 
     [see also:]
-	String TwoByteString Unicode16String Uniode32String
-	StringCollection
+        String TwoByteString Unicode16String Uniode32String
+        StringCollection
 "
 ! !
 
@@ -8113,9 +8113,9 @@
 isUnicodeString
     "true if this is a 2- or 4-byte unicode string
      (i.e. not a single byte string).
-     Notice, that the name is misleading: 
+     Notice, that the name is misleading:
      all strings are use unicode encoding"
-     
+
     ^ false
 !
 
--- a/ClassBuilder.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/ClassBuilder.st	Wed Aug 03 07:05:29 2016 +0200
@@ -2313,10 +2313,12 @@
         poolDictionaries asCollectionOfWords do:[:eachPoolName |
             |pool|
 
-            environment isNameSpace ifTrue:[
-                pool := environment classNamed:eachPoolName.
-            ] ifFalse:[
-                pool := environment nameSpace classNamed:eachPoolName.
+            environment notNil ifTrue:[    
+                environment isNameSpace ifTrue:[
+                    pool := environment classNamed:eachPoolName.
+                ] ifFalse:[
+                    pool := environment nameSpace classNamed:eachPoolName.
+                ].
             ].
             pool isNil ifTrue:[
                 pool := Smalltalk classNamed:eachPoolName.
--- a/Delay.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/Delay.st	Wed Aug 03 07:05:29 2016 +0200
@@ -38,9 +38,9 @@
 
 documentation
 "
-    Instances of Delay are used to suspend the execution of a process 
-    (i.e. thread) for some time interval. 
-    Delays can be created either for some time-interval (seconds or milliseconds), 
+    Instances of Delay are used to suspend the execution of a process
+    (i.e. thread) for some time interval.
+    Delays can be created either for some time-interval (seconds or milliseconds),
     or for delaying until a specific time has reached.
     Once created, a delay is waited upon with Delay>>wait.
 
@@ -48,7 +48,7 @@
     the resumption time will ALWAYS be after the actual delay time.
     (i.e. a Delay for n-millis will actually suspend for more than n milliseconds)
 
-    Warning: 
+    Warning:
         currently, the implementation does not support delays longer than
         a system specific maximum - future versions may remove this limitation.
         For now, do not use delays longer than the value returned by
@@ -68,7 +68,7 @@
 "
 !
 
-examples 
+examples
 "
     Check your systems resolution with:
     (make certain, that no other timed processes are running in the background when doing this)
@@ -151,9 +151,9 @@
 !Delay class methodsFor:'instance creation'!
 
 for:aTimeDuration
-    "return a new Delay object for delaying aNumber seconds"
+    "return a new Delay object for delaying aTimeDuration"
 
-    ^ self new delay:aTimeDuration getMilliseconds.
+    ^ self new delay:aTimeDuration getMilliseconds
 
     "
       Delay for:10 seconds
--- a/ExceptionHandlerSet.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/ExceptionHandlerSet.st	Wed Aug 03 07:05:29 2016 +0200
@@ -39,7 +39,7 @@
 
 documentation
 "
-    A ExceptionHandlerSet allows a group of unrelated signals to be handled
+    An ExceptionHandlerSet allows a group of unrelated signals to be handled
     by individual handlers - their evaluation is equivalent to a corresponding
     number of nested signal handlers, but more efficient and
     somwehat easier to program.
@@ -146,8 +146,8 @@
     "return true, if the receiver accepts the argument, aSignal.
      (i.e. if any of the receiver's elements is aSignal or a parent of it)."
 
-    self keysDo:[:eachExceptionHandler | 
-        (eachExceptionHandler==anExceptionHandler 
+    self keysDo:[:eachExceptionHandler |
+        (eachExceptionHandler==anExceptionHandler
          or:[eachExceptionHandler accepts:anExceptionHandler]) ifTrue:[^ true].
     ].
     ^ false
@@ -217,7 +217,7 @@
     "return true, if the receiver handles the argument, anException.
      (i.e. if any of the receiver's elements handles anException)."
 
-    self keysDo:[:eachExceptionHandler| 
+    self keysDo:[:eachExceptionHandler|
         (eachExceptionHandler handles:anException) ifTrue:[^ true]
     ].
     ^ false
--- a/False.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/False.st	Wed Aug 03 07:05:29 2016 +0200
@@ -41,8 +41,8 @@
     False has only one instance, false, representing logical falsehood.
 
     Some methods are implemented here and in True, instead of the common
-    superclass Boolean. This has the advantage, that no truth-value checks 
-    are needed, but instead the thruth check is done in the method lookup.
+    superclass Boolean. This has the advantage that no truth-value checks
+    are needed, but instead the truth check is done in the method lookup.
     However, remember that some messages to booleans are inline coded in
     the compilers (both interpreted and machine code). Therefore redefinition
     of some methods here will not have any effect on compiled code.
--- a/Stream.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/Stream.st	Wed Aug 03 07:05:29 2016 +0200
@@ -70,7 +70,7 @@
                                                 if nil (the default), the signal
                                                 is raised, but if there is no handler,
                                                 nil is returned.
-        
+
     [Class variables / Exceptions:]
         StreamError             <Exception>     parent of all stream errors
 
@@ -90,13 +90,13 @@
         decisions. The biggest problem is the distinction between readable and writeable streams based on inheritance,
         instead of by either using state (i.e. a flag) or delegation.
         The problem is that there are streams which can be both, and maybe even dynamically change their opinion,
-        on whether being readable/writable. 
+        on whether being readable/writable.
         (For example, a buffer may be write-only while filled, but become readonly, when given to a consumer.)
 
         The above decision to base this on inheritance lead to the ugly ReadStream - WriteStream - ReadWriteStream
         hierarchy, with some subclasses undoing the blocking of their superclass.
 
-        Classes named 'ReadStream', 'WriteStream', 'ReadWriteStream', 'PeekableStream' and 'PositionableStream' should 
+        Classes named 'ReadStream', 'WriteStream', 'ReadWriteStream', 'PeekableStream' and 'PositionableStream' should
         all be eliminated in favour of a few flags in the 'Stream' superclass.
 
         It is really time for a new stream hierarchy (XStreams, for example).
@@ -3372,9 +3372,9 @@
 !
 
 throughElementForWhich:aBlock
-    "read elements until aBlock returns true for an element. 
+    "read elements until aBlock returns true for an element.
      Return the collected elements including that element.
-     Leave the stream positioned for the next read to return the element after that one."                                                             
+     Leave the stream positioned for the next read to return the element after that one."
 
     |answerStream element|
 
@@ -3584,17 +3584,17 @@
 !
 
 upToElementForWhich:aBlock
-    "read elements until aBlock returns true for an element. 
+    "read elements until aBlock returns true for an element.
      Return the collected elements excluding that element.
      Leave the stream positioned for the next read to return that element.
-     If no element matches, all elements up to the end are returned"                                                             
+     If no element matches, all elements up to the end are returned"
 
     |answerStream next|
 
     answerStream := WriteStream on:(self contentsSpecies new).
 
     [
-        self atEnd 
+        self atEnd
         or:[ (aBlock value: (next := self peek)) ]
     ] whileFalse:[
         answerStream nextPut:next.
--- a/String.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/String.st	Wed Aug 03 07:05:29 2016 +0200
@@ -306,7 +306,7 @@
 !
 
 new:n
-    "return a new empty string with anInteger characters.
+    "return a new empty string with n characters.
      In contrast to other smalltalks, this returns a string filled
      with spaces (instead of a string filled with 0-bytes).
      This makes much more sense, in that a freshly created string
@@ -542,7 +542,6 @@
 
 
 
-
 !String methodsFor:'accessing'!
 
 at:index
--- a/True.st	Fri Jul 29 21:40:03 2016 +0100
+++ b/True.st	Wed Aug 03 07:05:29 2016 +0200
@@ -41,8 +41,8 @@
     True has only one instance, true, representing logical truth.
 
     Some methods are implemented here and in False, instead of the common
-    superclass Boolean. This has the advantage, that no truth-value checks
-    are needed, but instead the thruth check is done in the method lookup.
+    superclass Boolean. This has the advantage that no truth-value checks
+    are needed, but instead the truth check is done in the method lookup.
     However, remember that some messages to booleans are inline coded in
     the compilers (both interpreted and machine code). Therefore redefinition
     of some methods here will not have any effect on compiled code.
@@ -51,13 +51,14 @@
 
     [see also:]
         False
-        
+
     [author:]
         Claus Gittinger
 "
 ! !
 
 
+
 !True methodsFor:'conditional evaluation'!
 
 and:aBlock