JavaClass.st
branchdevelopment
changeset 2566 f1cea8b752ba
parent 2529 764ab6925cf5
parent 2561 2e27f294057e
child 2578 fc6186a4961f
--- a/JavaClass.st	Wed Apr 24 18:35:29 2013 +0100
+++ b/JavaClass.st	Mon Apr 29 21:08:38 2013 +0100
@@ -703,7 +703,7 @@
 
     components := fullName asCollectionOfSubstringsSeparatedBy:$/.
     components size > 1 ifTrue:[
-	^ (components copyWithoutLast:1) asStringWith:$.
+        ^ (components copyButLast:1) asStringWith:$.
     ].
     ^ fullName
 
@@ -721,7 +721,7 @@
 
     components := fullName asCollectionOfSubstringsSeparatedBy:$/.
     components size > 1 ifTrue:[
-        ^ (components copyWithoutLast:1) asStringWith: Filename separator
+        ^ (components copyButLast:1) asStringWith: Filename separator
     ].
     ^ fullName
 
@@ -912,7 +912,6 @@
 
     "Created: / 14-04-2013 / 12:28:09 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 ! !
-
 !JavaClass methodsFor:'accessing - java'!
 
 javaMirror
@@ -1309,15 +1308,15 @@
 
     p := Java javaProcessForMainOf:self argumentString:aCommandLineString.
     p notNil ifTrue:[
-	p resume.
-	Object abortSignal handle:[:ex |
+        p resume.
+        AbortOperationRequest handle:[:ex |
 p == JavaVM javaScreenUpdaterThread ifTrue:[self halt].
 p == JavaVM javaEventQueueThread ifTrue:[self halt].
-	    p terminate.
-	    ex reject.
-	] do:[
-	    p waitUntilTerminated
-	].
+            p terminate.
+            ex reject.
+        ] do:[
+            p waitUntilTerminated
+        ].
     ]
 
     "Modified: / 24.12.1999 / 02:35:04 / cg"
@@ -2879,24 +2878,23 @@
 
     "Created: / 14-04-2013 / 14:04:20 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 ! !
-
 !JavaClass class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.133 2013-03-04 19:10:26 +0000 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.135 2013-04-27 12:31:15 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.133 2013-03-04 19:10:26 +0000 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClass.st,v 1.135 2013-04-27 12:31:15 cg Exp $'
 !
 
 version_HG
 
-    ^ '$Changeset: <not expanded> $'
+    ^ 'Changeset: <not expanded> '
 !
 
 version_SVN
-    ^ '§Id§'
+    ^ 'Id'
 ! !