Mercurial Mercurial > hg > stx-libjava / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/JavaNameAndType2.st
branchjk_new_structure
changeset 777 e6e61412ae43
parent 774 ac54730a2b74
child 787 cae769b9b5c1 
--- a/src/JavaNameAndType2.st	Thu May 12 17:22:54 2011 +0000
+++ b/src/JavaNameAndType2.st	Fri May 13 06:55:55 2011 +0000
@@ -1,7 +1,7 @@
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaNameAndType2
-	instanceVariableNames:'nameIndex descriptorIndex name descriptor constantPool owner'
+	instanceVariableNames:'nameIndex descriptorIndex constantPool'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Reader-Support-new'
@@ -55,50 +55,53 @@
 !
 
 descriptor
-    descriptor ifNil: [self resolve].
-    ^ descriptor.
+    ^constantPool at: descriptorIndex.
 
     "Created: / 08-04-2011 / 11:55:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 15:46:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:51:04 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 name
-    name ifNil: [self resolve].
-    ^ name.
+    ^ constantPool at: nameIndex.
 
     "Created: / 08-04-2011 / 11:55:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 15:49:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:42:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 owner
-    ^ owner
-!
+    ^ constantPool owner.
 
-owner:something
-    owner := something.
+    "Created: / 12-05-2011 / 18:43:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
-selector
-    self isResolved ifFalse: [ self resolve ].
-    ^ (name , descriptor) asSymbol.
+owner: javaClass
+    constantPool owner: javaClass.
+
+    "Created: / 12-05-2011 / 18:43:12 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+!
+
+selector    
+    ^ (self name , self descriptor) asSymbol.
 
     "Created: / 11-04-2011 / 21:31:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 17:29:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:51:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaNameAndType2 methodsFor:'comparing'!
 
 = aNameAndType 
-    name ~= aNameAndType name ifTrue: [ ^ false ].
-    ^ descriptor = aNameAndType descriptor.
+    self name ~= aNameAndType name ifTrue: [ ^ false ].
+    ^ self descriptor = aNameAndType descriptor.
 
     "Created: / 08-04-2011 / 11:56:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:44:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 !
 
 hash
-    ^ name hash bitXor: descriptor hash.
+    ^ self name hash bitXor: self descriptor hash.
 
     "Created: / 08-04-2011 / 11:57:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:44:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaNameAndType2 methodsFor:'initialization'!
@@ -129,9 +132,11 @@
 !JavaNameAndType2 methodsFor:'printing'!
 
 printString
-^ 'JavaNameAndType name=' , name printString , ' descriptor= ' , descriptor printString.
+    ^ 'JavaNameAndType name=' , self name printString , ' descriptor= ' 
+        , self descriptor printString.
 
     "Created: / 10-05-2011 / 14:17:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:44:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaNameAndType2 methodsFor:'queries'!
@@ -150,66 +155,17 @@
     ^ true.
 
     "Created: / 10-05-2011 / 12:24:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-isResolved
-    name ifNil: [^ false].
-    descriptor ifNil: [^ false].
-    ^ true.
-
-    "Created: / 10-05-2011 / 17:27:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaNameAndType2 methodsFor:'resolving'!
 
-findResolvedStaticValue
-    self halt: 'should not need - ask mh'.
-
-    "Created: / 10-05-2011 / 17:26:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-findResolvedValue
-    name := constantPool at: nameIndex.
-    descriptor := constantPool at: descriptorIndex.
-    name ifNil: [ self warning: 'name nil in ' , self printString ].
-    descriptor 
-            ifNil: [ self warning: 'descriptor nil in ' , self printString ].
-
-    "Created: / 10-05-2011 / 17:27:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-invalidate
-    name := nil.
-    descriptor := nil.
-
-    "Created: / 10-05-2011 / 17:28:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-invalidateForClass: arg 
-    self halt: 'should not need - tell mh'.
-
-    "Created: / 10-05-2011 / 17:28:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-resolve
-    (name isNil or: [descriptor isNil]) ifTrue: [self findResolvedValue].
-
-    "Created: / 10-05-2011 / 15:46:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 10-05-2011 / 17:28:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
-resolveStatic
-   ^ self resolve.
-
-    "Created: / 10-05-2011 / 17:25:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-!
-
 updateClassRefsFrom: oldOwner to: newOwner 
-    owner = oldOwner ifTrue: [ owner := newOwner. ].
+    self owner = oldOwner ifTrue: [ self owner: newOwner. ].
     self info: 'updating class refs from: ' , oldOwner printString , ' to ' 
                 , newOwner printString.
 
     "Created: / 10-05-2011 / 16:50:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 12-05-2011 / 18:43:12 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
 !JavaNameAndType2 class methodsFor:'documentation'!
hg/stx-libjava