src/JavaResolver.st
branchjk_new_structure
changeset 822 36cb538be3c2
parent 821 560f60ad3a2a
child 846 cec92244091c
--- a/src/JavaResolver.st	Mon May 30 21:19:04 2011 +0000
+++ b/src/JavaResolver.st	Mon May 30 21:32:17 2011 +0000
@@ -209,11 +209,12 @@
     (self checkPermissionsFrom: accessingJavaClass to: resolvedJavaClass) 
         ifFalse: [ ^ false ].
     aJavaMethodOrField isPublic ifTrue: [ ^ true ].
-    ((aJavaMethodOrField isProtected 
-        and: [ resolvedJavaClass equalsOrIsSubclassOf: aJavaMethodOrField javaClass ]) 
-            and: 
-                [ accessingJavaClass equalsOrIsSubclassOf: resolvedJavaClass
-                ]                                                           )
+    ((aJavaMethodOrField isProtected and: 
+            [ resolvedJavaClass javaComponentClass 
+                equalsOrIsSubclassOf: aJavaMethodOrField javaClass ]) 
+        and: 
+            [ accessingJavaClass javaComponentClass 
+                equalsOrIsSubclassOf: aJavaMethodOrField javaClass ]) 
             ifTrue: [ ^ true ].
     ((aJavaMethodOrField isPrivate not 
         and: [ resolvedJavaClass javaPackage = accessingJavaClass javaPackage ]) 
@@ -225,7 +226,7 @@
     ^ false.
 
     "Created: / 14-04-2011 / 14:19:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 30-05-2011 / 23:16:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 30-05-2011 / 23:32:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaResolver methodsFor:'exceptions'!