--- a/JavaClassReader.st Sat Dec 01 21:19:57 2012 +0000
+++ b/JavaClassReader.st Sat Dec 01 21:44:20 2012 +0000
@@ -1054,10 +1054,11 @@
inStream position ~= endPos ifTrue: [
self halt: 'annotations are probably reading what they shouldnt'
].
- javaMethod annotations rawParamAnnotations: rawAnnotations.
+ self breakPoint:#mh.
+ javaMethod annotations rawAnnotations: rawAnnotations.
"Modified: / 28-02-2011 / 17:05:47 / Marcel Hlopko <hlopik@gmail.com>"
- "Modified: / 01-12-2012 / 22:00:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 22:43:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
readSignatureAttributeFor:something
--- a/JavaMethodAnnotationContainer.st Sat Dec 01 21:19:57 2012 +0000
+++ b/JavaMethodAnnotationContainer.st Sat Dec 01 21:44:20 2012 +0000
@@ -21,8 +21,8 @@
"{ Package: 'stx:libjava' }"
JavaAnnotationContainer subclass:#JavaMethodAnnotationContainer
- instanceVariableNames:'annotationDefault rawAnnotations rawParamAnnotations
- visibleParameterAnnotations invisibleParameterAnnotations'
+ instanceVariableNames:'annotationDefault rawAnnotations visibleParameterAnnotations
+ invisibleParameterAnnotations'
classVariableNames:''
poolDictionaries:''
category:'Languages-Java-Annotations'
@@ -96,26 +96,23 @@
rawAnnotations := something.
!
-rawParamAnnotations
- ^ rawParamAnnotations
-!
+visibleParameterAnnotations
+ ^ visibleParameterAnnotations
-rawParamAnnotations:something
- rawParamAnnotations := something.
+ "Created: / 01-12-2012 / 22:39:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
!JavaMethodAnnotationContainer methodsFor:'initialization'!
initialize
super initialize.
-
- visibleParameterAnnotations := #().
- invisibleParameterAnnotations := #().
+ visibleParameterAnnotations := JavaAnnotationDictionary empty.
+ invisibleParameterAnnotations := JavaAnnotationDictionary empty.
annotationDefault := JavaAnnotationDefault empty.
"Modified: / 28-02-2011 / 16:34:54 / Marcel Hlopko <hlopik@gmail.com>"
- "Modified: / 16-03-2011 / 17:28:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Created: / 18-03-2011 / 23:50:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-12-2012 / 22:27:49 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
initializeFor: javaMethod
--- a/JavaMirror.st Sat Dec 01 21:19:57 2012 +0000
+++ b/JavaMirror.st Sat Dec 01 21:44:20 2012 +0000
@@ -249,7 +249,7 @@
put: (reflection javaClassObjectArrayForClasses: exceptionClasses);
instVarNamed: #annotations put: annotations runtimeVisible bytes;
instVarNamed: #parameterAnnotations
- put: annotations rawParamAnnotations bytes.
+ put: annotations visibleParameterAnnotations bytes.
(method isJavaMethod and: [ method signature notNil ]) ifTrue: [
ctorOrMethod instVarNamed: #signature
put: (reflection javaStringObjectForString: method signature interned: true)
@@ -257,7 +257,7 @@
^ ctorOrMethod
"Created: / 01-08-2012 / 10:24:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 01-12-2012 / 22:10:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 01-12-2012 / 22:39:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
!
createConstructorFor: class method: method signature: signature modifiers: modifiers parameterTyoes: parameterClasses exceptionTypes: exceptionClasses annotations: annotations
--- a/libjava.rc Sat Dec 01 21:19:57 2012 +0000
+++ b/libjava.rc Sat Dec 01 21:44:20 2012 +0000
@@ -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", "Sat, 01 Dec 2012 21:14:42 GMT\0"
+ VALUE "ProductDate", "Sat, 01 Dec 2012 21:43:34 GMT\0"
END
END
--- a/stx_libjava.st Sat Dec 01 21:19:57 2012 +0000
+++ b/stx_libjava.st Sat Dec 01 21:44:20 2012 +0000
@@ -157,12 +157,12 @@
^ #(
#'stx:goodies/sunit' "TestResource - superclass of JavaAntProjectResource "
#'stx:libbasic' "Error - superclass of JavaInvalidRefError "
- #'stx:libbasic2' "Socket - superclass of JavaSocket "
- #'stx:libbasic3' "WrappedMethod - extended "
- #'stx:libcomp' "VariableNode - referenced by ProxyMethodCompiler>>compile:arguments:selector: "
+ #'stx:libbasic2' "BitArray - superclass of extended BooleanArray "
+ #'stx:libbasic3' "MessageTracer - referenced by JavaMethod>>setBreakPoint "
+ #'stx:libcomp' "ByteCodeCompiler - referenced by ProxyMethodCompiler>>compile "
#'stx:libhtml' "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
#'stx:libtool' "WorkspaceApplication - referenced by GroovyEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
- #'stx:libview' "GraphicsMedium - superclass of JavaPopUpView "
+ #'stx:libview' "TopView - superclass of JavaPopUpView "
#'stx:libview2' "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
#'stx:libwidg' "HorizontalScrollBar - referenced by JavaVM class>>_WScrollPanePeer__getHScrollbarHeight: "
#'stx:libwidg2' "ComboListView - referenced by JavaVM class>>_WChoicePeer_create: "