Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged 8fcf6cde056e and 659fb25645b0 development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 06 Feb 2014 10:48:39 +0100
branchdevelopment
changeset 3008 414e6567b574
parent 3007 8fcf6cde056e (current diff)
parent 3004 659fb25645b0 (diff)
child 3009 024e71f1142e
Merged 8fcf6cde056e and 659fb25645b0
JavaClassRefTests.st file | annotate | diff | comparison | revisions
JavaRefsAndConstantPoolTestCase.st file | annotate | diff | comparison | revisions
JavaRelease.st file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
libjava.rc file | annotate | diff | comparison | revisions
stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/JavaClassReader.st	Thu Feb 06 10:45:46 2014 +0100
+++ b/JavaClassReader.st	Thu Feb 06 10:48:39 2014 +0100
@@ -22,11 +22,11 @@
 
 Object subclass:#JavaClassReader
 	instanceVariableNames:'inStream msb constants majorVsn minorVsn constNeeds2Slots
-                constSlot classBeingLoaded classLoader attributes'
+		constSlot classBeingLoaded classLoader attributes'
 	classVariableNames:'Verbose AnnotationsVerbose Silent AbsolutelySilent
-                LazyClassLoading InvalidClassFormatSignal ClassLoaderQuerySignal
-                JavaArchiveCache JavaArchiveCacheLock LastJavaArchive
-                LastJavaArchiveLock MaxContextSize MaxContextSizeLimit'
+		LazyClassLoading InvalidClassFormatSignal ClassLoaderQuerySignal
+		JavaArchiveCache JavaArchiveCacheLock LastJavaArchive
+		LastJavaArchiveLock MaxContextSize MaxContextSizeLimit'
 	poolDictionaries:'JavaConstants'
 	category:'Languages-Java-Support'
 !
@@ -1218,11 +1218,12 @@
     inStream position ~= endPos ifTrue: [
         self halt: 'annotations are probably reading what they shouldnt'
     ].
-    self breakPoint:#mh.
+
     javaMethod annotations rawParamAnnotations: rawAnnotations.
 
     "Modified: / 28-02-2011 / 17:05:47 / Marcel Hlopko <hlopik@gmail.com>"
     "Modified: / 01-12-2012 / 22:54:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 25-01-2014 / 21:44:28 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 readSignatureAttributeFor:something
--- a/JavaClassReaderTests.st	Thu Feb 06 10:45:46 2014 +0100
+++ b/JavaClassReaderTests.st	Thu Feb 06 10:48:39 2014 +0100
@@ -87,7 +87,7 @@
                 andTypeAt: 5).
     constantPool at: 4 put: 'name'.
     constantPool at: 5 put: 'type'.
-    constantPool owner: self javaLangObject.
+    constantPool owner: self someJavaClass.
     reader constants: constantPool.
     reader stream: (ReadStream on: #( 2 0 3 0 )).
     result := reader readConstant_Fieldref.
@@ -98,7 +98,7 @@
     self assertTrue: (result nameAndType isNewJavaNameAndType).
     self assertTrue: (result nameAndType name = 'name').
     self assertTrue: (result nameAndType descriptor = 'type').
-    self assertTrue: (result owner = self javaLangObject).
+    self assertTrue: (result owner = self someJavaClass).
 
     "Created: / 10-05-2011 / 14:12:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 23-05-2011 / 18:00:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -119,7 +119,7 @@
                 andTypeAt: 5).
     constantPool at: 4 put: 'name'.
     constantPool at: 5 put: 'type'.
-    constantPool owner: self javaLangObject.
+    constantPool owner: self someJavaClass.
     reader constants: constantPool.
     reader stream: (ReadStream on: #( 2 0 3 0 )).
     result := reader readConstant_InterfaceMethodref.
@@ -131,8 +131,8 @@
     self assertTrue: (result nameAndType isNewJavaNameAndType).
     self assertTrue: (result nameAndType name = 'name').
     self assertTrue: (result nameAndType descriptor = 'type').
-    self assertTrue: (result owner = self javaLangObject).
-    self assertTrue: (result owner = self javaLangObject).
+    self assertTrue: (result owner = self someJavaClass).
+    self assertTrue: (result owner = self someJavaClass).
 
     "Created: / 10-05-2011 / 14:12:21 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 23-05-2011 / 18:00:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -153,7 +153,7 @@
                 andTypeAt: 5).
     constantPool at: 4 put: 'name'.
     constantPool at: 5 put: 'type'.
-    constantPool owner: self javaLangObject.
+    constantPool owner: self someJavaClass.
     reader constants: constantPool.
     reader stream: (ReadStream on: #( 2 0 3 0 )).
     result := reader readConstant_Methodref.
@@ -165,7 +165,7 @@
     self assertTrue: (result nameAndType isNewJavaNameAndType).
     self assertTrue: (result nameAndType name = 'name').
     self assertTrue: (result nameAndType descriptor = 'type').
-    self assertTrue: (result owner = self javaLangObject).
+    self assertTrue: (result owner = self someJavaClass).
 
     "Created: / 10-05-2011 / 14:10:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 23-05-2011 / 18:00:41 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
--- a/JavaClassRefTests.st	Thu Feb 06 10:45:46 2014 +0100
+++ b/JavaClassRefTests.st	Thu Feb 06 10:48:39 2014 +0100
@@ -103,7 +103,7 @@
     [
         initString := 'Lstx/libjava/tests/mocks/NonPublicClass;'.
         javaClassRef := self getClassRefNamed:initString.
-        javaClassRef owner: self javaLangObject.
+        javaClassRef owner: self someJavaClass.
         javaClassRef resolve.
     ] on:Error do:[:e | throwedException := e ].
     self assertTrue:(throwedException notNil 
@@ -122,7 +122,7 @@
     self shouldnt: 
             [ initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
             javaClassRef := self getClassRefNamed: initString.
-            javaClassRef owner: self javaLangObject.
+            javaClassRef owner: self someJavaClass.
             javaClassRef resolve. ]
         raise: Error.
     self disableMockedExceptionThrowing.
@@ -155,7 +155,7 @@
     self enableMockedExceptionThrowing.
     initString := 'Lstx/libjava/tests/mocks/PublicClass;'.
     javaClassRef := self getClassRefNamed: initString.
-    javaClassRef owner: self javaLangObject.
+    javaClassRef owner: self someJavaClass.
     javaClassRef resolve.
     self assertTrue: (javaClassRef resolvedValue notNil).
     self disableMockedExceptionThrowing.
--- a/JavaRefsAndConstantPoolTestCase.st	Thu Feb 06 10:45:46 2014 +0100
+++ b/JavaRefsAndConstantPoolTestCase.st	Thu Feb 06 10:48:39 2014 +0100
@@ -242,11 +242,11 @@
     "Modified: / 23-05-2011 / 15:16:57 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
-javaLangObject
-    ^Java classForName:'stx.libjava.tests.StringTests'.
+someJavaClass
+    ^ Java classForName: 'org.junit.runners.JUnit4'.
 
     "Created: / 12-05-2011 / 19:09:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-12-2013 / 18:24:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 26-01-2014 / 17:08:01 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 ! !
 
 !JavaRefsAndConstantPoolTestCase methodsFor:'refs creation'!
@@ -255,7 +255,7 @@
     | result |
 
     result := JavaClassRef2 in: aJavaConstantPool withNameAt: nameCPIndex.
-    result owner: self javaLangObject.
+    result owner: self someJavaClass.
     ^ result.
 
     "Created: / 12-05-2011 / 19:14:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -269,7 +269,7 @@
         in: cp
         withNameAndTypeAt: nmIndex
         andClassAt: classIndex.
-result owner: self javaLangObject.
+result owner: self someJavaClass.
     ^ result.
 
     "Created: / 23-05-2011 / 16:01:36 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -282,7 +282,7 @@
         in: cp
         withNameAndTypeAt: nmIndex
         andClassAt: classIndex.
- result owner: self javaLangObject.
+ result owner: self someJavaClass.
     ^ result.
 
     "Created: / 23-05-2011 / 15:58:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -295,7 +295,7 @@
         in: cp
         withNameAndTypeAt: nmIndex
         andClassAt: classIndex.
- result owner: self javaLangObject.
+ result owner: self someJavaClass.
     ^ result.
 
     "Created: / 23-05-2011 / 15:58:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
@@ -308,7 +308,7 @@
         in: cp
         withNameAt: nameIndex
         andDescriptorAt: typeIndex.
- result owner: self javaLangObject.
+ result owner: self someJavaClass.
     ^ result.
 
     "Created: / 23-05-2011 / 16:00:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
--- a/JavaRelease.st	Thu Feb 06 10:45:46 2014 +0100
+++ b/JavaRelease.st	Thu Feb 06 10:48:39 2014 +0100
@@ -1804,7 +1804,7 @@
 
     "Created: / 12-02-2013 / 02:52:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 12-12-2013 / 15:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 12-12-2013 / 16:35:10 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
+    "Modified: / 25-01-2014 / 21:32:54 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 validateJavaVersionString:aVersionString
--- a/abbrev.stc	Thu Feb 06 10:45:46 2014 +0100
+++ b/abbrev.stc	Thu Feb 06 10:48:39 2014 +0100
@@ -5,6 +5,7 @@
 GroovyEvaluator GroovyEvaluator stx:libjava 'Languages-Groovy-Compiler' 0
 GroovyLanguage GroovyLanguage stx:libjava 'Languages-Groovy-Support' 1
 GroovySourceFileWriter GroovySourceFileWriter stx:libjava 'Languages-Groovy-Support' 0
+JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 JavaAnnotation JavaAnnotation stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationContainer JavaAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaAnnotationDefault JavaAnnotationDefault stx:libjava 'Languages-Java-Annotations' 1
@@ -92,7 +93,6 @@
 TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
 GroovyMetaclass GroovyMetaclass stx:libjava 'Languages-Groovy-Classes' 0
-JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 Java Java stx:libjava 'Languages-Java-Support' 0
 JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
--- a/libjava.rc	Thu Feb 06 10:45:46 2014 +0100
+++ b/libjava.rc	Thu Feb 06 10:48:39 2014 +0100
@@ -25,7 +25,7 @@
       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.0\0"
-      VALUE "ProductDate", "Thu, 12 Dec 2013 15:36:25 GMT\0"
+      VALUE "ProductDate", "Sun, 26 Jan 2014 16:10:03 GMT\0"
     END
 
   END
--- a/stx_libjava.st	Thu Feb 06 10:45:46 2014 +0100
+++ b/stx_libjava.st	Thu Feb 06 10:48:39 2014 +0100
@@ -160,7 +160,7 @@
      (the browser has a menu function for that)"
 
     ^ #(
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JUnitTestCaseProxy "
+        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaAntProjectResource "
         #'stx:libbasic'    "AbstractNumberVector - extended "
         #'stx:libbasic2'    "SignedIntegerArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
@@ -311,6 +311,7 @@
         GroovyEvaluator
         GroovyLanguage
         GroovySourceFileWriter
+        (JUnitTestCaseProxy autoload)
         JavaAnnotation
         JavaAnnotationContainer
         JavaAnnotationDefault
@@ -398,7 +399,6 @@
         (TestletTestCaseProxy autoload)
         #'stx_libjava'
         GroovyMetaclass
-        (JUnitTestCaseProxy autoload)
         Java
         JavaAnnotationArrayValue
         JavaAnnotationClassValue
hg/stx-libjava