Cleanup: removed UserPreferences>>javaTestDirectory: (no longer used).
--- a/JavaRefsAndConstantPoolTestCase.st Fri Jan 18 23:36:08 2013 +0000
+++ b/JavaRefsAndConstantPoolTestCase.st Wed Jan 23 00:16:02 2013 +0000
@@ -175,7 +175,7 @@
!
getCrateClassReadStream
- ^ ((Filename named: UserPreferences current javaTestsDirectory)
+ ^ ((Smalltalk getPackageDirectoryForPackage: #stx:libjava)
/ 'libjava' / 'bin'
/ 'stx' / 'libjava'
/ 'tests' / 'mocks'
@@ -183,6 +183,7 @@
"Created: / 10-05-2011 / 12:13:31 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified: / 12-05-2011 / 16:26:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 22-01-2013 / 23:27:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
getPrettyBigConstantPool
--- a/JavaTestsLoader.st Fri Jan 18 23:36:08 2013 +0000
+++ b/JavaTestsLoader.st Wed Jan 23 00:16:02 2013 +0000
@@ -101,7 +101,7 @@
load:testdir
|base dirs|
- base := (UserPreferences current javaTestsDirectory asFilename / testdir)
+ base := ((Smalltalk getPackageDirectoryForPackage: #stx:libjava) / 'test' / testdir)
pathName.
dirs := JavaTestsResource classpath
select:[:each | each startsWith:base ].
@@ -109,7 +109,9 @@
"
JavaTestsLoader load: 'libjava'"
+
"Created: / 07-05-2011 / 18:40:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 22-01-2013 / 23:27:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaTestsLoader class methodsFor:'loading - test suites'!
@@ -251,3 +253,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/extensions.st Fri Jan 18 23:36:08 2013 +0000
+++ b/extensions.st Wed Jan 23 00:16:02 2013 +0000
@@ -1807,58 +1807,6 @@
"Created: / 27-07-2012 / 10:02:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-!UserPreferences methodsFor:'accessing-java-devel'!
-
-javaTestsDirectory
- ^ self at: #javaTestsDirectory
- ifAbsent:
- [ | nm |
-
- nm := OperatingSystem getLoginName.
- "Default path for Jan"
- (nm = 'jv' and:[OperatingSystem isUNIXlike])
- ifTrue:
- [ '/home/jv/Projects/libjava/sources/libjava/branches/jk_new_structure/tests' ]
- ifFalse:
- [ "Default path for Jan (the other one :-)"
- nm = 'jk'
- ifTrue: [ 'path for Jan' ]
- ifFalse:
- [ "Default path for Marcel"
- nm = 'm'
- ifTrue: [ '/home/m/Projects/libjava/branches/jk_new_structure/tests' ]
- ifFalse:
- [ | "Look into package dir" p |
-
- (p := (Smalltalk getPackageDirectoryForPackage: 'stx:libjava') asFilename
- / 'tests') exists
- ifTrue: [ p pathName ]
- ifFalse:
- [ | "Try the environment variable (used by Hudson)" p |
-
- (p := OperatingSystem getEnvironment: 'LIBJAVA_TESTS') notNil
- ifTrue: [ p ]
- ifFalse:
- [ "No default, trigger an error"
- self error: 'No tests path specified' ] ] ] ] ] ]
-
- "
- UserPreferences current javaTestsDirectory"
-
- "Created: / 07-05-2011 / 17:43:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 07-05-2011 / 20:21:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 12-05-2011 / 15:54:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
-!UserPreferences methodsFor:'accessing-java-devel'!
-
-javaTestsDirectory: aStringOrFilename
-
- self at:#javaTestsDirectory put: aStringOrFilename asString.
-
- "Created: / 07-05-2011 / 17:45:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
!WordArray class methodsFor:'testing'!
isInterface
--- a/java/extensions/java/lang/Short.st Fri Jan 18 23:36:08 2013 +0000
+++ b/java/extensions/java/lang/Short.st Wed Jan 23 00:16:02 2013 +0000
@@ -1,6 +1,8 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
-!(Java classForName:'java.lang.Short') class methodsFor:'queries'!
+!
+
+!java/lang/Short class methodsFor:'queries'!
javaWrap: object
|inst|
@@ -8,8 +10,7 @@
inst perform: #'<init>(S)V' with: object.
^ inst.
! !
-
-!(Java classForName:'java.lang.Short') class methodsFor:'queries'!
+!java/lang/Short class methodsFor:'queries'!
javaWrapRequired
"Returns true, if a #javaWrap: has to be called
@@ -19,4 +20,3 @@
^true
! !
-
--- a/java/extensions/java/lang/String.st Fri Jan 18 23:36:08 2013 +0000
+++ b/java/extensions/java/lang/String.st Wed Jan 23 00:16:02 2013 +0000
@@ -1,6 +1,8 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
-!(Java classForName:'java.lang.String') class methodsFor:'queries'!
+!
+
+!java/lang/String class methodsFor:'queries'!
javaWrap: object
| jstring |
@@ -10,8 +12,7 @@
jstring perform: #'<init>([C)V' with: object.
^jstring
! !
-
-!(Java classForName:'java.lang.String') class methodsFor:'queries'!
+!java/lang/String class methodsFor:'queries'!
javaWrapRequired
"Returns true, if a #javaWrap: has to be called
@@ -21,4 +22,3 @@
^true
! !
-
--- a/java/extensions/java/lang/Throwable.st Fri Jan 18 23:36:08 2013 +0000
+++ b/java/extensions/java/lang/Throwable.st Wed Jan 23 00:16:02 2013 +0000
@@ -1,14 +1,14 @@
-"{ Package: 'stx:libjava' }"!
+"{ Package: 'stx:libjava' }"
-!(Java classForName:'java.lang.Throwable') methodsFor:'others'!
+!
+
+!java/lang/Throwable methodsFor:'others'!
description
^self getMessage
! !
-
-!(Java classForName:'java.lang.Throwable') methodsFor:'others'!
+!java/lang/Throwable methodsFor:'others'!
isJavaLangThrowable
^true
! !
-
--- a/libjava.rc Fri Jan 18 23:36:08 2013 +0000
+++ b/libjava.rc Wed Jan 23 00:16:02 2013 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Fri, 18 Jan 2013 22:57:31 GMT\0"
+ VALUE "ProductDate", "Wed, 23 Jan 2013 00:14:38 GMT\0"
END
END
--- a/stx_libjava.st Fri Jan 18 23:36:08 2013 +0000
+++ b/stx_libjava.st Wed Jan 23 00:16:02 2013 +0000
@@ -454,8 +454,6 @@
Set #'java__contains:'
SmallInteger javaUnwrapFrom:
String asArrayOfSubstringsSeparatedBy:
- UserPreferences javaTestsDirectory
- UserPreferences javaTestsDirectory:
WrappedMethod descriptor
WrappedMethod isAbstract
ZipArchive nextBytes:of:startingAt:into:startingAt:
@@ -584,6 +582,8 @@
'String class' javaName
'Unicode16String class' javaName
)
+
+ "Modified: / 23-01-2013 / 00:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!stx_libjava class methodsFor:'description - java'!