# HG changeset patch
# User Marcel Hlopko <marcel.hlopko@fit.cvut.cz>
# Date 1360699331 -3600
# Node ID 690745064cf9915df51db91cde06ad5067a8663e
# Parent  4aff298f0fa6e9cb5cb594c78172517a02e4c51a
fixing nested annotations

diff -r 4aff298f0fa6 -r 690745064cf9 JavaAnnotationNestedAnnotationValue.st
--- a/JavaAnnotationNestedAnnotationValue.st	Tue Feb 12 18:07:13 2013 +0000
+++ b/JavaAnnotationNestedAnnotationValue.st	Tue Feb 12 21:02:11 2013 +0100
@@ -21,7 +21,7 @@
 "{ Package: 'stx:libjava' }"
 
 JavaAnnotationValue subclass:#JavaAnnotationNestedAnnotationValue
-	instanceVariableNames:'annotationIndex'
+	instanceVariableNames:'nestedAnnotation'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Reader-Support'
@@ -55,18 +55,22 @@
 
 !JavaAnnotationNestedAnnotationValue methodsFor:'accessing'!
 
-annotationIndex
-    ^ annotationIndex
+nestedAnnotation
+    ^ nestedAnnotation
+
+    "Created: / 12-02-2013 / 19:34:40 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
-annotationIndex:something
-    annotationIndex := something.
+nestedAnnotation:something
+    nestedAnnotation := something.
+
+    "Created: / 12-02-2013 / 19:34:44 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 value
     "superclass JavaAnnotationValue says that I am responsible to implement this method"
 
-    ^ self constantPool at: annotationIndex.
+    ^ self constantPool at: nestedAnnotation.
 
     "Modified: / 17-12-2010 / 14:44:38 / Marcel Hlopko <hlopik@gmail.com>"
 ! !
@@ -81,3 +85,4 @@
 version_SVN
     ^ '§Id§'
 ! !
+
diff -r 4aff298f0fa6 -r 690745064cf9 JavaClassReader.st
--- a/JavaClassReader.st	Tue Feb 12 18:07:13 2013 +0000
+++ b/JavaClassReader.st	Tue Feb 12 21:02:11 2013 +0100
@@ -769,7 +769,7 @@
     tag = $@ 
         ifTrue:
             [ result := JavaAnnotationNestedAnnotationValue for:something.
-            result classIndex:(inStream nextUnsignedShortMSB:msb).
+            result nestedAnnotation:(self readAnnotationFor: something).
             AnnotationsVerbose 
                 ifTrue:
                     [ ('JAVA [INFO]: Reading annotation nested annotation value: ' , result name printString
@@ -799,6 +799,7 @@
 
     "Created: / 17-12-2010 / 16:44:14 / Marcel Hlopko <hlopik@gmail.com>"
     "Modified: / 28-02-2011 / 16:12:09 / Marcel Hlopko <hlopik@gmail.com>"
+    "Modified: / 12-02-2013 / 19:35:15 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 readAttribute:attributeName for:something 
diff -r 4aff298f0fa6 -r 690745064cf9 libjava.rc
--- a/libjava.rc	Tue Feb 12 18:07:13 2013 +0000
+++ b/libjava.rc	Tue Feb 12 21:02:11 2013 +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", "Mon, 11 Feb 2013 20:57:07 GMT\0"
+      VALUE "ProductDate", "Tue, 12 Feb 2013 20:01:34 GMT\0"
     END
 
   END