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.
small refactoring + forgotten assignment jk_new_structure
authorhlopkmar
Wed, 18 May 2011 13:07:13 +0000
branchjk_new_structure
changeset 799 0c3c4a787b1c
parent 798 b534e73eaf7e
child 800 11f2222f816d
small refactoring + forgotten assignment
src/JavaClassReader.st file | annotate | diff | comparison | revisions
src/JavaClassReader2.st file | annotate | diff | comparison | revisions
src/stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/src/JavaClassReader.st	Wed May 18 13:00:02 2011 +0000
+++ b/src/JavaClassReader.st	Wed May 18 13:07:13 2011 +0000
@@ -812,7 +812,7 @@
                     [ "/ a JAVA class
                     super_class := Java classNamed: superClassName.
                     super_class ifNil: 
-                            [ self loadSuperclassIdentifiedBy: (constants at: super_class_index)
+                            [ super_class := self loadSuperclassIdentifiedBy: (constants at: super_class_index)
                                 ignoring: classesbeingLoaded ].
                     super_class ifNil: [ self halt: 'Cannot find super class?!!' ]. ]. ].
     
@@ -897,7 +897,7 @@
     "Modified: / 15-10-2010 / 17:37:38 / Jan Kurs <kurs.jan@post.cz>"
     "Modified: / 19-10-2010 / 21:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 28-01-2011 / 15:09:48 / Marcel Hlopko <hlopik@gmail.com>"
-    "Modified: / 18-05-2011 / 15:00:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 18-05-2011 / 15:06:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 readStream:aStream ignoring:classesBeingLoaded
@@ -2561,8 +2561,9 @@
 
 loadSuperclassIdentifiedBy: something ignoring: classesBeingLoaded 
     | loader  result  jSuperClass  superClassName |
-                                          self halt.
-    "there are two possible types which can go in here - JavaUnresolvedClassConstant and JavaClass. Not to mention overriden behavior in subclasses. Be careful"
+
+    self halt.
+     "there are two possible types which can go in here - JavaUnresolvedClassConstant and JavaClass. Not to mention overriden behavior in subclasses. Be careful"
     something ifNil: [ self halt: 'Cmon how could I find nil superclass?' ].
     something isJavaClass 
         ifTrue: 
@@ -2571,7 +2572,7 @@
     superClassName := something fullName.
     (something isMemberOf: JavaUnresolvedClassConstant) 
         ifTrue: 
-            [ self log: 'load superClass: ' , superClassName printString.
+            [ self info: 'load superClass: ' , superClassName printString.
             loader := ClassLoaderQuerySignal query.
             loader isNil 
                 ifTrue: 
@@ -2594,14 +2595,6 @@
     "Created: / 18-05-2011 / 14:48:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
-log:message
-Silent 
-                ifFalse: 
-                    [message infoPrintCR].
-
-    "Created: / 18-05-2011 / 14:50:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
 updateOwnerInCPItem: each 
     ((each isJavaRef and: [ each isNewJavaRef ]) 
         or: [ each isJavaNameAndType and: [ each isNewJavaNameAndType ] ]) 
@@ -2617,6 +2610,14 @@
     "Created: / 18-05-2011 / 13:57:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
+!JavaClassReader methodsFor:'logging'!
+
+info: message 
+    Verbose ifTrue: [ Transcript showCR: message printString ].
+
+    "Created: / 18-05-2011 / 15:06:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+! !
+
 !JavaClassReader class methodsFor:'documentation'!
 
 version
--- a/src/JavaClassReader2.st	Wed May 18 13:00:02 2011 +0000
+++ b/src/JavaClassReader2.st	Wed May 18 13:07:13 2011 +0000
@@ -157,14 +157,6 @@
     "Created: / 18-05-2011 / 14:55:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-!JavaClassReader2 methodsFor:'logging'!
-
-info: string 
-    Verbose ifTrue: [Transcript showCR: string].
-
-    "Created: / 10-05-2011 / 12:31:50 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
 !JavaClassReader2 class methodsFor:'documentation'!
 
 version_SVN
--- a/src/stx_libjava.st	Wed May 18 13:00:02 2011 +0000
+++ b/src/stx_libjava.st	Wed May 18 13:07:13 2011 +0000
@@ -366,7 +366,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1141'"$"
+    ^ "$SVN-Revision:"'1142'"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!
hg/stx-libjava