Merge jv
authorMerge Script
Thu, 23 Apr 2015 06:49:14 +0200
branchjv
changeset 3460 db888d1b9a96
parent 3457 dcc643202507 (current diff)
parent 3459 1e1ffdd30898 (diff)
child 3463 ea196d59daaf
Merge
--- a/.hgtags	Fri Apr 03 07:47:17 2015 +0100
+++ b/.hgtags	Thu Apr 23 06:49:14 2015 +0200
@@ -4,6 +4,7 @@
 0581d9906df0d81447cbb2f8b87544b2f5a84170 rel5_2_8
 08dc80825e691a8c1fb0a340ff07d9ee19c0ca85 expecco_2_7_0
 08dc80825e691a8c1fb0a340ff07d9ee19c0ca85 expecco_2_7_0_49
+08dc80825e691a8c1fb0a340ff07d9ee19c0ca85 expecco_2_7_5
 136dd7e8228a6b331b5ed87970023db7b2643ff5 stable_expecco_sel
 196ff4d5d5ada3abb4d367959bcf532360d9919a expecco_2_6_1
 196ff4d5d5ada3abb4d367959bcf532360d9919a expecco_2_6_2
@@ -63,5 +64,6 @@
 ebf1067a3289e238cdd38bfa97f0e4d23b77d5f9 expecco_1_7_1rc4
 ef7d38d397bc2733ce8646c436ceb48e3191e32f expecco_2_0_0
 ef7d38d397bc2733ce8646c436ceb48e3191e32f expecco_2_0_0_0
+f97405cc78a3e83738f7e39927e344fd8df5ff16 expeccoALM_1_9_0_1
 fb54a0eabe13bf49bb363bbcf7a87bfd30a233b2 rel5_1_3
 fb54a0eabe13bf49bb363bbcf7a87bfd30a233b2 stx_513
--- a/PrintConverter.st	Fri Apr 03 07:47:17 2015 +0100
+++ b/PrintConverter.st	Thu Apr 23 06:49:14 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
 	      All Rights Reserved
@@ -9,8 +11,9 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+"{ Package: 'stx:libview2' }"
 
-"{ Package: 'stx:libview2' }"
+"{ NameSpace: Smalltalk }"
 
 Object subclass:#PrintConverter
 	instanceVariableNames:'valueToStringBlock stringToValueBlock type'
@@ -229,25 +232,25 @@
      into formatString, where #-characters are replaced by
      successive characters from the printString.
      Warning: use with care - it does not check for decimal points etc.
-	      the printString of aNumber must have enough digits for all
-	      #-characters to be replaced.
-	      Therefore, precheck the numbers value and use appropriate format
-	      strings then.
+              the printString of aNumber must have enough digits for all
+              #-characters to be replaced.
+              Therefore, precheck the numbers value and use appropriate format
+              strings then.
      For number formatting, see also: printfPrintString: implementations."
 
     |pS fS out|
 
     pS := ReadStream on:aNumber printString.
     fS := ReadStream on:formatString.
-    out := WriteStream on:String new.
+    out := WriteStream on:(formatString species new:100).
     [fS atEnd] whileFalse:[
-	|c|
+        |c|
 
-	c := fS next.
-	c == $# ifTrue:[
-	    c := pS next
-	].
-	out nextPut:c
+        c := fS next.
+        c == $# ifTrue:[
+            c := pS next
+        ].
+        out nextPut:c
     ].
     ^ out contents
 
@@ -465,5 +468,6 @@
 !PrintConverter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/PrintConverter.st,v 1.18 2001-04-20 09:47:43 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/PrintConverter.st,v 1.19 2015-04-22 18:03:20 stefan Exp $'
 ! !
+