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.
there's nothing I fix on the first try :) jk_new_structure
authorhlopkmar
Mon, 30 May 2011 21:32:17 +0000
branchjk_new_structure
changeset 822 36cb538be3c2
parent 821 560f60ad3a2a
child 823 8d12f019746b
there's nothing I fix on the first try :)
src/JavaClass.st file | annotate | diff | comparison | revisions
src/JavaResolver.st file | annotate | diff | comparison | revisions
src/stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/src/JavaClass.st	Mon May 30 21:19:04 2011 +0000
+++ b/src/JavaClass.st	Mon May 30 21:32:17 2011 +0000
@@ -705,11 +705,10 @@
 !
 
 javaComponentClass
-
-    self breakPoint: #jv. "Should not happen"
-    ^nil
+    ^self.
 
     "Created: / 20-12-2010 / 22:02:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-05-2011 / 23:26:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 javaName
--- 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'!
--- a/src/stx_libjava.st	Mon May 30 21:19:04 2011 +0000
+++ b/src/stx_libjava.st	Mon May 30 21:32:17 2011 +0000
@@ -366,7 +366,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1161'"$"
+    ^ "$SVN-Revision:"'1165'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!
hg/stx-libjava