--- a/JavaRelease.st Wed Feb 06 21:52:03 2013 +0100
+++ b/JavaRelease.st Wed Feb 06 13:22:35 2013 -0800
@@ -96,7 +96,6 @@
"
! !
-
!JavaRelease class methodsFor:'instance creation'!
custom
@@ -135,7 +134,6 @@
"Modified: / 27-07-2012 / 00:22:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease class methodsFor:'accessing'!
all
@@ -183,7 +181,6 @@
"Created: / 26-07-2012 / 23:41:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease class methodsFor:'instance creation-private'!
instance
@@ -195,7 +192,6 @@
"Created: / 27-07-2012 / 00:22:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease class methodsFor:'others'!
version_HG
@@ -203,7 +199,6 @@
^ '$Changeset: <not expanded> $'
! !
-
!JavaRelease class methodsFor:'queries'!
isAbstract
@@ -213,7 +208,6 @@
"Created: / 22-11-2010 / 13:33:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease methodsFor:'accessing'!
bootClassPath
@@ -246,14 +240,6 @@
"Modified: / 23-01-2013 / 15:18:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-
-
-
-
-
-
-
-
javaExtDirs
"Returns a default value of java.ext.dirs property"
@@ -434,7 +420,6 @@
"Modified: / 30-11-2010 / 11:55:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease methodsFor:'debugging'!
dumpConfigOn: stream
@@ -477,7 +462,6 @@
"Modified: / 23-01-2013 / 15:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease methodsFor:'displaying'!
displayString
@@ -486,7 +470,6 @@
"Created: / 27-07-2012 / 00:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease methodsFor:'initialization'!
initializeBootClassPathIndex
@@ -548,7 +531,6 @@
"Created: / 02-11-2011 / 12:12:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
-
!JavaRelease methodsFor:'private'!
searchInternalIndex: anIdentityCollection for: className
@@ -588,7 +570,6 @@
"Created: / 01-11-2011 / 14:18:42 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
! !
-
!JavaRelease methodsFor:'queries'!
bootClassPathIncludesClassNamed: className
@@ -636,20 +617,19 @@
"Created: / 27-07-2012 / 00:08:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease methodsFor:'searching'!
-
-
-
-
searchForJavaHome
| h |
h := (OperatingSystem getEnvironment:'JAVA_HOME').
h notNil ifTrue:[
+ (h endsWith: '\jre') ifTrue:[
+ h := h copyTo: h size - 5
+ ].
javaHome := h asFilename.
+
"/Do not trust JAVA_HOME, it might be wrong (on Windows machine due
"/to a registry mess
((javaHome / 'lib' / 'rt.jar') exists
@@ -676,7 +656,7 @@
"Modified: / 15-03-2011 / 13:29:14 / Jan Kurs <kursjan@fit.cvut.cz>"
"Modified: / 15-03-2011 / 13:47:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified: / 19-07-2012 / 11:08:04 / jv"
- "Modified: / 23-01-2013 / 12:16:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-02-2013 / 13:14:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
searchForSourcePath
@@ -699,7 +679,6 @@
"Modified: / 12-01-2013 / 15:55:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease methodsFor:'validating'!
validateJavaHome: home
@@ -723,7 +702,6 @@
"Modified: / 10-08-2012 / 16:28:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::Custom class methodsFor:'documentation'!
copyright
@@ -754,11 +732,8 @@
^ '§Id:: §'
! !
-
!JavaRelease::Custom methodsFor:'accessing'!
-
-
javaHome
"Answer a Java home"
@@ -825,7 +800,6 @@
"Created: / 27-07-2012 / 10:04:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::Custom methodsFor:'initialization'!
initialize
@@ -834,7 +808,6 @@
"Created: / 26-07-2012 / 23:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::Custom methodsFor:'queries'!
isAvailable
@@ -849,7 +822,6 @@
"Created: / 27-07-2012 / 00:08:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::Custom methodsFor:'searching'!
searchForJavaHome
@@ -858,7 +830,6 @@
"Created: / 26-07-2012 / 23:34:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::OpenJDK6 class methodsFor:'documentation'!
copyright
@@ -889,11 +860,8 @@
^ '§Id:: §'
! !
-
!JavaRelease::OpenJDK6 methodsFor:'accessing'!
-
-
javaExtDirsOnUNIX
^{
@@ -971,7 +939,6 @@
"Created: / 27-07-2012 / 10:05:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::OpenJDK6 methodsFor:'private'!
javaHomeOnWindowsJDKDirectoryPrefix
@@ -980,7 +947,6 @@
"Created: / 19-07-2012 / 11:04:34 / jv"
! !
-
!JavaRelease::OpenJDK6 methodsFor:'searching'!
searchForSourcePath
@@ -997,14 +963,15 @@
].
"
- JavaRelease openJDK7 searchForSourcePath; sourcePath
+ JavaRelease openJDK7 searchForSourcePath; sourcePath
+ JavaRelease sunJDK6 searchForSourcePath; sourcePath
"
"Created: / 03-09-2012 / 18:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 23-01-2013 / 12:22:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 06-02-2013 / 12:55:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::OpenJDK7 class methodsFor:'documentation'!
copyright
@@ -1035,7 +1002,6 @@
^ '§Id:: §'
! !
-
!JavaRelease::OpenJDK7 methodsFor:'accessing'!
javaHomesOnUNIX
@@ -1078,7 +1044,6 @@
"Created: / 27-07-2012 / 10:05:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::OpenJDK7 methodsFor:'private'!
javaHomeOnWindowsJDKDirectoryPrefix
@@ -1087,7 +1052,6 @@
"Created: / 19-07-2012 / 11:05:02 / jv"
! !
-
!JavaRelease::SunJDK122 class methodsFor:'documentation'!
copyright
@@ -1118,11 +1082,8 @@
^ '§Id:: §'
! !
-
!JavaRelease::SunJDK122 methodsFor:'accessing'!
-
-
javaHomesOnUNIX
"superclass JavaRelease says that I am responsible to implement this method"
@@ -1163,7 +1124,6 @@
"Created: / 27-07-2012 / 10:06:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::SunJDK122 methodsFor:'displaying'!
displayString
@@ -1177,7 +1137,6 @@
"Created: / 27-07-2012 / 00:13:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::SunJDK122 methodsFor:'queries'!
isAvailable
@@ -1188,7 +1147,6 @@
"Created: / 27-07-2012 / 00:04:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease::SunJDK6 class methodsFor:'documentation'!
copyright
@@ -1219,7 +1177,6 @@
^ '§Id:: §'
! !
-
!JavaRelease::SunJDK6 methodsFor:'accessing'!
javaHomesOnUNIX
@@ -1241,7 +1198,7 @@
key:'HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\',vsn).
home := entry valueNamed:'JavaHome'.
home notNil ifTrue:[
- ^ (Array with:(home,'\jre'))
+ ^ (Array with:(home))
].
].
paths := OrderedCollection new.
@@ -1256,7 +1213,7 @@
root directoryContents do:[:dir|
(dir startsWith:self javaHomeOnWindowsJDKDirectoryPrefix) ifTrue:[
| path |
- (path := root / dir / 'jre') isDirectory ifTrue:[
+ (path := root / dir) isDirectory ifTrue:[
paths add: path
].
].
@@ -1267,12 +1224,20 @@
^ paths
"
- self basicNew javaHomesOnWindows
+ self basicNew javaHomesOnWindows
"
- "Modified: / 07-08-2011 / 20:38:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified (format): / 19-08-2011 / 00:46:40 / cg"
"Modified: / 19-07-2012 / 11:04:44 / jv"
+ "Modified (comment): / 06-02-2013 / 12:58:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+javaNativeMethodsImplementation
+ "Returns an object that imolements native methods."
+
+ ^ JavaNativeMethodImpl_SunJDK6
+
+ "Created: / 06-02-2013 / 08:39:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
name
@@ -1303,7 +1268,6 @@
"Created: / 27-07-2012 / 10:05:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaRelease class methodsFor:'documentation'!
version_SVN