Don't do collect:[] as:Array and select:[] as:Array
authorStefan Vogel <sv@exept.de>
Tue, 02 Apr 2013 14:03:01 +0200
changeset 2474 b05ce3206cf3
parent 2471 49b4e4562d1e
child 2493 9f616c0956f4
Don't do collect:[] as:Array and select:[] as:Array
Java.st
--- a/Java.st	Wed Mar 27 20:47:28 2013 +0100
+++ b/Java.st	Tue Apr 02 14:03:01 2013 +0200
@@ -1450,49 +1450,49 @@
 
     argString := argStringIn.
     argString isNil ifTrue:[
-	argString := Dialog
-		    request:'argument string:'
-		    initialAnswer:LastArgumentString ? ''
-		    onCancel:nil.
-	argString isNil ifTrue:[^ nil].
+        argString := Dialog
+                    request:'argument string:'
+                    initialAnswer:LastArgumentString ? ''
+                    onCancel:nil.
+        argString isNil ifTrue:[^ nil].
 
-	LastArgumentString := argString.
+        LastArgumentString := argString.
     ].
 
     JavaVM initializeVMIfNoEventThreadRunning.
     (Java at:'java.lang.System') instVarNamed:'security' put:nil.
 
     argString isEmpty ifTrue:[
-	argStringArray := #()
+        argStringArray := #()
     ] ifFalse:[
-	argStringArray := argString asCollectionOfWords collect:[:s | Java as_String:s] as:Array.
+        argStringArray := (argString asCollectionOfWords collect:[:s | Java as_String:s]) asArray.
     ].
 
     p := JavaProcess
-	    for:[
-		    "/ if the program reads from stdin, let user provide a file
-		    "/ for it.
-		    JavaVM stdinReplacementFileQuerySignal handle:[:ex |
-			|fn|
+            for:[
+                    "/ if the program reads from stdin, let user provide a file
+                    "/ for it.
+                    JavaVM stdinReplacementFileQuerySignal handle:[:ex |
+                        |fn|
 
-			alreadyAskedForStdin == true ifFalse:[
-			    fn := Dialog
-				    requestFileName:'Program reads from Stdin - give inputFile or cancel for EOF'
-				    default:nil
-				    fromDirectory:(FileSelectionBox lastFileSelectionDirectory).
-			    fn notNil ifTrue:[
-				stdInReplacement := fn asFilename readStream.
-			    ].
-			    alreadyAskedForStdin := true.
-			].
-			ex proceedWith:stdInReplacement
-		    ] do:[
-			aJavaClass
-			    performStatic:#'main([Ljava/lang/String;)V'
-			    with:argStringArray.
-		    ]
-		]
-	    priority:(Processor activePriority - 1).
+                        alreadyAskedForStdin == true ifFalse:[
+                            fn := Dialog
+                                    requestFileName:'Program reads from Stdin - give inputFile or cancel for EOF'
+                                    default:nil
+                                    fromDirectory:(FileSelectionBox lastFileSelectionDirectory).
+                            fn notNil ifTrue:[
+                                stdInReplacement := fn asFilename readStream.
+                            ].
+                            alreadyAskedForStdin := true.
+                        ].
+                        ex proceedWith:stdInReplacement
+                    ] do:[
+                        aJavaClass
+                            performStatic:#'main([Ljava/lang/String;)V'
+                            with:argStringArray.
+                    ]
+                ]
+            priority:(Processor activePriority - 1).
 
     p name:(aJavaClass fullName , '::main()').
     p restartable:true.
@@ -1597,11 +1597,11 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.140 2013-03-18 16:59:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.141 2013-04-02 12:03:01 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.140 2013-03-18 16:59:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/Java.st,v 1.141 2013-04-02 12:03:01 stefan Exp $'
 !
 
 version_SVN