--- a/JavaRelease.st Fri Feb 15 18:59:16 2013 +0000
+++ b/JavaRelease.st Sat Feb 16 09:33:16 2013 +0000
@@ -112,10 +112,28 @@
!JavaRelease class methodsFor:'instance creation'!
-custom
- ^Custom instance
+JDK6
+ "Meta-release - return either OpenJDK or OracleJDK"
+ ^self openJDK6 isAvailable
+ ifTrue:[self openJDK6]
+ ifFalse:[self oracleJDK6].
+
+ "Created: / 16-02-2013 / 09:21:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
- "Created: / 26-07-2012 / 23:37:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+JDK7
+ "Meta-release - return either OpenJDK or OracleJDK"
+ ^self openJDK7 isAvailable
+ ifTrue:[self openJDK7]
+ ifFalse:[self oracleJDK7].
+
+ "
+ JavaRelease JDK6
+ JavaRelease JDK7
+
+ "
+
+ "Created: / 16-02-2013 / 09:21:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
openJDK6
@@ -1459,13 +1477,13 @@
"/There is no OpenJDK 6 for Windows yet...
OperatingSystem isMSWINDOWSlike ifTrue:[
- ^99
+ ^89
].
- ^75
+ ^65
"Created: / 22-11-2010 / 13:35:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 19-07-2012 / 10:57:55 / jv"
- "Modified: / 12-02-2013 / 03:09:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-02-2013 / 09:19:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
selector