--- a/JavaClassAccessor.st	Fri Feb 14 14:27:26 2014 +0100
+++ b/JavaClassAccessor.st	Wed Jan 28 03:12:08 2015 +0100
@@ -1,9 +1,9 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
+ COPYRIGHT (c) 1996-2015 by Claus Gittinger
 
  New code and modifications done at SWING Research Group [1]:
 
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
  This software is furnished under a license and may be used
@@ -21,7 +21,7 @@
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaClassAccessor
-	instanceVariableNames:'name fullName package loading'
+	instanceVariableNames:'name binaryName package loading'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Languages-Java-Classes'
@@ -31,11 +31,11 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
+ COPYRIGHT (c) 1996-2015 by Claus Gittinger
 
  New code and modifications done at SWING Research Group [1]:
 
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
  This software is furnished under a license and may be used
@@ -57,15 +57,23 @@
 
 fullName: aSymbol
 
-    ^self new setFullName: aSymbol
+    ^self new setBinaryName: aSymbol
 
     "Created: / 28-02-2012 / 19:20:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!JavaClassAccessor methodsFor:'* As yet uncategorized *'!
+
+constantPool
+    ^ #()
+
+    "Created: / 08-10-2013 / 23:04:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !JavaClassAccessor methodsFor:'accessing'!
 
 fullName
-    ^ fullName
+    ^ binaryName
 !
 
 name
@@ -82,7 +90,7 @@
     cls isNil ifTrue:[
         [ 
             loading := true.
-            cls := JavaVM classForName: (fullName copyReplaceAll: $/ with: $.)
+            cls := JavaVM classForName: (binaryName copyReplaceAll: $/ with: $.) definedBy: JavaVM systemClassLoader.
         ] ensure:[
             loading := false
         ].
@@ -90,7 +98,7 @@
     ^cls
 
     "Created: / 28-02-2012 / 19:22:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 07-05-2013 / 11:20:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-12-2013 / 23:54:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 theClassOrNil
@@ -98,10 +106,10 @@
     | cls |
     [
         loading := true.
-        cls := JavaVM registry classNamed: fullName.
+        cls := JavaVM registry classNamed: binaryName.
         cls isNil ifTrue:[
             "Hmm...maybe somebody will provide me the class, let's try"    
-            cls := JavaClassQuery query: fullName
+            cls := JavaClassQuery query: binaryName
         ].
     ] ensure:[
         loading := false.
@@ -139,11 +147,9 @@
 
 !JavaClassAccessor methodsFor:'initialization'!
 
-setFullName: aSymbol
-    fullName := aSymbol.
-    name := 'JAVA::' , ((fullName tokensBasedOn: $/) asStringWith: '::')
-
-    "Created: / 28-02-2012 / 19:21:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+setBinaryName: aSymbol 
+    binaryName := aSymbol.
+    name := 'JAVA::' , ((binaryName tokensBasedOn: $/) asStringWith: '::')
 ! !
 
 !JavaClassAccessor methodsFor:'instance creation'!
@@ -176,7 +182,7 @@
 
 printOn:aStream
     aStream nextPutAll: 'JAVA '.
-    (fullName tokensBasedOn: $/) 
+    (binaryName tokensBasedOn: $/) 
         do:[:component|aStream nextPutAll: component]
         separatedBy:[aStream space].
 
@@ -218,7 +224,7 @@
 !JavaClassAccessor class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/JavaClassAccessor.st,v 1.3 2013-09-06 00:41:18 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaClassAccessor.st,v 1.4 2015-01-28 02:10:50 vrany Exp $'
 !
 
 version_HG
@@ -227,6 +233,6 @@
 !
 
 version_SVN
-    ^ '§Id§'
+    ^ 'Id'
 ! !