Merge jv
authorMerge Script
Sat, 26 Mar 2016 06:44:23 +0100
branchjv
changeset 3786 1a036255aa50
parent 3778 e45a8bf6639d (current diff)
parent 3785 67f47b59ad54 (diff)
child 3789 df7f675c8f9d
Merge
ZipArchive.st
--- a/Arrow.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/Arrow.st	Sat Mar 26 06:44:23 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic2' }"
 
+"{ NameSpace: Smalltalk }"
+
 LineSegment subclass:#Arrow
 	instanceVariableNames:'arrowHeadPosition arrowHeadLength arrowHeadAngle arrowHeadClosed'
 	classVariableNames:'DefaultLength DefaultAngle'
@@ -455,9 +457,9 @@
 !
 
 displayOn:aGC filled:filled
-    "display the receivers arrow in the graphicsContext, aGC"
+    "display the receiver's arrow in the graphicsContext, aGC"
 
-    |arrowHeadPoint savedLineStyle p1 p2 p3 arrowPoints middle oldCap|
+    |arrowHeadPoint savedLineStyle p1 p2 arrowPoints middle oldCap|
 
     savedLineStyle := aGC lineStyle.
     aGC lineStyle:#solid.
@@ -570,11 +572,12 @@
 !Arrow class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Arrow.st,v 1.28 2011-03-14 10:43:41 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/Arrow.st,v 1.28 2011-03-14 10:43:41 cg Exp $'
+    ^ '$Header$'
 ! !
 
+
 Arrow initialize!
--- a/FilteringStream.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/FilteringStream.st	Sat Mar 26 06:44:23 2016 +0100
@@ -452,6 +452,8 @@
 !
 
 isWritable
+    "return true, if writing is supported by the receiver."
+
     ^ outputStream notNil and:[outputStream isWritable]
 !
 
--- a/Random.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/Random.st	Sat Mar 26 06:44:23 2016 +0100
@@ -802,6 +802,9 @@
 !
 
 isWritable
+    "return true, if writing is supported by the receiver.
+     Random Generators never are"
+
     ^ false
 
     "Created: 1.4.1997 / 22:38:27 / cg"
--- a/ReindexedCollection.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/ReindexedCollection.st	Sat Mar 26 06:44:23 2016 +0100
@@ -221,7 +221,7 @@
 !ReindexedCollection methodsFor:'converting-reindexed'!
 
 from:startIndex
-    "return a new collection representing the receivers elements starting at startIndex."
+    "return a new collection representing the receiver's elements starting at startIndex."
 
     interval step == 1 ifTrue:[
         ^ ReindexedCollection 
@@ -244,7 +244,7 @@
 !
 
 from:startIndex to:stopIndex
-    "return a new collection representing the receivers elements 
+    "return a new collection representing the receiver's elements 
      starting at startIndex upTo and including endIndex."
 
     interval step == 1 ifTrue:[
@@ -277,7 +277,7 @@
 !
 
 to:stopIndex
-    "return a new collection representing the receivers elements upTo and including endIndex."
+    "return a new collection representing the receiver's elements upTo and including endIndex."
 
     interval step == 1 ifTrue:[
         ^ ReindexedCollection 
--- a/Text.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/Text.st	Sat Mar 26 06:44:23 2016 +0100
@@ -1544,8 +1544,7 @@
 !
 
 printOn:aStream
-    "print the receivers characters (including emphasis) on
-     aStream. 
+    "print the receiver's characters (including emphasis) on aStream. 
      Notice, that some streams simply ignore the emphasis"
 
     aStream nextPutAllText:self
--- a/UnboxedIntegerArray.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/UnboxedIntegerArray.st	Sat Mar 26 06:44:23 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2003 by eXept Software AG
               All Rights Reserved
@@ -60,7 +58,7 @@
 isAbstract
     "Return if this class is an abstract class.
      True is returned for UnboxedIntegerArray here; false for subclasses.
-     Abstract subclasses must redefine again."
+     Abstract subclasses must redefine this again."
 
     ^ self == UnboxedIntegerArray
 !
--- a/ZipArchive.st	Fri Mar 25 06:53:03 2016 +0100
+++ b/ZipArchive.st	Sat Mar 26 06:44:23 2016 +0100
@@ -5163,14 +5163,14 @@
 !ZipArchive::ZipWriteStream methodsFor:'queries'!
 
 isReadable
-    "return true, if reading is supported by the recevier.
+    "return true, if reading is supported by the receiver.
      This has to be redefined in concrete subclasses."
 
     ^ false
 !
 
 isWritable
-    "return true, if writing is supported by the recevier.
+    "return true, if writing is supported by the receiver.
      This has to be redefined in concrete subclasses."
 
     ^ true