JavaClassReloader.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Tue, 15 Oct 2013 23:40:22 +0100
branchdevelopment
changeset 2863 c330ff3eb374
parent 2858 3a85f55763e2
child 2865 916f3eedc505
permissions -rw-r--r--
Fix in JavaClassReloader (recompilation) When updating old class, update also its classfile bytes (if any), otherwise the compiler will read old class definition (by using old classfile bytes). This fix fixes all tests currently present in JavaSingleClassReloaderTests.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     1
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     3
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     5
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     8
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
     9
 This software is furnished under a license and may be used
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    10
 only in accordance with the terms of that license and with the
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    12
 be provided or otherwise made available to, or used by, any
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    13
 other person.  No title to or ownership of the software is
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    14
 hereby transferred.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    15
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    18
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    19
     as of 1.9.2010
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    20
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    21
"{ Package: 'stx:libjava' }"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    22
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    23
Object subclass:#JavaClassReloader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    24
	instanceVariableNames:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    25
	classVariableNames:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    26
	poolDictionaries:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    27
	category:'Languages-Java-Support'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    28
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    29
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    30
Notification subclass:#RecompileRequest
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    31
	instanceVariableNames:''
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    32
	classVariableNames:''
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    33
	poolDictionaries:''
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    34
	privateIn:JavaClassReloader
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    35
!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    36
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    37
Notification subclass:#ReloadRequest
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    38
	instanceVariableNames:''
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    39
	classVariableNames:''
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    40
	poolDictionaries:''
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    41
	privateIn:JavaClassReloader
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    42
!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
    43
2830
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
    44
JavaClassReloader subclass:#SingleClassReloader
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    45
	instanceVariableNames:'oldClass newClass mustMigrateInstances mustMigrateClass
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    46
		instFieldMapping staticFieldMapping'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    47
	classVariableNames:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    48
	poolDictionaries:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    49
	privateIn:JavaClassReloader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    50
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    51
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    52
Object subclass:#FieldMapping
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    53
	instanceVariableNames:'old new'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    54
	classVariableNames:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    55
	poolDictionaries:''
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    56
	privateIn:JavaClassReloader::SingleClassReloader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    57
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    58
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    59
!JavaClassReloader class methodsFor:'documentation'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    60
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    61
copyright
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    62
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    63
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    64
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    65
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    66
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    67
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    68
                            SWING Research Group, Czech Technical University in Prague
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    69
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    70
 This software is furnished under a license and may be used
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    71
 only in accordance with the terms of that license and with the
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    72
 inclusion of the above copyright notice.   This software may not
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    73
 be provided or otherwise made available to, or used by, any
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    74
 other person.  No title to or ownership of the software is
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    75
 hereby transferred.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    76
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    77
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    78
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    79
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    80
     as of 1.9.2010
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    81
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    82
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    83
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    84
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    85
documentation
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    86
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    87
    A main workhorse for reloading (updating) java classes
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    88
    in running system.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    89
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    90
    [author:]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    91
        Jan Vrany <jan.vrany@fit.cvut.cz>
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    92
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    93
    [instance variables:]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    94
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    95
    [class variables:]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    96
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    97
    [see also:]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    98
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
    99
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   100
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   101
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   102
!JavaClassReloader class methodsFor:'reloading'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   103
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   104
reload: oldClass with: newClass
2730
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   105
    "Update old class to match the definition of newClass"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   106
    ^ self new reload: oldClass with: newClass
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   107
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   108
    "Created: / 20-02-2012 / 23:29:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2730
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   109
    "Modified (comment): / 14-09-2013 / 15:51:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   110
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   111
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   112
!JavaClassReloader class methodsFor:'reloading-requests'!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   113
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   114
requestRecompile: aJavaClass
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   115
    RecompileRequest newException
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   116
        parameter: aJavaClass;
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   117
        raiseRequest
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   118
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   119
    "Created: / 08-10-2013 / 19:26:20 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   120
    "Modified: / 13-10-2013 / 20:40:09 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   121
    "Modified: / 15-10-2013 / 01:19:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   122
!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   123
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   124
requestReload: aJavaClass
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   125
    ReloadRequest newException
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   126
        parameter: aJavaClass;
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   127
        raiseRequest
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   128
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   129
    "Created: / 08-10-2013 / 19:26:12 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   130
    "Modified: / 15-10-2013 / 01:19:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   131
! !
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   132
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   133
!JavaClassReloader methodsFor:'reloading'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   134
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   135
reload: oldClass with: newClass
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   136
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   137
    | newClassToInstall recompileRequests reloadRequests |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   138
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   139
    "/ Must flush shared compiler environment otherwise the compiler
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   140
    "/ will keep using old definitions. Sigh, we should implement fully
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   141
    "/ reflective environment for the compiler...
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   142
    (JavaVM classForName:'stx.libjava.tools.environment.Environment') shared cleanup.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   143
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   144
    reloadRequests := Set new.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   145
    recompileRequests := Set new.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   146
    [
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   147
        newClassToInstall := SingleClassReloader new reload: oldClass with: newClass.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   148
        "Also, reload all subclasses - fields may have changed!!"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   149
        newClassToInstall ~~ oldClass ifTrue: [
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   150
            oldClass mergeVersionsWith: newClassToInstall.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   151
            oldClass subclassesDo:[:oldSubclass|
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   152
                | newSubclass |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   153
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   154
                newSubclass := oldSubclass copy.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   155
                newSubclass setSuperclass: newClassToInstall.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   156
                newSubclass instSize: (newClassToInstall instSize + oldSubclass fields size).
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   157
                self requestReload: newSubclass.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   158
            ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   159
        ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   160
    ] on: RecompileRequest do:[:recompileRequest |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   161
        "/ Catch all recompile requests
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   162
        (recompileRequests contains:[:each | each parameter == recompileRequest parameter]) ifFalse:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   163
            recompileRequests add: recompileRequest 
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   164
        ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   165
        recompileRequest proceed.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   166
    ] on: ReloadRequest do:[:reloadRequest |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   167
        "/ Catch all reload requests
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   168
        (reloadRequests contains:[:each | each parameter == reloadRequest parameter]) ifFalse:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   169
            reloadRequests add: reloadRequest 
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   170
        ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   171
        reloadRequest proceed.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   172
    ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   173
    "/ Remove all reload request for classes for which there have been
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   174
    "/ recompile request as recompile implies reload...
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   175
    reloadRequests := reloadRequests reject:[:each | recompileRequests contains:[:eachRecompile | each parameter == eachRecompile parameter]].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   176
    "/ Now execute all deferred recompile/reload requests.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   177
    recompileRequests do:[:each | each recompile ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   178
    reloadRequests do:[:each | each reload ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   179
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   180
    ^newClassToInstall.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   181
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   182
    "Created: / 04-04-2012 / 01:32:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2830
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   183
    "Modified: / 13-10-2013 / 20:52:58 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   184
    "Modified: / 15-10-2013 / 01:16:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2730
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   185
!
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   186
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   187
unload: oldClass
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   188
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   189
    "/ Must flush shared compiler environment otherwise the compiler
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   190
    "/ will keep using old definitions. Sigh, we should implement fully
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   191
    "/ reflective environment for the compiler...
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   192
    (JavaVM classForName:'stx.libjava.tools.environment.Environment') shared cleanup.    
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   193
2730
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   194
    oldClass subclassesDo:[:cls | 
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   195
        JavaVM registry unregisterClass: cls 
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   196
    ].
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   197
    JavaVM registry classesDo:[:cls|        
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   198
        "/ JV: Q: Should we remove all users of the interface? Let's do it, but not
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   199
        "/        sure if that's necessary/desirable
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   200
        | ifaces |
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   201
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   202
        ifaces := cls getInterfaces.
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   203
        ifaces notNil ifTrue:[
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   204
            (ifaces  anySatisfy:[:ref|
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   205
                    ref isJavaClass ifTrue:[
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   206
                        ref == oldClass
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   207
                    ] ifFalse:[
2857
10c0fcf2d304 Fix JavaClassReloader for new naming (#name -> #binaryName)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2830
diff changeset
   208
                        ref name =  oldClass binaryName
2730
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   209
                    ]
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   210
            ]) ifTrue:[
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   211
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   212
                JavaVM registry unregisterClass: cls
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   213
            ].
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   214
        ].
2857
10c0fcf2d304 Fix JavaClassReloader for new naming (#name -> #binaryName)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2830
diff changeset
   215
        cls constantPool invalidateForClass: oldClass binaryName
2730
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   216
    ]
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   217
272689c14005 Fixed removing of Java classes (issue #40)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2651
diff changeset
   218
    "Created: / 14-09-2013 / 15:53:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   219
    "Modified: / 14-10-2013 / 23:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   220
! !
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   221
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   222
!JavaClassReloader methodsFor:'reloading-requests'!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   223
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   224
requestRecompile:aJavaClass
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   225
    ^ self class requestRecompile:aJavaClass
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   226
!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   227
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   228
requestReload:aJavaClass
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   229
    ^ self class requestReload:aJavaClass
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   230
! !
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   231
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   232
!JavaClassReloader::RecompileRequest methodsFor:'default actions'!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   233
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   234
defaultAction
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   235
    "the default action is to return the default value.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   236
     Subclasses may redefine this"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   237
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   238
    ^ self recompile
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   239
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   240
    "Created: / 15-10-2013 / 00:31:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   241
!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   242
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   243
recompile
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   244
    JavaCompiler recompile: self parameter
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   245
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   246
    "Created: / 15-10-2013 / 00:48:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   247
! !
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   248
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   249
!JavaClassReloader::ReloadRequest methodsFor:'default actions'!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   250
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   251
defaultAction
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   252
    "the default action is to return the default value.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   253
     Subclasses may redefine this"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   254
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   255
    ^ self reload
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   256
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   257
    "Created: / 15-10-2013 / 00:37:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   258
!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   259
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   260
reload
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   261
    JavaVM registry registerClass: self parameter.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   262
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   263
    "Created: / 15-10-2013 / 00:49:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   264
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   265
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   266
!JavaClassReloader::SingleClassReloader methodsFor:'private'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   267
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   268
invalidate
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   269
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   270
    | anyInvalidated |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   271
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   272
    anyInvalidated := false.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   273
    JavaVM registry classesDo:[:class|
2758
06599146279d fix JavaClassReloader>>invalidate
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2742
diff changeset
   274
        anyInvalidated := (self invalidateClass: class) | anyInvalidated.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   275
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   276
    anyInvalidated ifTrue:[ObjectMemory flushCaches].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   277
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   278
    "Created: / 21-02-2012 / 09:47:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2758
06599146279d fix JavaClassReloader>>invalidate
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2742
diff changeset
   279
    "Modified: / 02-10-2013 / 23:27:59 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   280
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   281
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   282
invalidateClass: javaClass 
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   283
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   284
    javaClass == oldClass ifTrue:[ ^ false ]. "/ No need to invalidate old class. It's old, after all
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   285
2857
10c0fcf2d304 Fix JavaClassReloader for new naming (#name -> #binaryName)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2830
diff changeset
   286
    (javaClass constantPool invalidateForClass: oldClass binaryName) ifTrue: [
2830
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   287
        "
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   288
        our Java compiler is too smart - when a field is not accessible, it doesn't generate
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   289
        GETFIELD instructions, it generates ATHROW. I don't know if we want to detect all the
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   290
        cases when compiler can emit such opinionated code, or just to always recompile all 
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   291
        dependents. I lean towards the second. 
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   292
        "
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   293
        self requestRecompile: javaClass.
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   294
        ^ true.
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   295
    ] ifFalse: [ ^ false ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   296
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   297
    "Created: / 21-02-2012 / 09:58:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2830
853c11fe1ce8 wire in requestRecompile sends
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2822
diff changeset
   298
    "Modified (format): / 13-10-2013 / 20:43:57 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   299
    "Modified: / 15-10-2013 / 00:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   300
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   301
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   302
migrate
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   303
    "Possibly migrate instances and class. Return the class that should
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   304
     be installed in registry once reloader finishes his job.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   305
     
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   306
     At this point, all references are already invalidated (see #reload)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   307
     "
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   308
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   309
    mustMigrateInstances ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   310
        self migrateInstances.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   311
        mustMigrateClass ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   312
            self migrateClass
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   313
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   314
        ^newClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   315
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   316
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   317
    mustMigrateClass ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   318
        self migrateClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   319
        ^newClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   320
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   321
    self updateOldClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   322
    ^oldClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   323
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   324
    "Created: / 20-02-2012 / 23:40:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   325
    "Modified (comment): / 16-12-2012 / 17:39:26 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   326
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   327
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   328
migrateClass
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   329
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   330
    "/self error:'Not yet supported'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   331
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   332
    "Created: / 21-02-2012 / 11:04:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   333
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   334
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   335
migrateInstance: object
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   336
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   337
    self assert: object class == oldClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   338
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   339
    "Created: / 30-03-2012 / 19:42:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   340
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   341
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   342
migrateInstances
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   343
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   344
    oldClass allInstancesDo:[:i|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   345
        self migrateInstance:i.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   346
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   347
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   348
    "Created: / 21-02-2012 / 11:04:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   349
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   350
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   351
prepare
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   352
    "Analyze and prepare data for reloading" 
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   354
    self prepareInstFieldMapping.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   355
    self prepareStaticFieldMapping.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   356
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   357
    "Created: / 20-02-2012 / 23:40:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   358
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   359
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   360
prepareFieldMap: fields
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   361
    | map |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   362
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   363
    map := Dictionary new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   364
    fields do:[ :field | map at: field name put: field ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   365
    ^map
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   366
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   367
    "Created: / 21-02-2012 / 09:42:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   368
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   369
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   370
prepareInstFieldMapping
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   371
    "Scans both old and new class inst fields and create a mapping.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   372
     Sets mustMigrateInstances"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   373
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   374
    | newFields |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   375
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   376
    mustMigrateInstances := false.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   377
    instFieldMapping := Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   378
    newFields := self prepareFieldMap: newClass allFields.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   379
    oldClass fields do:[:old|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   380
        | new mapping |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   381
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   382
        new := newFields at: old name ifAbsent:[nil].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   383
        new notNil ifTrue:[ newFields removeKey: old name ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   384
        mapping := FieldMapping old: old new: new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   385
        mustMigrateInstances := mustMigrateInstances or:[mapping mustMigrate].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   386
        instFieldMapping add: mapping.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   387
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   388
    "Remaining fields are new, i.e., does not exist in
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   389
     old class. Add them to the mapping"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   390
    newFields do:[:new|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   391
        instFieldMapping add: (FieldMapping old: nil new: new).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   392
        mustMigrateInstances := true
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   393
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   394
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   395
    "Created: / 21-02-2012 / 09:32:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   396
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   397
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   398
prepareStaticFieldMapping
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   399
    "Scans both old and new class inst fields and create a mapping.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   400
     Sets mustMigrateInstances"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   401
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   402
    | newFields |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   403
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   404
    mustMigrateClass := false.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   405
    staticFieldMapping := Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   406
    newFields := self prepareFieldMap: newClass allStaticFields.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   407
    oldClass staticFields do:[:old|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   408
        | new mapping |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   409
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   410
        new := newFields at: old name ifAbsent:[nil].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   411
        new notNil ifTrue:[ newFields removeKey: old name ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   412
        mapping := FieldMapping old: old new: new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   413
        mustMigrateClass:= mustMigrateClass or:[mapping mustMigrate].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   414
        staticFieldMapping add: mapping.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   415
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   416
    "Remaining fields are new, i.e., does not exist in
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   417
     old class. Add them to the mapping"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   418
    newFields do:[:new|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   419
        staticFieldMapping add: (FieldMapping old: nil new: new).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   420
        mustMigrateClass:= true
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   421
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   422
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   423
    "Created: / 21-02-2012 / 09:45:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   424
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   425
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   426
updateOldClass
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   427
    "At this point we know that both classes have same layout. So we can
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   428
     simply copy methods and other info from new class to old one. 
2822
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   429
     References must be flushed anyway!! We need to copy constant pool over,
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   430
     indices may have changed. And we will copy fields as well, types may
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   431
     have been generalized.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   432
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   433
     Also, here we also track method added and removed and if either
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   434
     one is an overload, request recompile of all dependent classes.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   435
    "
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   436
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   437
    | oldMethods oldMethodsRemoved newMethods newMethodsAdded |
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   438
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   439
    oldMethods := oldClass methodDictionary.
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   440
    oldMethodsRemoved := oldMethods values asSet.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   441
    newMethods := newClass methodDictionary copy.
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   442
    newMethodsAdded := Set new.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   443
    newMethods keysDo:[:selector|
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   444
        | oldM newM |
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   445
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   446
        oldM := oldMethods at: selector ifAbsent:[nil].
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   447
        newM := newMethods at: selector.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   448
        oldM notNil ifTrue:[
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   449
            oldMethodsRemoved remove: oldM.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   450
            (oldM canBeUpdatedFrom: newM) ifTrue:[
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   451
                oldM updateFrom: newM.
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   452
                newMethods at: selector put: oldM.
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   453
            ]
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   454
        ] ifFalse:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   455
            newMethodsAdded add: newM.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   456
        ].
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   457
    ].
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   458
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   459
    newMethods do:[:m|m setJavaClass: oldClass].
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   460
    oldClass setMethodDictionary: newMethods.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   461
    oldClass setConstantPool: newClass constantPool.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   462
    oldClass setSource: newClass sourceString.
2863
c330ff3eb374 Fix in JavaClassReloader (recompilation)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2858
diff changeset
   463
    oldClass setClassfileBytes: newClass classfileBytes.
2822
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   464
    oldClass setFields: newClass fields.
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   465
    oldClass setStaticFields: newClass staticFields.
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   466
    "Flush all proxies, they mau refer to old static methods"
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   467
    oldClass class setMethodDictionary: MethodDictionary new.
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   468
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   469
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   470
    oldMethodsRemoved do:[:oldMRemoved |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   471
        self requestRecompileSendersOf: oldMRemoved.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   472
    ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   473
    newMethodsAdded do:[:newMAdded |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   474
        | overloads name |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   475
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   476
        newMAdded isStatic ifFalse:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   477
            overloads := Set new.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   478
            name := newMAdded name.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   479
            self withAllSuperclassesAndInterfacesOf: newMAdded javaClass do:[:cls|
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   480
                cls methodDictionary keysAndValuesDo:[:selector :method |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   481
                    (method ~~ newMAdded and:[method isStatic not and:[method name = name]]) ifTrue:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   482
                        overloads add: method.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   483
                    ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   484
                ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   485
            ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   486
            overloads do:[:overloadedM |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   487
                self requestRecompileSendersOf: overloadedM.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   488
            ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   489
        ]
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   490
    ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   491
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   492
    "Created: / 16-12-2012 / 17:36:52 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2822
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   493
    "Modified: / 12-10-2013 / 19:20:03 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2863
c330ff3eb374 Fix in JavaClassReloader (recompilation)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2858
diff changeset
   494
    "Modified: / 15-10-2013 / 23:24:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   495
! !
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   496
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   497
!JavaClassReloader::SingleClassReloader methodsFor:'private-helpers'!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   498
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   499
withAllSuperclassesAndInterfacesOf: aJavaClass do: aBlock
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   500
    | queue seen |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   501
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   502
    queue := OrderedCollection with: aJavaClass.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   503
    seen := Set new.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   504
    [ queue isEmpty ] whileFalse:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   505
        | cls |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   506
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   507
        cls := queue removeFirst.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   508
        (seen includes: cls) ifFalse:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   509
            seen add: cls.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   510
            aBlock value: cls.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   511
            queue addAll: cls interfaces.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   512
            cls superclass ~~ JavaObject ifTrue:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   513
                queue add: cls superclass.
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   514
            ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   515
        ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   516
    ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   517
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   518
    "Created: / 15-10-2013 / 01:55:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   519
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   520
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   521
!JavaClassReloader::SingleClassReloader methodsFor:'reloading'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   522
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   523
reload
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   524
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   525
    self prepare.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   526
    self invalidate.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   527
    ^self migrate.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   528
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   529
    "Created: / 20-02-2012 / 23:29:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   530
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   531
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   532
reload: oldClassA with: newClassA
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   533
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   534
    oldClass := oldClassA.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   535
    newClass := newClassA.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   536
    ^ self reload.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   537
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   538
    "Created: / 20-02-2012 / 23:29:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   539
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   540
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   541
!JavaClassReloader::SingleClassReloader methodsFor:'reloading-requests'!
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   542
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   543
requestRecompileSendersOf: givenMethod
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   544
    JavaVM registry classesDo:[:cls|
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   545
        | recompile |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   546
        recompile := cls constantPool contains:[:entry |
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   547
                        entry isJavaRef
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   548
                            and:[ entry isJavaMethodRef
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   549
                            and:[entry classRef name = givenMethod javaClass binaryName
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   550
                            and:[(entry nameAndType name , entry nameAndType descriptor) = givenMethod selector]]]].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   551
        recompile ifTrue:[
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   552
            self requestRecompile: cls.    
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   553
        ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   554
    ].
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   555
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   556
    "Created: / 15-10-2013 / 01:52:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   557
! !
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   558
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   559
!JavaClassReloader::SingleClassReloader::FieldMapping class methodsFor:'instance creation'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   560
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   561
old: old new:new
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   562
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   563
    ^self new old: old new: new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   564
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   565
    "Created: / 21-02-2012 / 09:20:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   566
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   567
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   568
!JavaClassReloader::SingleClassReloader::FieldMapping methodsFor:'accessing'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   569
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   570
new
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   571
    ^ new
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   572
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   573
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   574
new:something
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   575
    new := something.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   576
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   577
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   578
old
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   579
    ^ old
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   580
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   581
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   582
old:something
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   583
    old := something.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   584
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   585
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   586
old:oldArg new:newArg 
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   587
    old := oldArg.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   588
    new := newArg.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   589
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   590
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   591
!JavaClassReloader::SingleClassReloader::FieldMapping methodsFor:'queries'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   592
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   593
mustMigrate
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   594
    "Returns true if the field must be migrated, false otherwise"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   595
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   596
    | oldD newD |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   597
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   598
    (old isNil or:[new isNil]) ifTrue:[ 
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   599
        ^ true "Either one is missing, must migrate"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   600
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   601
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   602
    old index ~~ new index ifTrue:[
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   603
        ^ true "Offsets changed, must migrate"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   604
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   605
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   606
    oldD := old descriptor.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   607
    newD := new descriptor.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   608
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   609
    oldD = newD ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   610
        ^false"Same descriptor, the easy case"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   611
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   612
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   613
    (oldD first == $L and: [newD first == $L]) ifTrue:[
2822
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   614
        (oldD = newD) ifTrue: [ ^ true ] ifFalse: [
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   615
            ^ (old typeClass includesBehavior: new typeClass) not.    
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   616
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   617
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   618
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   619
    1 to: (oldD size min: newD size) do:[:i|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   620
        ((oldD at: i) == $L and: [ (newD at: i) == $L ]) ifTrue:[
2822
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   621
            (oldD = newD) ifTrue: [ ^ true ] ifFalse: [
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   622
                ^ (old typeClass includesBehavior: new typeClass) not.    
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   623
            ].  
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   624
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   625
        ((oldD at: i) ~~ $[ or: [ (newD at: i) ~~ $[ ]) ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   626
            ^true"Different primitive/array types, must migrate"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   627
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   628
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   629
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   630
    ^false
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   631
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   632
    "Created: / 21-02-2012 / 10:57:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2822
751597d0526a do not migrate instances when type of the field is generalized
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2818
diff changeset
   633
    "Modified: / 12-10-2013 / 19:26:19 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2858
3a85f55763e2 Implemented JavaClassReloader>>#requestReload & #requestRecompile (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2857
diff changeset
   634
    "Modified (format): / 14-10-2013 / 23:35:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   635
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   636
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   637
!JavaClassReloader class methodsFor:'documentation'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   638
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   639
version_CVS
2678
c865275e48a7 Updated to match Mercurial revision a00302fe5083 with two tweaks:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
   640
    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReloader.st,v 1.3 2013-09-06 00:41:22 vrany Exp $'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   641
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   642
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   643
version_HG
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   644
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   645
    ^ '$Changeset: <not expanded> $'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   646
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   647
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   648
version_SVN
2731
13f5be2bf83b Merged d87e89dd5276 and fe83a843a7bf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2711 2678
diff changeset
   649
    ^ 'Id'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   650
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset
   651