removing forgotten halts.. development
authorhlopkmar
Sun, 18 Nov 2012 17:20:16 +0000
branchdevelopment
changeset 1833 e943f214b868
parent 1832 d7201987d0a0
child 1834 7d86400124ea
removing forgotten halts..
JavaExceptionTests.st
JavaLookup.st
libjava.rc
stx_libjava.st
--- a/JavaExceptionTests.st	Sun Nov 18 17:09:25 2012 +0000
+++ b/JavaExceptionTests.st	Sun Nov 18 17:20:16 2012 +0000
@@ -158,7 +158,7 @@
     | thrower  caught |
     thrower := JAVA stx libjava tests lang ExceptionTests new.
     [
-        self halt. thrower throw_me: false.
+        thrower throw_me: false.
         caught := false.
     ] on: JAVA java lang IllegalArgumentException do: [:ex | caught := true. ].
     self assert: caught == false.
@@ -168,7 +168,7 @@
                 isEmptyOrNil.
 
     "Created: / 18-03-2012 / 21:49:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-11-2012 / 18:05:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 18-11-2012 / 18:17:22 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 test_01c
--- a/JavaLookup.st	Sun Nov 18 17:09:25 2012 +0000
+++ b/JavaLookup.st	Sun Nov 18 17:20:16 2012 +0000
@@ -311,8 +311,7 @@
      As a courtesy to a Smalltalker, try to map smalltalk selectors to a java ones.
      Returns JavaMethodDescriptor or nil."
     
-    | name  nameSizePlusOne  candidates  finder  static  cls  m |
-    self halt.
+    | name  nameSizePlusOne  candidates  finder  static  cls  m | 
     name := selector upTo: $:.
     nameSizePlusOne := name size + 1.
     static := receiver isBehavior.
@@ -387,7 +386,7 @@
     "Modified: / 01-01-2012 / 19:58:59 / kursjan <kursjan@fit.cvut.cz>"
     "Modified (comment): / 02-01-2012 / 10:35:25 / kursjan <kursjan@fit.cvut.cz>"
     "Modified: / 17-03-2012 / 17:22:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-11-2012 / 18:08:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 18-11-2012 / 18:17:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaLookup::Smalltalk2Java methodsFor:'lookup (old)'!
--- a/libjava.rc	Sun Nov 18 17:09:25 2012 +0000
+++ b/libjava.rc	Sun Nov 18 17:20:16 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,2208,2208
+  FILEVERSION     6,2,2211,2211
   PRODUCTVERSION  6,2,3,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
       VALUE "FileDescription", "Java support for Smalltalk/X (LIB)\0"
-      VALUE "FileVersion", "6.2.2208.2208\0"
+      VALUE "FileVersion", "6.2.2211.2211\0"
       VALUE "InternalName", "stx:libjava\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.1\0"
-      VALUE "ProductDate", "Sun, 18 Nov 2012 17:12:01 GMT\0"
+      VALUE "ProductDate", "Sun, 18 Nov 2012 17:22:04 GMT\0"
     END
 
   END
--- a/stx_libjava.st	Sun Nov 18 17:09:25 2012 +0000
+++ b/stx_libjava.st	Sun Nov 18 17:20:16 2012 +0000
@@ -155,16 +155,16 @@
      exclude individual packages in the #excludedFromPrerequisites method."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestCase - superclass of JavaLookupTests "
-        #'stx:libbasic'    "Collection - superclass of JavaLocalVariableTable "
-        #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
-        #'stx:libbasic3'    "MessageTracer - referenced by JavaMethod>>setBreakPoint "
-        #'stx:libcomp'    "SelfNode - referenced by ProxyMethodMethodInvocationNode>>generate: "
+        #'stx:goodies/sunit'    "TestCase - superclass of JavaExceptionTests "
+        #'stx:libbasic'    "Error - superclass of JavaInvalidRefError "
+        #'stx:libbasic2'    "Socket - superclass of JavaSocket "
+        #'stx:libbasic3'    "WrappedMethod - extended "
+        #'stx:libcomp'    "ConstantNode - referenced by ProxyMethodCompiler>>argsArray "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
         #'stx:libtool'    "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
         #'stx:libview'    "StandardSystemView - superclass of JavaTopView "
-        #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
-        #'stx:libwidg'    "Button - referenced by JavaVM class>>_WButtonPeer_create: "
+        #'stx:libview2'    "GIFReader - referenced by JavaVM class>>_GifImageDecoder_parseImage: "
+        #'stx:libwidg'    "EditTextView - referenced by JavaVM class>>_WTextAreaPeer_create: "
         #'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
     )
 ! !