Merge jv
authorMerge Script
Fri, 25 Nov 2016 07:07:27 +0100
branchjv
changeset 21042 edb2e7f82c62
parent 21027 ad86468de3a0 (current diff)
parent 21041 76b15013e62c (diff)
child 21087 33ca8ed03893
Merge
AbstractOperatingSystem.st
CharacterArray.st
Collection.st
Exception.st
ExternalStream.st
GenericException.st
NonPositionableExternalStream.st
PeekableStream.st
PositionableStream.st
SequenceableCollection.st
Stream.st
UserPreferences.st
--- a/AbstractOperatingSystem.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/AbstractOperatingSystem.st	Fri Nov 25 07:07:27 2016 +0100
@@ -2572,6 +2572,7 @@
         environment:nil
         inDirectory:aDirectory
         lineWise:false
+        newPgrp:true
         showWindow:showWindowBooleanOrNil
         onError:[:status| false]
 
--- a/CharacterArray.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/CharacterArray.st	Fri Nov 25 07:07:27 2016 +0100
@@ -16,12 +16,12 @@
 "{ NameSpace: Smalltalk }"
 
 UninterpretedBytes variableByteSubclass:#CharacterArray
-        instanceVariableNames:''
-        classVariableNames:'DecoderTables DecodingFailedSignal EncoderTables
-                EncodingFailedSignal PreviousMatches UnicodeDenormalizationMap
-                UnicodeNormalizationMap'
-        poolDictionaries:''
-        category:'Collections-Text'
+	instanceVariableNames:''
+	classVariableNames:'DecoderTables DecodingFailedSignal EncoderTables
+		EncodingFailedSignal PreviousMatches UnicodeDenormalizationMap
+		UnicodeNormalizationMap'
+	poolDictionaries:''
+	category:'Collections-Text'
 !
 
 !CharacterArray class methodsFor:'documentation'!
@@ -3759,7 +3759,7 @@
      Notice, that errors may occur during the read,
      so you better setup some exception handler when using this method."
 
-    ^ Timestamp readFromString:self
+    ^ Timestamp readFrom:self
 
     "
      '2014-11-10 21:30:22.444' asTimestamp
@@ -4043,7 +4043,7 @@
      Notice, that errors may occur during the read,
      so you better setup some exception handler when using this method."
 
-    ^ UtcTimestamp readFromString:self
+    ^ UtcTimestamp readFrom:self
 
     "
      '2014-11-10 21:30:22.444' asUtcTimestamp
--- a/Collection.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/Collection.st	Fri Nov 25 07:07:27 2016 +0100
@@ -257,9 +257,9 @@
 !
 
 withSize:n
-    "obsolete: please use newWithSize:, for its better name
-     Return a new collection which really provides space for n elements.
-     Kludges around the stupid definition of OrderedCollection>>new:"
+    "obsolete: please use newWithSize:, for its better name"
+
+    <resource: #obsolete>
 
     ^ self newWithSize:n
 ! !
@@ -273,6 +273,7 @@
     ^ self newWithSize:n
 ! !
 
+
 !Collection class methodsFor:'Signal constants'!
 
 emptyCollectionSignal
@@ -547,6 +548,7 @@
     "Created: / 22-10-2008 / 21:29:27 / cg"
 ! !
 
+
 !Collection methodsFor:'accessing'!
 
 anElement
@@ -5997,6 +5999,7 @@
     ^ aVisitor visitCollection:self with:aParameter
 ! !
 
+
 !Collection class methodsFor:'documentation'!
 
 version
--- a/Exception.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/Exception.st	Fri Nov 25 07:07:27 2016 +0100
@@ -60,6 +60,12 @@
 "
 ! !
 
+!Exception class methodsFor:'testing'!
+
+isAbstract
+    ^ self == Exception
+! !
+
 
 !Exception class methodsFor:'documentation'!
 
--- a/ExternalStream.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/ExternalStream.st	Fri Nov 25 07:07:27 2016 +0100
@@ -1939,6 +1939,12 @@
     ^ NonPositionableExternalStream makePipe.
 ! !
 
+!ExternalStream class methodsFor:'testing'!
+
+isAbstract
+    ^ self == ExternalStream
+! !
+
 !ExternalStream methodsFor:'Compatibility-Dolphin'!
 
 beText
@@ -5576,8 +5582,10 @@
 
 atEnd
     "return true, if position is at end.
-     A stream is at the end, if the next read operation
-     would return immediately without waiting."
+     If a stream is at the end, the next read operation
+     would return or raise an exception immediately without waiting.
+     If a stream is not at the end, this may be a blocking operation
+     (see NonPositionableExternalStream)"
 
 %{
     OBJ fp, pos, lim;
--- a/GenericException.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/GenericException.st	Fri Nov 25 07:07:27 2016 +0100
@@ -224,6 +224,7 @@
     self raiseErrorString:messageText
 ! !
 
+
 !GenericException class methodsFor:'accessing'!
 
 errorString
@@ -1106,6 +1107,10 @@
 
 !GenericException class methodsFor:'testing'!
 
+isAbstract
+    ^ self == GenericException
+!
+
 isControlInterrupt
     ^ false
 
--- a/NonPositionableExternalStream.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/NonPositionableExternalStream.st	Fri Nov 25 07:07:27 2016 +0100
@@ -539,7 +539,12 @@
 !NonPositionableExternalStream methodsFor:'queries'!
 
 atEnd
-    "return true, if position is at end"
+    "return true, if position is at end.
+     Notice: this is a blocking operation, as we do not know in advance,
+     if there will be anything to read 
+     (i.e. if the partner will send more or close the stream).
+     If you want to check for available data, 
+     use nextAvailable:, or canReadWithoutBlocking"
 
     (self == StdInStream) ifTrue:[
         OperatingSystem hasConsole ifFalse:[
--- a/PeekableStream.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/PeekableStream.st	Fri Nov 25 07:07:27 2016 +0100
@@ -125,6 +125,12 @@
     "Modified: / 23-10-2006 / 16:33:40 / cg"
 ! !
 
+!PeekableStream class methodsFor:'testing'!
+
+isAbstract
+    ^ self == PeekableStream
+! !
+
 !PeekableStream methodsFor:'chunk input/output'!
 
 nextChunk
--- a/PositionableStream.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/PositionableStream.st	Fri Nov 25 07:07:27 2016 +0100
@@ -123,6 +123,12 @@
     "Modified: / 13-07-2006 / 20:36:54 / cg"
 ! !
 
+!PositionableStream class methodsFor:'testing'!
+
+isAbstract
+    ^ self == PositionableStream
+! !
+
 !PositionableStream methodsFor:'Compatibility-Dolphin'!
 
 endChunk
--- a/SequenceableCollection.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/SequenceableCollection.st	Fri Nov 25 07:07:27 2016 +0100
@@ -203,22 +203,6 @@
      (Array new:10) inspect.
      (Array withSize:10) inspect.
     "
-!
-
-withSize:size
-    "return a new collection of size.
-     For variable size collections, this is different from #new:,
-     in that #new: creates an empty collection with preallocated size,
-     while #withSize: creates a non empty one."
-
-    ^ (self new:size) grow:size.
-
-    "
-     (OrderedCollection new:10) inspect.
-     (OrderedCollection withSize:10) inspect.
-     (Array new:10) inspect.
-     (Array withSize:10) inspect.
-    "
 ! !
 
 !SequenceableCollection class methodsFor:'Signal constants'!
--- a/Stream.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/Stream.st	Fri Nov 25 07:07:27 2016 +0100
@@ -214,6 +214,12 @@
     ^ ChunkSeparator
 ! !
 
+!Stream class methodsFor:'testing'!
+
+isAbstract
+    ^ self == Stream
+! !
+
 !Stream methodsFor:'Compatibility-Dolphin'!
 
 display:someObject
@@ -223,6 +229,7 @@
     self nextPutAll: someObject asString.
 ! !
 
+
 !Stream methodsFor:'Compatibility-VW'!
 
 nl
@@ -232,6 +239,7 @@
     self nextPut:(Character nl)
 ! !
 
+
 !Stream methodsFor:'accessing'!
 
 contents
--- a/UserPreferences.st	Thu Nov 24 06:40:21 2016 +0100
+++ b/UserPreferences.st	Fri Nov 25 07:07:27 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1998 by eXept Software AG
 	      All Rights Reserved
@@ -2252,6 +2250,7 @@
 
     "
      UserPreferences current onlyShowTooltipsForActiveWindow
+     UserPreferences current onlyShowTooltipsForActiveWindow:false
     "
 !
 
@@ -2583,6 +2582,28 @@
     "
 !
 
+viewStyle
+    ^ self at:#viewStyle ifAbsent:[ nil ]
+
+    "
+     UserPreferences current viewStyle
+     UserPreferences current viewStyle:(ViewStyle adwaita)
+    "
+
+    "Created: / 24-11-2016 / 17:58:30 / cg"
+!
+
+viewStyle:aStyleSymbol
+    self at:#viewStyle put:aStyleSymbol
+
+    "
+     UserPreferences current viewStyle
+     UserPreferences current viewStyle:(ViewStyle adwaita)
+    "
+
+    "Created: / 24-11-2016 / 17:58:51 / cg"
+!
+
 waitCursorVisibleTime
     "anser the time (in ms), how long a wait cursor should be visible at least"