src/Java.st
author vranyj1
Wed, 14 Dec 2011 21:44:44 +0000
branchjk_new_structure
changeset 1281 b46adbe75503
parent 1276 5a302466ecb8
child 1321 dc6b9bf7bfea
permissions -rw-r--r--
Some cleanup
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     1
"
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1133
diff changeset
     3
1155
vranyj1
parents: 1152
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1133
diff changeset
     5
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
     8
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     9
 This software is furnished under a license and may be used
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    10
 only in accordance with the terms of that license and with the
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    12
 be provided or otherwise made available to, or used by, any
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    13
 other person.  No title to or ownership of the software is
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    14
 hereby transferred.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    15
1155
vranyj1
parents: 1152
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    18
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1133
diff changeset
    19
     as of 1.9.2010
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    20
"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    21
"{ Package: 'stx:libjava' }"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    22
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    23
Object subclass:#Java
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    24
	instanceVariableNames:''
959
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    25
	classVariableNames:'Classes UnresolvedClassRefs Release ClassPath ClassPathExt
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    26
		SourceDirectories CacheDirectory JavaHome InternedStrings
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    27
		Java_lang_String Java_lang_Class PrettyPrintStyle
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    28
		LastArgumentString Threads ExcludedClassPath FailedToLoadClasses
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
    29
		SourceCache SourceArchiveCache JavaClassLoaderQuerySignal
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
    30
		ClassLoaderQuerySignal ThreadsAccess'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    31
	poolDictionaries:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    32
	category:'Languages-Java-Support'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    33
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    34
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    35
!Java class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    36
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    37
copyright
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    38
"
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    39
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1133
diff changeset
    40
1155
vranyj1
parents: 1152
diff changeset
    41
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1133
diff changeset
    42
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    43
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    44
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    45
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    46
 This software is furnished under a license and may be used
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    47
 only in accordance with the terms of that license and with the
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    48
 inclusion of the above copyright notice.   This software may not
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    49
 be provided or otherwise made available to, or used by, any
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    50
 other person.  No title to or ownership of the software is
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    51
 hereby transferred.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    52
1155
vranyj1
parents: 1152
diff changeset
    53
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    54
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    55
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1133
diff changeset
    56
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    57
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 758
diff changeset
    58
"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    59
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    60
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    61
!Java class methodsFor:'accessing'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    62
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1016
diff changeset
    63
classForName: aString 
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
    64
   ^JavaVM classForName: aString.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    65
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    66
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
    67
classNamed: aString 
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
    68
    ^JavaVM classNamed: aString.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    69
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    70
1035
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    71
classRegistry
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    72
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    73
    <resource: #obsolete>
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    74
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    75
    self breakPoint: #mh.
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    76
    self breakPoint: #jv.
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    77
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    78
    ^ JavaVM classRegistry.
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    79
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    80
    "Modified: / 21-10-2011 / 11:12:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    81
!
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
    82
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    83
intern:aJavaString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    84
    |stString internedString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    85
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    86
    stString := self as_ST_String:aJavaString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    87
    internedString := InternedStrings at:stString ifAbsent:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    88
    internedString isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    89
        InternedStrings at:stString put:aJavaString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    90
        internedString := aJavaString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    91
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    92
    ^ internedString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    93
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    94
959
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    95
javaExtDirs
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    96
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    97
    ^Java release javaExtDirs 
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    98
"/        ,{
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
    99
"/            ((Smalltalk packageDirectoryForPackageId: 'stx:libjava') asFilename
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   100
"/                / 'java' / 'libs') }.
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   101
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   102
    "Created: / 31-08-2011 / 22:55:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   103
!
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   104
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   105
java_lang_Class
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   106
    Java_lang_Class isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   107
        Java_lang_Class := self at:'java.lang.Class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   108
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   109
    ^ Java_lang_Class
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   110
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   111
    "Created: 26.3.1997 / 13:42:59 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   112
    "Modified: 26.3.1997 / 13:46:24 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   113
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   114
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   115
java_lang_String
1027
43dc608e14aa another dose of fixes, still not able to boot javavm
hlopkmar
parents: 1026
diff changeset
   116
    Java_lang_String isNil ifTrue: [
1036
4ff03464c3b3 refactored registry..
hlopkmar
parents: 1035
diff changeset
   117
        Java_lang_String := JavaVM classNamed: 'java/lang/String'.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   118
    ].
1027
43dc608e14aa another dose of fixes, still not able to boot javavm
hlopkmar
parents: 1026
diff changeset
   119
    ^ Java_lang_String.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   120
1036
4ff03464c3b3 refactored registry..
hlopkmar
parents: 1035
diff changeset
   121
    "Created: / 26-03-1997 / 13:43:17 / cg"
4ff03464c3b3 refactored registry..
hlopkmar
parents: 1035
diff changeset
   122
    "Modified: / 21-10-2011 / 13:41:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   123
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   124
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   125
prettyPrintStyle
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   126
    ^ PrettyPrintStyle
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   127
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   128
    "Created: 1.8.1997 / 10:37:57 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   129
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   130
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   131
release
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   132
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   133
    ^Release
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   134
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   135
    "Created: / 22-11-2010 / 12:38:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   136
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   137
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   138
release: aJavaRelease
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   139
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   140
    Release := aJavaRelease.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   141
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   142
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   143
        Java release: JavaRelease openJDK6. 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   144
        Java release: JavaRelease sunJDK6. 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   145
        
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   146
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   147
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   148
    "Created: / 22-11-2010 / 12:38:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   149
    "Modified: / 30-11-2010 / 11:54:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   150
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   151
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   152
systemPropertyAt:key put:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   153
    JavaVM systemProperties at:key put:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   154
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   155
    "Created: / 9.1.1999 / 14:49:35 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   156
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   157
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   158
!Java class methodsFor:'accessing paths'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   159
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   160
addToClassPath:pathOrCollection 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   161
    ^ self addToPath:ClassPath path:pathOrCollection
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   162
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   163
    "Created: / 01-08-1997 / 21:10:07 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   164
    "Modified: / 17-09-1998 / 20:43:55 / cg"
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   165
    "Modified: / 14-12-2011 / 00:04:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   166
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   167
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   168
addToClassPathInRuntime: aPath 
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   169
    | path  file  url  scl |
883
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   170
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   171
    "Java might not be loaded/or initialized, in this case
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   172
     there is no no need to inform java about new entry in classpath"
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   173
    JavaVM booted ifFalse: [ ^ self ].
1059
22fe06c9e367 Fixes in classloaders
vranyj1
parents: 1039
diff changeset
   174
    scl := JavaVM systemClassLoader.
22fe06c9e367 Fixes in classloaders
vranyj1
parents: 1039
diff changeset
   175
    scl isNil ifTrue:[ ^self ].
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   176
    path := Java as_String: aPath asString.
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   177
    file := ((JavaVM at: 'java.io.File') new)
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   178
                perform: #'<init>(Ljava/lang/String;)V' with: path;
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   179
                yourself.
883
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   180
    url := file perform: #'toURL()Ljava/net/URL;'.
889
vranyj1
parents: 883
diff changeset
   181
    scl perform: #'addURL(Ljava/net/URL;)V' with: url.
883
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   182
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   183
    "Created: / 01-08-1997 / 21:10:07 / cg"
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   184
    "Modified: / 17-09-1998 / 20:43:55 / cg"
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   185
    "Created: / 07-08-2011 / 14:01:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   186
!
b0eecab8d572 - JavaResolver: fixes in class resolving
vranyj1
parents: 878
diff changeset
   187
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   188
addToPath:cp filesMatching:pattern in:path 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   189
    |dir|
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   190
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   191
    dir := path asFilename.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   192
    dir directoryContents do:[:fname | 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   193
        (fname matches:pattern) ifTrue:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   194
            |p|
1133
vranyj1
parents: 1130
diff changeset
   195
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   196
            p := (dir / fname) pathName.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   197
            (cp includes:p) ifFalse:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   198
                cp add:p.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   199
                cp == ClassPath ifTrue:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   200
                    self addToClassPathInRuntime:p.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   201
                ].
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   202
                FailedToLoadClasses := nil
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   203
            ]
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   204
        ]
1133
vranyj1
parents: 1130
diff changeset
   205
    ].
vranyj1
parents: 1130
diff changeset
   206
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   207
    "Created: / 14-12-2011 / 00:04:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   208
!
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   209
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   210
addToPath:cp path:pathOrCollection 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   211
    |path|
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   212
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   213
    (pathOrCollection isSequenceable and:[pathOrCollection isCharacters not]) ifTrue:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   214
        pathOrCollection do:[:each | 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   215
            self addToPath:cp path:each
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   216
        ].
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   217
        ^ self.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   218
    ].
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   219
    path := pathOrCollection asFilename.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   220
    (pathOrCollection asString includes:$*) ifTrue:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   221
        self 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   222
            addToPath:cp
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   223
            filesMatching:path baseName
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   224
            in:path directoryName.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   225
    ] ifFalse:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   226
        (ClassPath includes:pathOrCollection asString) ifFalse:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   227
            cp add:pathOrCollection asString.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   228
            cp == ClassPath ifTrue:[
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   229
                self addToClassPathInRuntime:pathOrCollection.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   230
            ].
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   231
            FailedToLoadClasses := nil
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   232
        ]
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   233
    ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   234
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   235
    "Created: / 01-08-1997 / 21:10:07 / cg"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   236
    "Modified: / 17-09-1998 / 20:43:55 / cg"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   237
    "Created: / 14-12-2011 / 00:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   238
!
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   239
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   240
addToSourcePath:pathOrCollection
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   241
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   242
    self addToPath: SourceDirectories path: pathOrCollection
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   243
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   244
    "Created: / 02-08-1997 / 14:12:31 / cg"
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   245
    "Modified: / 14-12-2011 / 00:08:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   246
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   247
754
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
   248
cacheDirectory
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
   249
756
dd9543675518 - JavaLibraries: on-demand downloading/updating
vranyj1
parents: 754
diff changeset
   250
    CacheDirectory ifNil:[
dd9543675518 - JavaLibraries: on-demand downloading/updating
vranyj1
parents: 754
diff changeset
   251
        CacheDirectory := Filename homeDirectory / '.smalltalk' / 'libjava' / 'caches' /
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 756
diff changeset
   252
            (((Smalltalk at:#stx_libjava) svnRepositoryUrlBase copyReplaceAll:$/ with:$_) replaceAll:$: with:$_)
756
dd9543675518 - JavaLibraries: on-demand downloading/updating
vranyj1
parents: 754
diff changeset
   253
    ].
dd9543675518 - JavaLibraries: on-demand downloading/updating
vranyj1
parents: 754
diff changeset
   254
    ^CacheDirectory
754
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
   255
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
   256
    "Created: / 08-04-2011 / 15:02:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
756
dd9543675518 - JavaLibraries: on-demand downloading/updating
vranyj1
parents: 754
diff changeset
   257
    "Modified: / 08-04-2011 / 16:58:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
754
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
   258
!
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
   259
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   260
classPath
908
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   261
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   262
    ^   ClassPath ,
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   263
        self classPathFromEnvironment ,
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   264
        self classPathFromPackages .
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   265
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   266
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   267
"/
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   268
"/    ^ "for testing only"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   269
"/    "/Release classPath,
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   270
"/    
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   271
"/    {(packagePath / 'java' / 'libjava-projects' / 'Conversion' / 'bin') 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   272
"/        pathName.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   273
"/    (packagePath / 'java' / 'libjava-support' / 'bin') pathName} 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   274
"/            , ((packagePath / 'java' / 'libs') directoryContentsAsFilenames 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   275
"/                    select:[:f | f suffix = 'jar']
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   276
"/                    thenCollect:[:f | f pathName]) 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   277
"/            , (ClassPath ? #()) , cp
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   278
"/
908
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   279
    "
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   280
        Java classPath
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   281
    "
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   282
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   283
    "Created: / 07-02-1997 / 19:23:45 / cg"
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   284
    "Modified: / 13-12-2011 / 23:56:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   285
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   286
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   287
classPath:aCollectionOfPaths
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   288
    ClassPath := aCollectionOfPaths asOrderedCollection.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   289
    FailedToLoadClasses := nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   290
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   291
    "Created: / 7.2.1997 / 19:23:45 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   292
    "Modified: / 17.9.1998 / 20:44:09 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   293
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   294
1276
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   295
classPathFromEnvironment
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   296
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   297
    ^ ((OperatingSystem getEnvironment:'CLASSPATH') ? '') 
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   298
        tokensBasedOn:OperatingSystem pathSeparator
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   299
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   300
    "Modified (format): / 13-12-2011 / 23:54:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   301
!
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   302
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   303
classPathFromPackages
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   304
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   305
    | cp |
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   306
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   307
    cp := OrderedCollection new.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   308
    ProjectDefinition allSubclassesDo:[:pkg|
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   309
        self addToPath: cp path: pkg javaClassPath.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   310
    ].
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   311
    ^cp.
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   312
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   313
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   314
    "
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   315
        Java classPathFromPackages
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   316
    "
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   317
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   318
    "Created: / 07-02-1997 / 19:23:45 / cg"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   319
    "Created: / 13-12-2011 / 23:56:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   320
!
5a302466ecb8 Default class path hanling changed, now each Smalltalk/X package can define its own class path, that is included initial class path
vranyj1
parents: 1259
diff changeset
   321
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   322
effectiveClassPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   323
959
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   324
    ClassPathExt ifNil:[
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   325
        ClassPathExt := OrderedCollection new.
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   326
        self javaExtDirs do:[:dir|
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   327
            dir isDirectory ifTrue:[
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   328
                dir directoryContentsAsFilenamesDo:[:file|
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   329
                    file suffix = 'jar' ifTrue:[
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   330
                        ClassPathExt add: file pathName
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   331
                    ]
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   332
                ]
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   333
            ]
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   334
        ]
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   335
    ].
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   336
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   337
    ^self release classPath , "ClassPathExt ," self classPath
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   338
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   339
    "
908
d990d0d520d9 ClassLoader trickery, maybe not a good idea, we will see.
vranyj1
parents: 906
diff changeset
   340
    Java effectiveClassPath
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   341
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   342
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   343
    "Created: / 22-11-2010 / 13:03:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   344
    "Modified: / 17-01-2011 / 09:44:16 / kursjan <kursjan@fit.cvut.cz>"
959
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   345
    "Modified: / 31-08-2011 / 23:17:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   346
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   347
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   348
effectiveSourceDirectories
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   349
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   350
    ^Release sourcePath ,
1281
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   351
     self sourcePath
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   352
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   353
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   354
        Java effectiveSourceDirectories 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   355
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   356
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   357
    "Created: / 30-11-2010 / 11:53:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   358
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   359
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   360
excludedClassPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   361
    ^ ExcludedClassPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   362
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   363
    "Modified: / 7.2.1997 / 19:23:55 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   364
    "Created: / 27.1.1998 / 21:57:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   365
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   366
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   367
isExcludedFromClassPath:fileName
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   368
    |nm|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   369
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   370
    nm := fileName asFilename pathName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   371
    ExcludedClassPath do:[:excludedPath |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   372
        (nm startsWith:excludedPath) ifTrue:[^ true].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   373
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   374
    ^ false
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   375
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   376
    "Created: / 27.1.1998 / 22:00:40 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   377
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   378
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   379
javaHome
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   380
    ^ JavaHome ifNil:[Release javaHome]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   381
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   382
    "Created: / 06-08-1997 / 00:53:19 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   383
    "Modified: / 22-11-2010 / 12:39:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   384
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   385
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   386
javaHome:aPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   387
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   388
    <resource: #obsolete>
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   389
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   390
    self obsoleteMethodWarning: 'javaHome is now controlled by java release'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   391
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   392
    JavaHome := aPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   393
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   394
    "Created: / 06-08-1997 / 00:53:23 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   395
    "Modified: / 22-11-2010 / 12:40:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   396
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   397
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   398
newJavaHome:newJavaHome
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   399
    self javaHome:newJavaHome.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   400
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   401
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   402
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   403
removeFromClassPath:aPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   404
    (ClassPath includes:aPath) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   405
        ClassPath remove:aPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   406
    ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   407
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   408
    "Modified: 7.2.1997 / 19:23:55 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   409
    "Created: 1.8.1997 / 21:10:21 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   410
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   411
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   412
removeFromSourcePath:aPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   413
    (SourceDirectories includes:aPath) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   414
        SourceDirectories remove:aPath
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   415
    ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   416
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   417
    "Modified: 7.2.1997 / 19:23:55 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   418
    "Created: 2.8.1997 / 14:13:01 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   419
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   420
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   421
sourceDirectories
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   422
    ^ SourceDirectories
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   423
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   424
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   425
sourceDirectories:aCollectionOfPaths
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   426
    SourceDirectories := aCollectionOfPaths asOrderedCollection
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   427
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   428
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   429
     Java
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   430
        sourceDirectories:#(
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   431
                            '/phys/ibm3/java/src'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   432
                           )
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   433
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   434
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   435
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   436
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   437
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   438
sourcePath
1281
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   439
    ^ 
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   440
    SourceDirectories ? #() ,
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   441
    self sourcePathFromPackages
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   442
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   443
    "Created: / 16-01-1998 / 13:26:55 / cg"
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   444
    "Modified: / 14-12-2011 / 20:00:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   445
!
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   446
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   447
sourcePathFromPackages
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   448
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   449
    | sp |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   450
1281
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   451
    sp := OrderedCollection new.
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   452
    ProjectDefinition allSubclassesDo:[:pkg|
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   453
        self addToPath: sp path: pkg javaSourcePath.
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   454
    ].
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   455
    ^sp.
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   456
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   457
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   458
    "
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   459
        Java classPathFromPackages
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   460
    "
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   461
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   462
    "Created: / 07-02-1997 / 19:23:45 / cg"
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
   463
    "Created: / 14-12-2011 / 19:59:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   464
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   465
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   466
!Java class methodsFor:'change & update'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   467
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   468
update: what with: param from: sender
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   469
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   470
    what == #restarted ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   471
        self reinitialize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   472
    ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   473
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   474
    "Created: / 14-12-2010 / 21:00:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   475
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   476
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   477
!Java class methodsFor:'class initialization'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   478
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   479
initAllClasses
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   480
    | system |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   481
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   482
    FailedToLoadClasses := nil.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   483
    self initAllStaticFields.
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   484
    system := JavaVM classForName: 'java.lang.System'.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   485
    system isInitialized ifFalse: [ self initSystemClass. ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   486
    self allClassesDo: [:cls | cls isInitialized ifFalse: [ cls classInit ] ]
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   487
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   488
    "
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   489
     Java initAllClasses"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   490
    "Modified: / 27.11.1998 / 00:33:05 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   491
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   492
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   493
initAllStaticFields
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   494
     self allClassesDo:[:cls |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   495
        cls initializeStaticFields
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   496
     ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   497
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   498
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   499
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   500
initSystemClass
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   501
    | system |
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   502
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   503
    system := JavaVM classForName: 'java.lang.System'.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   504
    system isNil ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   505
        "/        JavaVM initializeVM.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   506
        "/        system := Java at:'java.lang.System'.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   507
        "/        system isNil ifTrue:[
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   508
        self warn: 'JavaVM: no ''' , 'java.lang.System' allBold , ''' class.'.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   509
        
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   510
"/            self error:'no ''java.lang.System'' class'.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   511
        
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   512
        ^ 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   513
"/        ].
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   514
        self
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   515
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   516
    system classInit.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   517
    (system implements: #'initializeSystemClass()V') ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   518
        system "invokeStatic:" perform: #'initializeSystemClass()V'.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   519
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   520
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   521
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   522
     Java initSystemClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   523
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   524
     (Java at:'java.lang.System')
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   525
        perform:#'getProperty(Ljava/lang/String;)Ljava/lang/String;'
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   526
        with:(Java as_String:'java.home')"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   527
    "Modified: / 10.11.1998 / 12:39:58 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   528
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   529
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   530
initialize
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   531
    JavaNativeMethod flushAllCachedNativeMethods.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   532
    InternedStrings := Dictionary new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   533
    FailedToLoadClasses := nil.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   534
    ClassPath := OrderedCollection new.
959
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   535
    ClassPathExt := nil.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   536
    ExcludedClassPath := OrderedCollection new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   537
    SourceCache := CacheDictionary new: 32.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   538
    SourceArchiveCache := CacheDictionary new: 32.
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   539
    Threads := IdentityDictionary new.
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   540
    ThreadsAccess := RecursionLock forMutualExclusion.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   541
    self initializeRelease. "lazy initialization of Release"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   542
    self initializePrettyPrintStyle.
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   543
    ObjectMemory addDependent: self.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   544
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   545
    "
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   546
     Java flushAllJavaResources.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   547
     Java initialize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   548
     JavaVM initializeVM
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   549
     Java classPath inspect"
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   550
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   551
    "Modified: / 06-11-2001 / 09:24:12 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   552
    "Created: / 03-10-2010 / 15:54:02 / Jan Kurs <kurs.jan@post.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   553
    "Modified: / 15-10-2010 / 17:37:20 / Jan Kurs <kurs.jan@post.cz>"
959
1f3342b2e728 Fixes...
vranyj1
parents: 957
diff changeset
   554
    "Modified: / 31-08-2011 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   555
    "Modified: / 09-12-2011 / 13:16:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   556
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   557
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   558
initializePrettyPrintStyle
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   559
    PrettyPrintStyle := IdentityDictionary new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   560
    PrettyPrintStyle  at:#accessAttribute put:(#color -> (Color red:0 green:0 blue:25)).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   561
    PrettyPrintStyle  at:#className       put:(Array with:(#color -> Color black) with:#bold).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   562
    PrettyPrintStyle  at:#methodName      put:(Array with:(#color -> Color black) with:#bold).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   563
    PrettyPrintStyle  at:#code            put:(#color -> Color black).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   564
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   565
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   566
     "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   567
      Java initializePrettyPrintStyle
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   568
     "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   569
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   570
    "Created: 1.8.1997 / 11:08:43 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   571
    "Modified: 1.8.1997 / 11:09:58 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   572
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   573
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   574
initializeRelease
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   575
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   576
    Release ifNil:[Release := JavaRelease any].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   577
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   578
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   579
        Release := nil. 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   580
        self initializeRelease.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   581
        Release
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   582
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   583
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   584
    "Created: / 22-11-2010 / 13:41:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   585
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   586
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   587
reinitAllClasses
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   588
     self markAllClassesUninitialized.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   589
     self initAllClasses
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   590
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   591
     "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   592
      Java reinitAllClasses
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   593
     "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   594
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   595
    "Modified: / 4.1.1998 / 00:34:29 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   596
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   597
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   598
reinitialize
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   599
    "/ all JavaThreads are lost on a restart (for now)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   600
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   601
    FailedToLoadClasses := nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   602
    Threads := nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   603
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   604
    "Kludge"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   605
    JavaMethod reinitialize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   606
    JavaMethodWithException reinitialize.    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   607
    JavaMethodWithHandler reinitialize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   608
    JavaNativeMethod reinitialize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   609
    JavaNativeMethod flushAllCachedNativeMethods.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   610
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   611
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   612
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   613
     Java reinitialize
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   614
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   615
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   616
    "Created: / 26-08-1997 / 20:07:00 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   617
    "Modified: / 27-04-1998 / 14:57:23 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   618
    "Modified: / 14-12-2010 / 21:30:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   619
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   620
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   621
startupJavaSystem
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   622
    | javaEventThread  haveEventThread  haveScreenUpdater |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   623
    FailedToLoadClasses := nil.
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   624
    
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   625
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   626
    "/ check if already running
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   627
    "/
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   628
    
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   629
    haveEventThread := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   630
    javaEventThread := JavaVM javaEventThread.
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   631
    (javaEventThread isNil or: [ javaEventThread isDead ]) ifTrue: [
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   632
        haveEventThread := false
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   633
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   634
    haveScreenUpdater := false.
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   635
    haveEventThread ifTrue: [
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   636
        self threadsDo: [
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   637
            :aJavaThread | 
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   638
            aJavaThread name = 'JAVA-Screen Updater' ifTrue: [
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   639
                aJavaThread isDead ifFalse: [
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   640
                    "/ already running
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   641
                    haveScreenUpdater := true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   642
                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   643
            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   644
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   645
    ].
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   646
    (haveEventThread and: [ haveScreenUpdater ]) ifTrue: [ ^ self ].
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   647
    JavaClass orderOfClassInits isNil ifTrue: [
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   648
        "/ the very first start ...
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   649
        'JAVA [info]: (re)initializing JAVA environment completely ...' 
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   650
            infoPrintCR.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   651
        JavaVM initializeVM.
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   652
    ] ifFalse: [ JavaVM initializeVMIfNoEventThreadRunning ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   653
    'JAVA [info]: done JAVA initialization.' infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   654
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   655
    "
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   656
     Java startupJavaSystem"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   657
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   658
    "Modified: / 24-12-1999 / 01:37:49 / cg"
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
   659
    "Modified: / 09-12-2011 / 12:50:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   660
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   661
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   662
terminateAllThreads
1118
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   663
    | myself  threadsToKill  semaphore |
1116
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   664
    Threads isNil ifTrue: [ ^ self ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   665
    myself := Processor activeProcess.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   666
    threadsToKill := IdentitySet new.
1116
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   667
    Threads do: [
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   668
        :aJavaThread | 
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   669
        aJavaThread ~~ myself ifTrue: [
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   670
            (aJavaThread isNil or: [ aJavaThread == 0 ]) ifFalse: [
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   671
                (aJavaThread isMemberOf: JavaProcess) ifTrue: [
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   672
                    aJavaThread isDead ifFalse: [ threadsToKill add: aJavaThread ]
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   673
                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   674
            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   675
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   676
    ].
1116
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   677
    threadsToKill size > 0 ifTrue: [
1118
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   678
        Logger 
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   679
            log: 'Killing ' , threadsToKill size printString , ' java processes'
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   680
            severity: #info
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   681
            facility: #JVM.
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   682
        semaphore := Semaphore new: 1 - threadsToKill size.
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   683
        semaphore name: 'Java thread killer'.
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   684
        threadsToKill do: [
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   685
            :aThread | 
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   686
            aThread == JavaVM javaScreenUpdaterThread ifTrue: [ self halt ].
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   687
            aThread == JavaVM javaEventQueueThread ifTrue: [ self halt ].
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   688
            aThread 
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   689
                addExitAction: [
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   690
                    Logger 
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   691
                        log: 'Java thread killed successfully'
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   692
                        severity: #info
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   693
                        facility: #JVM.
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   694
                    semaphore signal
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   695
                ].
1130
9e6c3f1aadd4 removing annoying breakpoints
hlopkmar
parents: 1126
diff changeset
   696
          
1118
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   697
            aThread terminate
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   698
        ].
1119
0f4d4bc3d346 warning!! bug possibly fixed :) probably not but maybe ;)
hlopkmar
parents: 1118
diff changeset
   699
        semaphore wait.        
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   700
    ].
1119
0f4d4bc3d346 warning!! bug possibly fixed :) probably not but maybe ;)
hlopkmar
parents: 1118
diff changeset
   701
    JavaVM releaseAllMonitors.
1118
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   702
    Logger 
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   703
        log: 'No Java threads running at this point'
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   704
        severity: #info
1c76866b4df4 and more fixes.. hope never dies
hlopkmar
parents: 1116
diff changeset
   705
        facility: #JVM.
1130
9e6c3f1aadd4 removing annoying breakpoints
hlopkmar
parents: 1126
diff changeset
   706
  
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   707
    Threads := nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   708
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   709
    "
1116
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   710
     Java terminateAllThreads"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   711
1116
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   712
    "Created: / 26-08-1997 / 19:57:40 / cg"
3d108134cd76 in-the-middle-of-the-work commit, may break stuff, fixes to come soon :)
hlopkmar
parents: 1113
diff changeset
   713
    "Modified: / 24-12-1999 / 02:34:53 / cg"
1130
9e6c3f1aadd4 removing annoying breakpoints
hlopkmar
parents: 1126
diff changeset
   714
    "Modified: / 17-11-2011 / 21:31:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   715
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   716
1016
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   717
!Java class methodsFor:'debugging'!
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   718
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   719
dontHaltOnKnownBugs
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   720
    Object disableBreakPoint: #knownBugs.
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   721
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   722
    "Created: / 09-10-2011 / 17:29:17 / m"
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   723
!
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   724
1259
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   725
dumpConfig
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   726
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   727
    Transcript notNil ifTrue:[
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   728
        self dumpConfigOn: Transcript
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   729
    ] ifFalse:[
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   730
        self dumpConfigOn: Stdout
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   731
    ]
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   732
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   733
    "Created: / 10-12-2011 / 12:54:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   734
!
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   735
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   736
dumpConfigOn: stream
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   737
    "Prints current config (java home, initial system properties etc) on a stream."
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   738
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   739
    | props |
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   740
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   741
    Java release dumpConfigOn: stream.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   742
    props := Dictionary new.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   743
    JavaVM initializeSystemPropertiesInto: props.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   744
    stream nextPutAll: '== Initial system properties =='; cr.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   745
    props keysAndValuesDo:[:key :value|
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   746
        '%-30s : %s' printf: { key . value } on: stream.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   747
        stream cr.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   748
    ].
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   749
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   750
    "
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   751
        Java dumpConfigOn: Transcript.
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   752
    "
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   753
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   754
    "Created: / 10-12-2011 / 12:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   755
!
e3089381b731 Java, JavaRelease: added dumpConfigOn:
vranyj1
parents: 1250
diff changeset
   756
1016
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   757
haltOnKnownBugs
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   758
    Object enableBreakPoint: #knownBugs.
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   759
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   760
    "Created: / 09-10-2011 / 17:29:05 / m"
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   761
! !
2b20730b8717 work on ticket #28(illegal access after evaluating expresion in workspace).
hlopkmar
parents: 1000
diff changeset
   762
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   763
!Java class methodsFor:'enumerating'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   764
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   765
allClasses
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   766
1039
vranyj1
parents: 1036
diff changeset
   767
    ^JavaVM classRegistry classes
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   768
1039
vranyj1
parents: 1036
diff changeset
   769
    "Modified: / 28-01-1998 / 01:42:04 / cg"
vranyj1
parents: 1036
diff changeset
   770
    "Modified: / 23-10-2011 / 20:14:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   771
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   772
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   773
allClassesDo:aBlock
1039
vranyj1
parents: 1036
diff changeset
   774
vranyj1
parents: 1036
diff changeset
   775
    ^JavaVM classRegistry classesDo: aBlock
vranyj1
parents: 1036
diff changeset
   776
vranyj1
parents: 1036
diff changeset
   777
    "Modified: / 23-10-2011 / 20:14:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   778
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   779
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   780
!Java class methodsFor:'object conversions'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   781
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   782
as_Float:aNumber
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   783
    "convert an ST-float into a Java Float"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   784
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   785
    |i|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   786
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   787
    i := (Java at:'java.lang.Float') new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   788
    i perform:#'<init>(F)V' with:(aNumber asShortFloat).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   789
    ^ i
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   790
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   791
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   792
     Java as_Float:1
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   793
     Java as_Float:3.14159
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   794
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   795
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   796
    "Created: 7.8.1997 / 21:21:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   797
    "Modified: 7.8.1997 / 21:22:05 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   798
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   799
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   800
as_Hashtable: aDictionary 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   801
    "given a smalltalk dictionary, create and return
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   802
     a Java hashTable for it"
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   803
    
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   804
    | hashTable |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   805
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   806
    hashTable := (JavaVM classForName: 'java.util.Hashtable') new.
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   807
    aDictionary 
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   808
        keysAndValuesDo: [
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   809
            :k :v | 
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   810
            | sk  sv  jk  jv |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   811
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   812
            (sk := k) isSymbol ifTrue: [ sk := sk asString ].
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   813
            (sv := v) isSymbol ifTrue: [ sv := sv asString ].
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   814
            jk := self as_Object: sk.
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   815
            jv := self as_Object: sv.
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   816
            hashTable 
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   817
                perform: #'put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;'
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   818
                with: jk
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   819
                with: jv.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   820
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   821
    ^ hashTable
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   822
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   823
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   824
     Java as_Hashtable:(Dictionary new
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   825
                           at:'hello' put:'Hallo';
1033
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   826
                           at:'world' put:'Welt';
a31de6a4cfa4 refactoringl, moved registry to JavaVM
hlopkmar
parents: 1027
diff changeset
   827
                           yourself)"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   828
    "Modified: / 14.1.1998 / 17:02:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   829
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   830
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   831
as_Integer:anInteger
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   832
    "convert an ST-integer into a Java Integer"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   833
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   834
    |i|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   835
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   836
    i := (Java at:'java.lang.Integer') new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   837
    i perform:#'<init>(I)V' with:anInteger.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   838
    ^ i
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   839
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   840
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   841
     Java as_Integer:1
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   842
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   843
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   844
    "Modified: 7.8.1997 / 21:19:37 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   845
    "Created: 7.8.1997 / 21:21:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   846
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   847
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   848
as_Object:anObject
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   849
    "convert an ST-Object into a Java Object"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   850
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   851
    anObject isString ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   852
        ^ self as_String:anObject
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   853
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   854
    anObject isInteger ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   855
        ^ self as_Integer:anObject
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   856
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   857
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   858
    self halt.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   859
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   860
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   861
     Java as_Object:'hello world'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   862
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   863
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   864
    "Created: 7.8.1997 / 21:15:38 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   865
    "Modified: 7.8.1997 / 21:20:07 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   866
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   867
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   868
as_ST_String: aJavaString 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   869
    "hard-coding internas of java.lang.String here is bad ..."
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   870
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   871
    | str  count  offs  start  stop |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   872
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   873
    aJavaString isNil ifTrue: [ ^ nil ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   874
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   875
    "/ count := aJavaString instVarNamed:'count'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   876
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   877
    count := aJavaString instVarAt: 3.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   878
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   879
    "/ str := aJavaString instVarNamed:'value'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   880
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   881
    str := aJavaString instVarAt: 1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   882
    str size == count 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   883
        ifTrue: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   884
            [ "cos I don't see any reason to do this"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   885
            "/ ^ str asOneByteString.
906
fea23aa2b228 Few more fixes and workarounds for Saxon 6.5.5: the Othello example works fine...
vranyj1
parents: 889
diff changeset
   886
            ^ str ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   887
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   888
    "/ offs := (aJavaString instVarNamed:'offset').
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   889
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   890
    offs := aJavaString instVarAt: 2.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   891
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   892
    "/ start := offs + 1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   893
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   894
    start := offs + 1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   895
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   896
    "/ stop := start + (aJavaString instVarNamed:'count') - 1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   897
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   898
    stop := start + count - 1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   899
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   900
    "/ ^ ((aJavaString instVarNamed:'value') copyFrom:start to:stop) asString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   901
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   902
    ^ (str copyFrom: start to: stop) asOneByteString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   903
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   904
    "Created: / 08-08-1997 / 12:02:55 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   905
    "Modified: / 04-01-1999 / 23:55:08 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   906
    "Modified: / 22-03-2011 / 17:21:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
906
fea23aa2b228 Few more fixes and workarounds for Saxon 6.5.5: the Othello example works fine...
vranyj1
parents: 889
diff changeset
   907
    "Modified: / 10-08-2011 / 23:32:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   908
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   909
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   910
as_String:aString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   911
    "convert an ST-String into a Java String"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   912
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   913
    "hard-coding internas of java.lang.String here is bad ..."
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   914
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   915
    |s|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   916
1027
43dc608e14aa another dose of fixes, still not able to boot javavm
hlopkmar
parents: 1026
diff changeset
   917
    s := self java_lang_String basicNew.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   918
    s instVarNamed:'value'  put: aString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   919
    s instVarNamed:'offset' put: 0.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   920
    s instVarNamed:'count'  put: aString size.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   921
    s instVarNamed:'hash'   put: 0.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   922
    ^ s
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   923
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   924
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   925
     Java as_String:'hello world'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   926
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   927
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   928
    "Created: / 07-08-1997 / 21:15:49 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   929
    "Modified: / 03-02-2011 / 23:33:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   930
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   931
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   932
as_URL:aString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   933
    "convert an ST-String into a Java String"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   934
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   935
    "hard-coding internas of java.lang.String here is bad ..."
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   936
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   937
    |u s|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   938
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   939
    s := aString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   940
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   941
    "/ kludge for volume
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   942
    OperatingSystem isMSDOSlike ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   943
        ((s size > 1) and:[(s at:2) == $:]) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   944
            s := 'file:' , (s copy at:2 put:$|)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   945
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   946
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   947
    u := (self at:'java.net.URL') newCleared.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   948
    u perform:#'<init>(Ljava/lang/String;)V' with:(self as_String:s).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   949
    ^ u
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   950
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   951
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   952
     Java as_URL:'http://www.altavista.com'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   953
     Java as_URL:'file:/foo/bar'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   954
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   955
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   956
    "Created: / 7.8.1997 / 21:15:49 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   957
    "Modified: / 25.9.1999 / 22:22:21 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   958
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   959
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   960
!Java class methodsFor:'queries'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   961
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   962
smalltalkClassFor:typeRef
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   963
self halt.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   964
"/    (typeString startsWith:'[[') ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   965
"/        ^ Array
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   966
"/    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   967
"/    (typeString startsWith:'[F') ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   968
"/        ^ FloatArray
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   969
"/    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   970
    self halt.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   971
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   972
    "Modified: 7.4.1997 / 13:33:46 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   973
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   974
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   975
smalltalkDerefType:typeString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   976
    (typeString startsWith:'[') ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   977
        ^ typeString copyFrom:2
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   978
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   979
    self halt.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   980
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   981
    "Modified: 7.4.1997 / 13:13:24 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   982
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   983
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   984
!Java class methodsFor:'registering java classes'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   985
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
   986
at: aJavaName 
1035
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   987
    
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   988
    ^JavaVM at: aJavaName.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   989
1035
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   990
    "Modified: / 18-07-1998 / 22:55:16 / cg"
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   991
    "Modified (format): / 21-10-2011 / 10:40:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   992
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   993
1035
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   994
at: aJavaName put: aJavaClass
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   995
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   996
    ^JavaVM at:aJavaName put:aJavaClass.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   997
1035
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   998
    "Created: / 17-04-1996 / 23:29:31 / cg"
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
   999
    "Modified: / 07-08-1997 / 19:15:58 / cg"
712d2090e68b Small refactoring of class registry, more follows
vranyj1
parents: 1033
diff changeset
  1000
    "Modified (format): / 21-10-2011 / 10:39:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1001
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1002
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1003
flushAllJavaResources
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1004
    self flushClasses.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1005
    SourceCache := CacheDictionary new: 32.
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1060
diff changeset
  1006
    SourceArchiveCache := CacheDictionary new: 32.
1109
9bd0544f9046 Initial version of finalize() support - may crash VM!
vranyj1
parents: 1073
diff changeset
  1007
    Smalltalk garbageCollect.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1008
    ObjectMemory 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1009
        allObjectsDo: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1010
            :someObject | 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1011
            someObject isBehavior ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1012
                someObject isJavaClass ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1013
                    someObject setConstantPool: nil.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1014
                    someObject setInterfaces: nil.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1015
                    someObject setMethodDictionary: (MethodDictionary new).
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1016
                    Logger 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1017
                        log: 'flushing ' , someObject fullName
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1018
                        severity: #info
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1019
                        facility: 'JVM'.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1020
                ]
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1021
            ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1022
        ].
1204
6c2b887399e8 Few small fixes
vranyj1
parents: 1155
diff changeset
  1023
    JavaEvaluator flushWorkspaceBinding .
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1024
    JavaClass flushClassesInitOrder.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1025
    self flushClasses
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1026
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1027
    "
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1022
diff changeset
  1028
     Java flushAllJavaResources"
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1060
diff changeset
  1029
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1030
    "Modified: / 06-11-2001 / 09:49:37 / cg"
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1060
diff changeset
  1031
    "Modified: / 02-11-2011 / 21:34:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1204
6c2b887399e8 Few small fixes
vranyj1
parents: 1155
diff changeset
  1032
    "Modified: / 02-12-2011 / 23:24:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1033
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1034
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1035
flushClasses
1039
vranyj1
parents: 1036
diff changeset
  1036
    UnresolvedClassRefs := nil.
1060
c3ac98001802 Yet another set of hacks for classloaders
vranyj1
parents: 1059
diff changeset
  1037
    JavaVM flushClasses.
1209
vranyj1
parents: 1204
diff changeset
  1038
    Smalltalk keysAndValuesDo:[:name :class |
vranyj1
parents: 1204
diff changeset
  1039
        class isJavaClass ifTrue:[
vranyj1
parents: 1204
diff changeset
  1040
            Smalltalk removeKey: name.
vranyj1
parents: 1204
diff changeset
  1041
        ]
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1042
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1043
    Smalltalk removeKey:#'JAVA'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1044
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1045
    Java_lang_String := Java_lang_Class := nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1046
    JavaVM releaseAllJavaResources.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1047
    JavaUnresolvedConstant flushPatchLists.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1048
    Debugger == DebugView ifTrue:[Debugger newDebugger].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1049
    ObjectMemory flushCaches.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1050
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1051
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1052
     Java flushClasses
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1053
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1054
1039
vranyj1
parents: 1036
diff changeset
  1055
    "Modified: / 06-11-2001 / 09:47:49 / cg"
1113
7ac31c29769f fixed flushAllJavaResources.. suprisingly easy :))
hlopkmar
parents: 1109
diff changeset
  1056
    "Modified: / 16-11-2011 / 09:43:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1209
vranyj1
parents: 1204
diff changeset
  1057
    "Modified: / 04-12-2011 / 11:35:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1058
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1059
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1060
markAllClassesUninitialized
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1061
    self allClassesDo:[:aJavaClass |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1062
        aJavaClass markUninitialized
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1063
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1064
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1065
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1066
     Java markAllClassesUninitialized
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1067
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1068
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1069
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1070
rememberUnresolved:anUnresolvedClassRef
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1071
    ('JAVA: remember unresolved class: ' , anUnresolvedClassRef fullName) infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1072
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1073
    UnresolvedClassRefs isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1074
        UnresolvedClassRefs := Dictionary new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1075
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1076
    UnresolvedClassRefs 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1077
        at:anUnresolvedClassRef fullName
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1078
        put:anUnresolvedClassRef
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1079
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1080
    "Created: / 18.4.1996 / 00:05:31 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1081
    "Modified: / 19.10.1998 / 20:57:44 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1082
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1083
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1084
removeClass:aJavaClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1085
    "/ remove it from myself
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1086
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1087
    |javaName sym nm cls p ns|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1088
1039
vranyj1
parents: 1036
diff changeset
  1089
    self breakPoint: #jv.
vranyj1
parents: 1036
diff changeset
  1090
    self breakPoint: #mh.    
vranyj1
parents: 1036
diff changeset
  1091
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1092
    javaName := aJavaClass fullName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1093
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1094
    sym := javaName asSymbolIfInterned.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1095
    sym notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1096
        cls := Classes at:sym ifAbsent:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1097
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1098
    cls isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1099
        nm := javaName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1100
        (nm includes:$.) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1101
            "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1102
            "/ try pckg/.../name
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1103
            "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1104
            nm := (nm asString copyReplaceAll:$. with:$/).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1105
            sym := nm asSymbolIfInterned.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1106
            sym notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1107
                cls := Classes at:sym ifAbsent:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1108
            ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1109
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1110
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1111
    (cls notNil and:[cls == aJavaClass]) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1112
        Classes removeKey:sym.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1113
        self updateClassRefsFrom:aJavaClass to:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1114
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1115
    Smalltalk removeKey:('JAVA::' , javaName) asSymbol.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1116
    Smalltalk removeKey:javaName asSymbol.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1117
    Smalltalk removeKey:((javaName , '') copy replaceAll:$/ with:$.) asSymbol.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1118
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1119
    "/ remove myself from the JAVA::-::-:: namespace
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1120
    "/ (which exists for convenient smalltalk access only)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1121
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1122
    p := aJavaClass nameSpacePath.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1123
    p knownAsSymbol ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1124
        ns := Smalltalk at:p asSymbol.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1125
        (ns notNil and:[ns isNameSpace]) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1126
            Smalltalk removeKey:(p , '::' , aJavaClass lastName) asSymbol
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1127
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1128
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1129
1039
vranyj1
parents: 1036
diff changeset
  1130
    "Modified: / 19-10-1998 / 20:58:49 / cg"
vranyj1
parents: 1036
diff changeset
  1131
    "Modified (format): / 23-10-2011 / 20:18:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1132
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1133
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1134
unresolvedClassRefFor:aClassName
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1135
    UnresolvedClassRefs isNil ifTrue:[^ nil].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1136
    ^ UnresolvedClassRefs at:aClassName ifAbsent:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1137
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1138
    "Modified: / 19.10.1998 / 20:56:46 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1139
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1140
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1141
updateClassRefsFrom:oldClass to:newClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1142
    "update all references to oldClass to now refer to newClass.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1143
     sent, when a class is reloaded"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1144
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1145
    newClass notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1146
        "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1147
        "/ kludge: the new class might have been resolved with the oldClass ...
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1148
        "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1149
        newClass constantPool 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1150
            updateClassRefsFrom:oldClass to:newClass.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1151
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1152
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1153
    self allClassesDo:[:aJavaClass |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1154
        aJavaClass updateClassRefsFrom:oldClass to:newClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1155
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1156
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1157
    "Created: 26.3.1997 / 13:49:20 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1158
    "Modified: 12.8.1997 / 03:04:44 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1159
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1160
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1161
!Java class methodsFor:'source management'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1162
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1163
classSource:filename package:package in:dirOrZipFile 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1164
    |fn zar f |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1165
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1166
    fn := dirOrZipFile asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1167
    fn isDirectory 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1168
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1169
            [ package notNil 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1170
                ifTrue:[ (f:= fn / package / filename) exists ifTrue:[ ^ f contents asString ]. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1171
            (f := fn / filename) exists ifTrue:[ ^ f contents asString ]. ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1172
        ifFalse:
1281
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
  1173
            [ ((dirOrZipFile last == $p and: [fn hasSuffix:'zip']) or:
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
  1174
              [(dirOrZipFile last == $r and: [fn hasSuffix:'jar'])])
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1175
                ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1176
                    [ zar := SourceArchiveCache 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1177
                                at: dirOrZipFile 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1178
                                ifAbsentPut:[ZipArchive oldFileNamed:fn pathName].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1179
                    zar notNil 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1180
                        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1181
                            [   package notNil 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1182
                                ifTrue:[ 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1183
                                    OperatingSystem fileSeparator ~~ $/ ifTrue: [ 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1184
                                        f := (package copyReplaceAll: OperatingSystem fileSeparator with: $/) , '/' , filename
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1185
                                    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1186
                                        f := package , '/' , filename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1187
                                    ]]                                
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1188
                                ifFalse:[ f := filename].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1189
                            (zar findMember: f) ifNotNil:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1190
                                [          
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1191
                                    "Kludge because of broken ZipArchive"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1192
                                    |  cache |
754
a3d9edeb7d73 - Java: added #cacheDirectory
vranyj1
parents: 752
diff changeset
  1193
                                    cache := Java cacheDirectory / Release name / 'src'.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1194
                                    cache exists ifFalse:[cache recursiveMakeDirectory].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1195
                                    (cache / f) exists ifTrue:[^(cache / f) contents asString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1196
                                    OperatingSystem 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1197
                                        executeCommand:('unzip "%1" "%2"' bindWith: fn asAbsoluteFilename asString 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1198
                                                            with: f asString)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1199
                                        inDirectory: cache asString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1200
                                    (f := cache / f) exists ifTrue:[^f contents asString]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1201
                                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1202
                            ]]].            
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1203
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1204
    ^ nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1205
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1206
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1207
        Java classSource: 'Object.java' package:'java/lang' in:'/home/jv/Projects/JavaX/java-6-openjdk/src'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1208
        Java classSource: 'Object.java' package:'java/lang' in:'/usr/lib/jvm/java-6-openjdk/src.zip'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1209
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1210
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1211
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1212
    "Modified: / 29-03-1998 / 21:46:40 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1213
    "Created: / 30-11-2010 / 12:32:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1281
b46adbe75503 Some cleanup
vranyj1
parents: 1276
diff changeset
  1214
    "Modified: / 14-12-2011 / 20:13:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1215
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1216
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1217
classSourceOf:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1218
    |package dirName binary sourceFileName sourceFile loader codeBaseURL protocol codeBaseURLIdx src|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1219
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1220
    aClass isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1221
        ^ nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1222
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1223
    "/ look at the cache"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1224
    SourceCache at: aClass ifPresent: [:src|^src].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1225
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1226
    "/ first, look in the directory, where the binary
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1227
    "/ was loaded from.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1228
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1229
    binary := aClass binaryFile.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1230
    binary notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1231
        binary := binary asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1232
        aClass sourceFile notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1233
            sourceFileName := binary directory constructString:(aClass sourceFile).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1234
            sourceFileName asFilename exists ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1235
                sourceFileName := nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1236
            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1237
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1238
        sourceFileName isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1239
            sourceFileName := binary withSuffix:'java'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1240
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1241
        sourceFile := sourceFileName asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1242
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1243
        "/ maybe it was loaded by a java classLoader ...
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1244
        (loader := aClass classLoader) notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1245
            codeBaseURLIdx := loader class instVarOffsetOf:'codeBaseURL'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1246
            codeBaseURLIdx notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1247
                (codeBaseURL := loader instVarAt:codeBaseURLIdx) notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1248
                    (protocol := codeBaseURL instVarNamed:'protocol') notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1249
                        (Java as_ST_String:protocol) = 'file' ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1250
                            dirName := Java as_ST_String:(codeBaseURL instVarNamed:'file').
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1251
                            dirName := dirName asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1252
                            dirName exists ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1253
                                aClass sourceFile notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1254
                                    sourceFile := sourceFileName := dirName construct:aClass sourceFile.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1255
                                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1256
                            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1257
                        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1258
                    ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1259
                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1260
            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1261
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1262
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1263
    sourceFile notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1264
        sourceFile exists ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1265
            binary notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1266
                sourceFileName := binary withSuffix:'jav'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1267
                sourceFile := sourceFileName asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1268
                sourceFile exists ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1269
                    sourceFileName := binary withSuffix:'JAV'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1270
                    sourceFile := sourceFileName asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1271
                    sourceFile exists ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1272
                        sourceFileName := binary withSuffix:'JAVA'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1273
                        sourceFile := sourceFileName asFilename.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1274
                    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1275
                ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1276
            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1277
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1278
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1279
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1280
    "/ special case: there were multiple classes in a single
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1281
    "/ source file.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1282
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1283
    (binary notNil and:[aClass sourceFile notNil]) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1284
        binary withoutSuffix baseName ~= aClass sourceFile asFilename withoutSuffix baseName ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1285
            'JAVA: trouble extracting fileName: ' infoPrint.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1286
            binary withoutSuffix baseName print. ' vs. ' infoPrint.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1287
            aClass sourceFile asFilename withoutSuffix baseName infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1288
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1289
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1290
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1291
    "/ if that fails, look in standard places
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1292
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1293
    (sourceFile isNil or:[sourceFile exists not]) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1294
        sourceFile := aClass sourceFile.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1295
        package := aClass javaPackageAsDirname.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1296
        self effectiveSourceDirectories do:[:dir|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1297
            src := self classSource: sourceFile package: package in: dir.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1298
            src ifNotNil:[^src]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1299
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1300
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1301
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1302
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1303
    sourceFile isFilename ifFalse:[^nil].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1304
    ^ (sourceFile contentsOfEntireFile).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1305
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1306
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1307
        Java classSourceOf: JAVA::java::lang::Object
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1308
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1309
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1310
    "Modified: / 27-01-1999 / 20:40:30 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1311
    "Modified: / 10-02-2011 / 23:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1312
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1313
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1314
!Java class methodsFor:'starting apps'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1315
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1316
javaProcessForMainOf:aJavaClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1317
    "ask for a commandLine, create a java process to invoke
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1318
     its main and return it. The process is not scheduled for
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1319
     execution."
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1320
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1321
    ^ self javaProcessForMainOf:aJavaClass argumentString:nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1322
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1323
    "Modified: / 30.12.1998 / 20:24:25 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1324
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1325
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1326
javaProcessForMainOf:aJavaClass argumentString:argStringIn
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1327
    "create a java process, ready to invoke the classes main
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1328
     method. Returns the process - ready to run but not yet resumed"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1329
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1330
    |p argStringArray argString stdInReplacement alreadyAskedForStdin|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1331
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1332
    argString := argStringIn.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1333
    argString isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1334
        argString := Dialog 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1335
                    request:'argument string:' 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1336
                    initialAnswer:LastArgumentString ? ''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1337
                    onCancel:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1338
        argString isNil ifTrue:[^ nil].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1339
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1340
        LastArgumentString := argString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1341
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1342
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1343
    JavaVM initializeVMIfNoEventThreadRunning.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1344
    (Java at:'java.lang.System') instVarNamed:'security' put:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1345
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1346
    argString isEmpty ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1347
        argStringArray := #()
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1348
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1349
        argStringArray := argString asCollectionOfWords collect:[:s | Java as_String:s] as:Array.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1350
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1351
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1352
    p := JavaProcess 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1353
            for:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1354
                    "/ if the program reads from stdin, let user provide a file
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1355
                    "/ for it.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1356
                    JavaVM stdinReplacementFileQuerySignal handle:[:ex |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1357
                        |fn|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1358
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1359
                        alreadyAskedForStdin == true ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1360
                            fn := Dialog 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1361
                                    requestFileName:'Program reads from Stdin - give inputFile or cancel for EOF'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1362
                                    default:nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1363
                                    fromDirectory:(FileSelectionBox lastFileSelectionDirectory).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1364
                            fn notNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1365
                                stdInReplacement := fn asFilename readStream.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1366
                            ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1367
                            alreadyAskedForStdin := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1368
                        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1369
                        ex proceedWith:stdInReplacement
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1370
                    ] do:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1371
                        aJavaClass 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1372
                            performStatic:#'main([Ljava/lang/String;)V'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1373
                            with:argStringArray.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1374
                    ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1375
                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1376
            priority:(Processor activePriority - 1).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1377
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1378
    p name:(aJavaClass fullName , '::main()').
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1379
    p restartable:true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1380
    ^ p
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1381
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1382
    "Created: / 15.8.1997 / 04:41:20 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1383
    "Modified: / 24.12.1999 / 01:50:21 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1384
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1385
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1386
!Java class methodsFor:'threads'!
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1387
1250
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1388
addThread: jThread for: stProcess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1389
    ThreadsAccess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1390
        critical: [
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1391
            self assert: (Threads includesKey: jThread) not.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1392
            jThread == 0 ifTrue: [self breakPoint:#mh].
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1393
            Threads at: jThread put: stProcess.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1394
        ]
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1395
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1396
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1397
    "Created: / 09-12-2011 / 12:47:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1398
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1399
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1400
initializeCurrentThread
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1401
    "adds current thread into known threads"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1402
    
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1403
    | thisProcess  jThread |
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1404
    thisProcess := Processor activeProcess.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1405
    jThread := JavaVM newThread: thisProcess name.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1406
    jThread instVarNamed: 'tid' put: thisProcess id.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1407
    Java addThread: jThread for: thisProcess.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1408
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1409
    "Created: / 09-12-2011 / 12:08:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1410
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1411
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1412
removeThread: jThread for: stProcess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1413
ThreadsAccess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1414
        critical: [
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1415
    self assert: (Threads includesKey: jThread).
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1416
    Threads removeKey: jThread.]
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1417
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1418
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1419
    "Created: / 09-12-2011 / 12:47:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1420
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1421
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1422
removeThread: jThread ifAbsent: block
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1423
    ThreadsAccess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1424
        critical: [
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1425
            
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1426
            Threads removeKey: jThread ifAbsent: block
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1427
        ]
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1428
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1429
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1430
    "Created: / 09-12-2011 / 12:51:52 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1431
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1432
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1433
threadForStProcess: stProcess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1434
    ThreadsAccess critical: [ ^Threads keyAtValue: stProcess ].
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1435
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1436
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1437
    "Created: / 09-12-2011 / 12:50:58 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1438
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1439
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1440
threadForStProcess: stProcess ifAbsent: block 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1441
    ThreadsAccess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1442
        critical: [ |result| result := Threads keyAtValue: stProcess ifAbsent: block. result == 0 ifTrue: [self breakPoint:#mh]. ^ result ].
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1443
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1444
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1445
    "Created: / 09-12-2011 / 12:53:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1446
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1447
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1448
threads
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1449
    self breakPoint:#mh.
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1450
    ^ Threads.
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1451
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1452
    "Created: / 26-08-1997 / 19:53:57 / cg"
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1453
    "Modified: / 09-12-2011 / 12:49:43 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1250
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1454
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1455
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1456
threadsAt: key 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1457
    ^Threads at: key.
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1458
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1459
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1460
    "Created: / 09-12-2011 / 12:31:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1461
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1462
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1463
threadsAt: key ifAbsent: block 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1464
    ThreadsAccess critical: [ ^ Threads at: key ifAbsent: block ]
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1465
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1466
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1467
    "Created: / 09-12-2011 / 12:49:22 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1468
!
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1469
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1470
threadsDo: block
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1471
    ThreadsAccess 
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1472
            critical: [ Threads do: block]
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1473
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1474
    "Created: / 26-08-1997 / 19:53:57 / cg"
3904fc7212b4 forgotten methods :)
hlopkmar
parents: 1249
diff changeset
  1475
    "Created: / 09-12-2011 / 12:49:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1249
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1476
! !
3c82fe50483c IllegalMonitorStateException bug FIXED :)
hlopkmar
parents: 1209
diff changeset
  1477
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1478
!Java class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1479
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1480
version
1022
38b710d7dfbc svn properties fixed
vranyj1
parents: 1021
diff changeset
  1481
    ^ '$Id$'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1482
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1483
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1484
version_SVN
1022
38b710d7dfbc svn properties fixed
vranyj1
parents: 1021
diff changeset
  1485
    ^ '$Id$'
923
b922537eea2a Merged with CVS version
vranyj1
parents: 920
diff changeset
  1486
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1487
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1488
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1489
Java initialize!