src/JavaField.st
branchjk_new_structure
changeset 1155 d6f6d5fc0343
parent 1152 040cba55a7d2
child 1240 aea022b94a34
--- a/src/JavaField.st	Wed Nov 23 22:34:10 2011 +0000
+++ b/src/JavaField.st	Fri Nov 25 08:02:14 2011 +0000
@@ -1,14 +1,11 @@
 "
  COPYRIGHT (c) 1996-2011 by Claus Gittinger
 
- New code and modification done at SWING Research Group [1]:
+ New code and modifications done at SWING Research Group [1]:
 
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
- Parts of the code written by Claus Gittinger are under following
- license:
-
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
  inclusion of the above copyright notice.   This software may not
@@ -16,9 +13,9 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners. For exact set of such code
-     see the differences between this version and version stx:lib
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
      as of 1.9.2010
 "
 "{ Package: 'stx:libjava' }"
@@ -38,14 +35,11 @@
 "
  COPYRIGHT (c) 1996-2011 by Claus Gittinger
 
- New code and modification done at SWING Research Group [1]:
+ New code and modifications done at SWING Research Group [1]:
 
  COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
                             SWING Research Group, Czech Technical University in Prague
 
- Parts of the code written by Claus Gittinger are under following
- license:
-
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
  inclusion of the above copyright notice.   This software may not
@@ -53,9 +47,9 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners. For exact set of such code
-     see the differences between this version and version stx:lib
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
      as of 1.9.2010
 
 "
@@ -64,51 +58,36 @@
 !JavaField class methodsFor:'class initialization'!
 
 initialize
-    A_PUBLIC    := 16r0001. "/ JavaClass A_PUBLIC
-    A_PRIVATE   := 16r0002.
+    A_PUBLIC := 16r0001.
+    A_PRIVATE := 16r0002.
     A_PROTECTED := 16r0004.
-    A_STATIC    := 16r0008.
-    A_FINAL     := 16r0010. "/ JavaClass A_FINAL
-    A_VOLATILE  := 16r0040.
+    A_STATIC := 16r0008.
+    A_FINAL := 16r0010.
+    A_VOLATILE := 16r0040.
     A_TRANSIENT := 16r0080.
     A_SYBTHETIC := 16r1000.
-    A_ENUM      := 16r4000.
-
-    FieldTypeClasses := IdentityDictionary new
-        "Base types"
-        "/WARNING: If you change something here, you MUST also
-        "/         change JavaDescriptor class>>#initialize !!!!!!
-
-        at: #B  put: Byte;
-        at: #C  put: Character;
-        at: #D  put: Float;
-        at: #F  put: ShortFloat;
-        at: #I  put: Integer;       "Kludge: instances of java int are in fact SmallIntegers"
-        at: #J  put: LargeInteger;
-        at: #S  put: Short;
-        at: #Z  put: Boolean;
-
-        "Array types"
-        "/WARNING: If you change something here, you MUST also
-        "/         change JavaDescriptor class>>#initialize !!!!!!
-        at: #'[B'  put: ByteArray;
-        at: #'[C'  put: Unicode16String;
-        at: #'[D'  put: DoubleArray;
-        at: #'[F'  put: FloatArray;
-        at: #'[I'  put: SignedIntegerArray;       "Kludge: instances of java int are in fact SmallIntegers"
-        at: #'[J'  put: SignedLongIntegerArray;
-        at: #'[S'  put: WordArray;
-        at: #'[Z'  put: BooleanArray;
-
-        yourself
-        
-
-        
+    A_ENUM := 16r4000.
+    FieldTypeClasses := (IdentityDictionary new)
+                at: #B put: JavaByte;
+                at: #C put: Character;
+                at: #D put: Float;
+                at: #F put: ShortFloat;
+                at: #I put: Integer;
+                at: #J put: LargeInteger;
+                at: #S put: JavaShort;
+                at: #Z put: Boolean;
+                at: #'[B' put: ByteArray;
+                at: #'[C' put: Unicode16String;
+                at: #'[D' put: DoubleArray;
+                at: #'[F' put: FloatArray;
+                at: #'[I' put: SignedIntegerArray;
+                at: #'[J' put: SignedLongIntegerArray;
+                at: #'[S' put: WordArray;
+                at: #'[Z' put: BooleanArray;
+                yourself
 
     "
-     self initialize
-    "
-
+     self initialize"
     "Modified: / 13-05-1998 / 14:44:43 / cg"
     "Modified: / 10-08-2011 / 00:48:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !