stx_libjava.st
changeset 2353 fa7400d022a0
parent 2344 5eb32c8721b0
child 2363 19f22f026ca4
--- a/stx_libjava.st	Sat Feb 02 01:23:18 2013 +0100
+++ b/stx_libjava.st	Sat Feb 16 19:08:45 2013 +0100
@@ -1,10 +1,10 @@
 "
  COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-			    SWING Research Group, Czech Technical University in Prague
+
+ New code and modifications done at SWING Research Group [1]:
 
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+                            SWING Research Group, Czech Technical University in Prague
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -13,31 +13,10 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
 "
 "{ Package: 'stx:libjava' }"
 
@@ -53,11 +32,11 @@
 copyright
 "
  COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-			    SWING Research Group, Czech Technical University in Prague
+
+ New code and modifications done at SWING Research Group [1]:
 
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+                            SWING Research Group, Czech Technical University in Prague
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -66,33 +45,16 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
+ [1] Code written at SWING Research Group contains a signature
+     of one of the above copright owners. For exact set of such code,
+     see the differences between this version and version stx:libjava
+     as of 1.9.2010
 
 "
+!
+
+extensionsVersion_SVN
+    ^ '$Id: stx_libjava.st,v 1.6 2013-02-16 18:08:32 vrany Exp $'
 ! !
 
 !stx_libjava class methodsFor:'accessing'!
@@ -116,12 +78,12 @@
 
 !stx_libjava class methodsFor:'accessing - tests'!
 
-excludedFromTestSuite
+excludedFromTestSuite  
     "List of testcases and/or tests excluded from testsuite.
      Entries maybe ClassName or #(ClassName testName)
     "
     ^ #(
-	LookupTests
+        LookupTests
     )
 
     "Created: / 03-06-2011 / 17:04:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -131,7 +93,7 @@
 
     | suite javaTestCases stTests |
     suite := super testSuite.
-	stTests := suite tests.
+    stTests := suite tests.
     suite := TestSuite new.
     suite name: self package.
     JavaTestsLoader load.
@@ -139,39 +101,37 @@
     javaTestCases := OrderedCollection new.
 
     Java allClassesDo:
-	[:jclass|
-	(jclass ~~ (Java at:'stx.libjava.tests.JUnit3Tests')
-	    and:[jclass ~~ (Java at:'stx.libjava.tests.JUnit4Tests')
-		and:[jclass isTestCaseLike]])
-		    ifTrue:
-			[ | tc |
-			tc := jclass asTestCase.
-						(tc askFor:#isTestlet) ifTrue:[
-							tc shouldFork: true.
-						].
-			tc isAbstract ifFalse:[javaTestCases add:tc ]]].
+        [:jclass|
+        (jclass name ~~ #'stx/libjava/tests/JUnit3Tests'
+            and:[jclass name ~~  #'stx/libjava/tests/JUnit4Tests'
+                and:[jclass isTestCaseLike]])
+                    ifTrue:
+                        [ | tc |
+                        tc := jclass asTestCase.
+                        tc isAbstract ifFalse:[javaTestCases add:tc ]]].
 
     javaTestCases do:
-		[:each |
-		suite addTests:each buildSuite tests ].
+                [:each | 
+                suite addTests:each buildSuite tests ].
 
 
     suite tests addAll: stTests.
 
     suite tests withIndexDo:
-	[:t :i|
-	Stdout nextPutAll: i printString; space; nextPutAll: t printString; cr].
+        [:t :i|
+        Stdout nextPutAll: i printString; space; nextPutAll: t printString; cr].
 
+    Java dumpConfigOn: Stdout.
     ^suite
 
     "
-	stx_libjava testSuite
+        stx_libjava testSuite
 
     "
 
     "Created: / 07-05-2011 / 19:58:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 07-05-2011 / 22:26:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 04-06-2011 / 17:23:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+    "Modified: / 08-02-2013 / 10:24:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 testSuiteWithoutJavaTests
@@ -200,21 +160,105 @@
      exclude individual packages in the #excludedFromPrerequisites method."
 
     ^ #(
-	#'stx:goodies/petitparser'    "PPParser - superclass of JavaParser::BlockParser "
-	#'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
-	#'stx:libbasic'    "Object - superclass of JavaMethodWithHandler "
-	#'stx:libbasic2'    "ZipArchive - referenced by Java class>>classSource:package:in: "
-	#'stx:libbasic3'    "MessageTracer - referenced by JavaMethod>>setBreakPoint "
-	#'stx:libcomp'    "ObjectFileLoader - referenced by JavaVM class>>_Runtime_loadFileInternalI: "
-	#'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-	#'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
-	#'stx:libview'    "DisplaySurface - superclass of JavaView "
-	#'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
-	#'stx:libwidg'    "Label - referenced by JavaVM class>>processEvent: "
-	#'stx:libwidg2'    "MenuPanel - referenced by JavaVM class>>processEvent: "
+        #'stx:goodies/sunit'    "TestSuite - referenced by stx_libjava class>>testSuite "
+        #'stx:libbasic'    "WriteStream - superclass of JavaSocket "
+        #'stx:libbasic2'    "BitArray - superclass of extended BooleanArray "
+        #'stx:libbasic3'    "WrappedMethod - extended "
+        #'stx:libcomp'    "VariableNode - referenced by ProxyMethodCompiler>>compile:arguments:selector: "
+        #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
+        #'stx:libtool'    "DebugView - referenced by Java class>>flushClasses "
+        #'stx:libview'    "SimpleView - superclass of JavaView "
+        #'stx:libview2'    "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
+        #'stx:libwidg'    "Scroller - referenced by JavaVM class>>processEvent: "
+        #'stx:libwidg2'    "ComboBoxView - referenced by JavaVM class>>processEvent: "
     )
 ! !
 
+!stx_libjava class methodsFor:'description - compilation'!
+
+additionalLinkLibraries_bc_dot_mak
+
+    ^ '$(ZLIB_DIR)\$(ZLIB) support\fdlibm\libfdm.lib'
+
+    "Modified: / 07-09-2011 / 17:04:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalLinkLibraries_make_dot_proto
+
+    ^ '$(ZLIB_LD_ARG) support/fdlibm/libfdm.a'
+
+    "Modified: / 07-09-2011 / 17:01:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalRules_bc_dot_mak
+    ^ '
+ant:
+        ant -f java\build.xml
+
+$(ZLIB):
+        cd $(ZLIB_DIR)
+        $(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
+        cd ..\..\libjava
+
+$(BZ2LIB):
+        cd $(BZ2LIB_DIR)
+        $(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
+        cd ..\..\libjava
+
+support\fdlibm\libfdm.lib:
+        cd support\fdlibm
+        $(MAKE) -f Makefile.bcc
+        cd ..\..
+
+'
+
+    "Modified: / 15-11-2012 / 23:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalRules_make_dot_proto
+    ^ '
+ant:
+	ant -f java/build.xml
+
+zlib:
+        cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
+
+support/fdlibm/libfdm.a:
+        $(MAKE) -C support/fdlibm
+
+'
+
+    "Modified: / 15-11-2012 / 23:22:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalTargets_bc_dot_mak
+
+    ^ '$(ZLIB) support\fdlibm\libfdm.lib ant'
+
+    "Modified: / 15-11-2012 / 23:20:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalTargets_make_dot_proto
+
+    ^ ' zlib support/fdlibm/libfdm.a ant'
+
+    "Created: / 05-09-2006 / 16:05:12 / cg"
+    "Modified: / 15-11-2012 / 23:20:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+localIncludes
+    ^ '-I$(ZLIB_DIR) -Isupport/fdlibm'
+
+    "Created: / 06-09-2006 / 18:18:15 / cg"
+    "Modified: / 07-09-2011 / 17:03:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+stcOptimizationOptions
+    ^ '+optinline +optinline2'
+
+    "Created: / 23-08-2006 / 11:06:17 / cg"
+! !
+
 !stx_libjava class methodsFor:'description - contents'!
 
 classNamesAndAttributes
@@ -224,137 +268,161 @@
      Attributes are: #autoload or #<os> where os is one of win32, unix,..."
 
     ^ #(
-	"<className> or (<className> attributes...) in load order"
-	(AbstractJavaTestCase autoload)
-	JavaByte
-	(JUnitTestCaseProxy autoload)
-	Java
-	JavaAnnotation
-	JavaAnnotationContainer
-	JavaAnnotationDefault
-	JavaAnnotationDictionary
-	JavaAnnotationValue
-	(JavaAntProjectResource autoload)
-	JavaArray
-	JavaBehavior
-	(JavaByteCodeDisassemblerTests autoload)
-	(JavaByteCodeInterpreterTests autoload)
-	JavaByteCodeProcessor
-	(JavaByteCodeProcessorTests autoload)
-	JavaClassReader
-	(JavaClassReader2Tests autoload)
-	(JavaClassReaderTests autoload)
-	(JavaClassRefTests autoload)
-	JavaConstantPool
-	JavaContext
-	JavaDecompiler
-	JavaDescriptor
-	JavaError
-	JavaExceptionTableEntry
-	(JavaExceptionThrowerMock autoload)
-	JavaField
-	(JavaFieldRefTests autoload)
-	JavaInflater
-	(JavaInitializedResource autoload)
-	(JavaInterfaceMethodRefTests autoload)
-	(JavaJUnitTests autoload)
-	JavaJavadocNode
-	JavaLanguage
-	JavaLibraries
-	(JavaLibrariesResource autoload)
-	JavaLocalVariableTable
-	JavaLocalVariableTableEntry
-	JavaLookup
-	(JavaLookupTestsResource autoload)
-	JavaMethod
-	(JavaMethodRefTests autoload)
-	JavaNameAndType2
-	JavaNativeMemory
-	JavaNode
-	JavaObject
-	JavaObjectDictionary
-	JavaPackage
-	JavaParseResult
-	(JavaParserNavigationTests autoload)
-	(JavaParserTestCase autoload)
-	(JavaParserTests autoload)
-	JavaPopUpView
-	JavaProcess
-	JavaRef2
-	(JavaRefMock autoload)
-	(JavaRefTests autoload)
-	JavaRelease
-	JavaResolver
-	(JavaRuntimeConstantPoolTests autoload)
-	JavaSlotIndexCache
-	JavaSourceCodeCache
-	JavaSourceFileWriter
-	JavaStartup
-	(JavaTestCaseProxy autoload)
-	JavaTestsLoader
-	(JavaTestsResource autoload)
-	JavaTopView
-	(JavaUTF8Tests autoload)
-	JavaUnresolvedConstant
-	JavaVM
-	JavaView
-	(LookupTests autoload)
-	PPJavaNode
-	JavaShort
-	SmalltalkAppletContext
-	SmalltalkAppletStub
-	(TestletTestCaseProxy autoload)
-	#'stx_libjava'
-	JavaAnnotationArrayValue
-	JavaAnnotationClassValue
-	JavaAnnotationEnumValue
-	JavaAnnotationNestedAnnotationValue
-	JavaAnnotationPrimitiveValue
-	JavaByteCodeDisassembler
-	JavaByteCodeEnumerator
-	JavaByteCodeInterpreter
-	JavaClass
-	JavaClassAnnotationContainer
-	JavaClassContentRef2
-	JavaClassRef2
-	JavaEmbeddedFrameView
-	JavaFieldAnnotationContainer
-	JavaFieldDescriptor
-	JavaFormalParameterNode
-	JavaInvalidRefError
-	JavaMethodAnnotationContainer
-	JavaMethodDeclarationNode
-	JavaMethodDeclaratorNode
-	JavaMethodDescriptor
-	JavaMethodNode
-	JavaMethodWithException
-	JavaParser
-	JavaStringRef2
-	JavaTypeNode
-	JavaUnhandledExceptionError
-	JavaUnresolvedClassConstant
-	JavaUnresolvedStringConstant
-	JavadocDeclarationNode
-	JavaArrayTypeNode
-	JavaBooleanTypeNode
-	JavaBothOldAndNewClassRef
-	JavaByteCodeSteppableInterpreter
-	JavaCharTypeNode
-	JavaClassOrInterfaceTypeNode
-	JavaDoubleTypeNode
-	JavaFieldRef2
-	JavaFloatTypeNode
-	JavaIntTypeNode
-	JavaLongTypeNode
-	JavaMethodRef2
-	JavaMethodWithHandler
-	JavaVoidTypeNode
-	JavaInterfaceMethodRef2
-	JavaNativeMethod
-	JavaEvaluator
+        "<className> or (<className> attributes...) in load order"
+        JavaVMData
+        (JavaRefsAndConstantPoolTestCase autoload)
+        GroovyCompiler
+        GroovyEvaluator
+        GroovyLanguage
+        GroovySourceFileWriter
+        Java
+        JavaAnnotation
+        JavaAnnotationContainer
+        JavaAnnotationDefault
+        JavaAnnotationDictionary
+        JavaAnnotationValue
+        (JavaAntProjectResource autoload)
+        JavaArray
+        JavaByte
+        (JavaByteCodeProcessorTests autoload)
+        (JavaByteCodeDisassemblerTests autoload)
+        JavaByteCodeProcessor
+        JavaClassAccessor
+        (JavaClassLoadingTests autoload)
+        (JavaClassRefTests autoload)
+        JavaClassRegistry
+        JavaClassReloader
+        JavaConstantPool
+        JavaConstants
+        JavaContext
+        JavaDecompiler
+        JavaDescriptor
+        JavaError
+        JavaExceptionTableEntry
+        JavaField
+        (JavaFieldRefTests autoload)
+        (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
+        (JavaInterfaceMethodRefTests autoload)
+        (JavaJUnitTests autoload)
+        JavaLanguage
+        JavaLibraries
+        (JavaLibrariesResource autoload)
+        JavaLocalVariableTable
+        JavaLocalVariableTableEntry
+        JavaLookup
+        JavaMathSupport
+        (JavaMethodRefTests autoload)
+        JavaMonitor
+        (JavaMonitorsTests autoload)
+        JavaNameAndType2
+        JavaNativeMemory
+        JavaObject
+        JavaObjectDictionary
+        JavaPackage
+        JavaPopUpView
+        JavaProcess
+        JavaRef2
+        (JavaRefMock autoload)
+        JavaRelease
+        JavaResolver
+        (JavaRuntimeConstantPoolTests autoload)
+        JavaShort
+        JavaSlotIndexCache
+        JavaSocket
+        JavaSourceCodeCache
+        JavaSourceFileWriter
+        (JavaTestCaseProxy autoload)
+        JavaTestsLoader
+        (JavaTestsResource autoload)
+        JavaTopView
+        (JavaUTF8Tests autoload)
+        JavaUnresolvedConstant
+        JavaUtilities
+        JavaView
+        JavaZipSupport
+        PPJavaNode
+        ProxyMethod
+        ProxyMethodCompiler
+        ProxyMethodNode
+        SmalltalkAppletContext
+        SmalltalkAppletStub
+        (TestletTestCaseProxy autoload)
+        #'stx_libjava'
+        JavaAnnotationArrayValue
+        JavaAnnotationClassValue
+        JavaAnnotationEnumValue
+        JavaAnnotationNestedAnnotationValue
+        JavaAnnotationPrimitiveValue
+        JavaBehavior
+        JavaByteCodeDisassembler
+        JavaByteCodeEnumerator
+        JavaByteCodeProcessorAdapter
+        JavaClassAnnotationContainer
+        JavaClassContentRef2
+        JavaClassReader
+        JavaClassRef2
+        JavaEmbeddedFrameView
+        JavaFieldAnnotationContainer
+        JavaFieldDescriptor
+        JavaFieldDescriptorWithUnionType
+        JavaInvalidRefError
+        JavaMethod
+        JavaMethodAnnotationContainer
+        JavaMethodDeclarationNode
+        JavaMethodDescriptor
+        JavaStringRef2
+        JavaUnhandledExceptionError
+        JavaUnresolvedClassConstant
+        JavaUnresolvedStringConstant
+        JavaVM
+        JavadocDeclarationNode
+        ProxyMethodConditionNode
+        ProxyMethodGuardNode
+        ProxyMethodInvocationNode
+        JavaByteCodePreresolver
+        JavaClass
+        JavaFieldRef2
+        JavaMethodRef2
+        JavaMethodWithException
+        ProxyMethodAndNode
+        ProxyMethodBlockInvocationNode
+        ProxyMethodMethodInvocationNode
+        ProxyMethodTypeCheckNode
+        GroovyClass
+        JavaInterfaceMethodRef2
+        JavaMethodWithHandler
+        ProxyMethodJavaMethodInvocationNode
+        ProxyMethodJavaTypeCheckNode
+        JavaNativeMethod
+        ProxyMethodJavaFieldAccessor
+        ProxyMethodJavaFieldGetter
+        ProxyMethodJavaFieldSetter
+        (JavaExceptionTests autoload)
+        #'JavaCompiler_Eclipse'
+        JavaMetaclass
+        GroovyMetaclass
+        (JavaClassReaderTests autoload)
+        JavaNioSupport
+        (JavaNativeMemoryTests autoload)
+        JavaFinalizationRegistry
+        JavaMirror
+        JavaClassQuery
+        (JUnitTestCaseProxy autoload)
+        (JavaLookupResolutionAlgorithmTests autoload)
+        (JavaLookupTests autoload)
+        (JavaLookupTestsResource autoload)
+        JavaCodeLibraryOrBundle
+        JavaCodeBundle
+        JavaClassPathBundle
+        JavaCodeLibrary
+        #'JavaNativeMethodImpl_OpenJDK6'
+        #'JavaNativeMethodImpl_SunJDK6'
+        #'JavaNativeMethodImpl_OpenJDK7'
+        #'JavaNativeMethodImpl_SunJDK7'
     )
 
-    "Modified: / 24-11-2011 / 13:01:12 / cg"
+    "Modified: / 15-02-2013 / 18:54:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames
@@ -362,84 +430,185 @@
      Entries are 2-element array literals, consisting of class-name and selector."
 
     ^ #(
-	BooleanArray isInterface
-	Object isJavaArray
-	Object isJavaNameAndType
-	Object isJavaPackage
-	Object isJavaRef
-	String asArrayOfSubstringsSeparatedBy:
-	UserPreferences javaTestsDirectory
-	UserPreferences javaTestsDirectory:
-	ZipArchive nextBytes:of:startingAt:into:startingAt:
-	'Boolean class' isJavaPrimitiveType
-	'Boolean class' javaArrayClass
-	'Boolean class' javaName
-	'BooleanArray class' isInterface
-	'BooleanArray class' isJavaArrayClass
-	'BooleanArray class' isJavaReferenceType
-	'BooleanArray class' javaComponentClass
-	'BooleanArray class' javaName
-	'ByteArray class' isInterface
-	'ByteArray class' isJavaArrayClass
-	'ByteArray class' isJavaReferenceType
-	'ByteArray class' javaArrayClass
-	'ByteArray class' javaComponentClass
-	'ByteArray class' javaName
-	'Character class' isJavaPrimitiveType
-	'Character class' javaArrayClass
-	'Character class' javaName
-	'CharacterArray class' decodeFromJavaUTF8:
-	'CharacterArray class' fromJavaUTF8Bytes:
-	'CharacterArray class' isJavaArrayClass
-	'CharacterArray class' javaArrayClass
-	'CharacterArray class' javaComponentClass
-	'DoubleArray class' isInterface
-	'DoubleArray class' isJavaArrayClass
-	'DoubleArray class' isJavaReferenceType
-	'DoubleArray class' javaComponentClass
-	'DoubleArray class' javaName
-	'Float class' isJavaPrimitiveType
-	'Float class' javaArrayClass
-	'Float class' javaName
-	'FloatArray class' isInterface
-	'FloatArray class' isJavaArrayClass
-	'FloatArray class' isJavaReferenceType
-	'FloatArray class' javaComponentClass
-	'FloatArray class' javaName
-	'GenericToolbarIconLibrary class' javaClassBrowserIcon
-	'Integer class' isJavaPrimitiveType
-	'Integer class' javaArrayClass
-	'Integer class' javaName
-	'LargeInteger class' isJavaPrimitiveType
-	'LargeInteger class' javaArrayClass
-	'LargeInteger class' javaName
-	'Object class' isJavaArrayClass
-	'Object class' isJavaClassType
-	'Object class' isJavaPrimitiveType
-	'Object class' isJavaReferenceType
-	'Object class' isJavaType
-	'ShortFloat class' isJavaPrimitiveType
-	'ShortFloat class' javaArrayClass
-	'ShortFloat class' javaName
-	'SignedIntegerArray class' isInterface
-	'SignedIntegerArray class' isJavaArrayClass
-	'SignedIntegerArray class' javaArrayClass
-	'SignedIntegerArray class' javaComponentClass
-	'SignedIntegerArray class' javaName
-	'SignedLongIntegerArray class' isInterface
-	'SignedLongIntegerArray class' isJavaArrayClass
-	'SignedLongIntegerArray class' isJavaReferenceType
-	'SignedLongIntegerArray class' javaComponentClass
-	'SignedLongIntegerArray class' javaName
-	'UndefinedObject class' isJavaPrimitiveType
-	'UndefinedObject class' javaName
-	'WordArray class' isInterface
-	'WordArray class' isJavaArrayClass
-	'WordArray class' isJavaReferenceType
-	'WordArray class' javaArrayClass
-	'WordArray class' javaComponentClass
-	'WordArray class' javaName
+        Behavior isInterface
+        BooleanArray isInterface
+        CharacterArray asDottedJavaClassName
+        CharacterArray asJavaComponentClassName
+        CharacterArray asNiceJavaClassName
+        CharacterArray asSTXInternalJavaClassName
+        CharacterArray asSlashedJavaClassName
+        CharacterArray isJavaArrayDescriptor
+        CharacterArray isJavaPrimitiveTypeDescriptor
+        Delay waitWithState:
+        Object isGroovyClass
+        Object isJavaArray
+        Object isJavaNameAndType
+        Object isJavaPackage
+        Object isJavaRef
+        Object isJavaWrapperClass
+        Object javaBox:
+        Object javaUnwrap:
+        Object javaUnwrapFrom:
+        Object javaWrap:
+        Process clearInterrupted
+        Process isInterrupted
+        Process isSleeping
+        Process isWaiting
+        Process javaInterrupt
+        Process setInterrupted
+        Set #'java__contains:'
+        SmallInteger javaUnwrapFrom:
+        String asArrayOfSubstringsSeparatedBy:
+        WrappedMethod descriptor
+        WrappedMethod isAbstract
+        ZipArchive nextBytes:of:startingAt:into:startingAt:
+        'Boolean class' isJavaPrimitiveType
+        'Boolean class' javaArrayClass
+        'Boolean class' javaBox:
+        'Boolean class' javaName
+        'Boolean class' javaUnbox:onError:
+        'Boolean class' javaUnwrap:
+        'Boolean class' javaWrapperClass
+        'BooleanArray class' isInterface
+        'BooleanArray class' isJavaArrayClass
+        'BooleanArray class' isJavaReferenceType
+        'BooleanArray class' javaArrayClass
+        'BooleanArray class' javaComponentClass
+        'BooleanArray class' javaName
+        'ByteArray class' isInterface
+        'ByteArray class' isJavaArrayClass
+        'ByteArray class' isJavaReferenceType
+        'ByteArray class' javaArrayClass
+        'ByteArray class' javaComponentClass
+        'ByteArray class' javaName
+        'Character class' isJavaPrimitiveType
+        'Character class' javaArrayClass
+        'Character class' javaBox:
+        'Character class' javaName
+        'Character class' javaUnbox:onError:
+        'Character class' javaWrapperClass
+        'CharacterArray class' decodeFromJavaUTF8:
+        'CharacterArray class' fromJavaUTF8Bytes:
+        'CharacterArray class' isJavaArrayClass
+        'CharacterArray class' javaArrayClass
+        'CharacterArray class' javaComponentClass
+        'ConfigurableFeatures class' hasJavaSupport
+        'DoubleArray class' isInterface
+        'DoubleArray class' isJavaArrayClass
+        'DoubleArray class' isJavaReferenceType
+        'DoubleArray class' javaArrayClass
+        'DoubleArray class' javaComponentClass
+        'DoubleArray class' javaName
+        'Float class' isJavaPrimitiveType
+        'Float class' javaArrayClass
+        'Float class' javaBox:
+        'Float class' javaName
+        'Float class' javaWrapperClass
+        'FloatArray class' isInterface
+        'FloatArray class' isJavaArrayClass
+        'FloatArray class' isJavaReferenceType
+        'FloatArray class' javaArrayClass
+        'FloatArray class' javaComponentClass
+        'FloatArray class' javaName
+        'Integer class' isJavaPrimitiveType
+        'Integer class' javaArrayClass
+        'Integer class' javaBox:
+        'Integer class' javaName
+        'Integer class' javaUnbox:onError:
+        'Integer class' javaUnbox:onError:min:max:
+        'Integer class' javaWrapperClass
+        'LargeInteger class' isJavaPrimitiveType
+        'LargeInteger class' javaArrayClass
+        'LargeInteger class' javaBox:
+        'LargeInteger class' javaName
+        'LargeInteger class' javaUnbox:onError:
+        'LargeInteger class' javaWrapperClass
+        'Object class' isJavaArrayClass
+        'Object class' isJavaClassType
+        Behavior isJavaPrimitiveType
+        'Object class' isJavaReferenceType
+        'Object class' isJavaType
+        'ProjectDefinition class' javaClassPath
+        'ProjectDefinition class' javaSourcePath
+        'ShortFloat class' isJavaPrimitiveType
+        'ShortFloat class' javaArrayClass
+        'ShortFloat class' javaBox:
+        'ShortFloat class' javaName
+        'ShortFloat class' javaWrapperClass
+        'SignedIntegerArray class' isInterface
+        'SignedIntegerArray class' isJavaArrayClass
+        'SignedIntegerArray class' javaArrayClass
+        'SignedIntegerArray class' javaComponentClass
+        'SignedIntegerArray class' javaName
+        'SignedLongIntegerArray class' isInterface
+        'SignedLongIntegerArray class' isJavaArrayClass
+        'SignedLongIntegerArray class' isJavaReferenceType
+        'SignedLongIntegerArray class' javaArrayClass
+        'SignedLongIntegerArray class' javaComponentClass
+        'SignedLongIntegerArray class' javaName
+        'SignedWordArray class' isJavaArrayClass
+        'SignedWordArray class' isJavaReferenceType
+        'SignedWordArray class' javaComponentClass
+        'SignedWordArray class' javaName
+        'UndefinedObject class' isJavaPrimitiveType
+        'UndefinedObject class' javaName
+        'WordArray class' isInterface
+        'WordArray class' isJavaArrayClass
+        'WordArray class' isJavaReferenceType
+        'WordArray class' javaArrayClass
+        'WordArray class' javaComponentClass
+        'WordArray class' javaName
+        'Boolean class' javaWrap:
+        ProgrammingLanguage isGroovy
+        ProgrammingLanguage isJavaLike
+        UserPreferences javaRelease
+        UserPreferences javaReleaseSelector
+        UserPreferences javaReleaseSelector:
+        Class javaMirror
+        Class javaMirrorClass
+        ExecutableFunction isJavaConstructor
+        Process isParked
+        Semaphore parkWithTimeoutMs:
+        Object isSocket
+        Socket isSocket
+        Socket reOpenIfPossible
+        Method isStatic
+        Class classLoader
+        Method isAbstract
+        Method javaClass
+        Class lookupMethodByNameAndType:
+        Object getJavaLockWord
+        Object getJavaMonitor
+        Object javaWrapRequired
+        'Boolean class' javaWrapRequired
+        CharacterArray withoutSuffix:
+        ExecutableFunction isProxyMethod
+        'ProjectDefinition class' javaBundle
+        'String class' javaName
+        'Unicode16String class' javaName
+        Context arg1Index
     )
+
+    "Modified: / 07-02-2013 / 16:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!stx_libjava class methodsFor:'description - java'!
+
+javaBundle
+
+    ^JavaCodeBundle standardPackageBundleFor: self package
+
+    "Created: / 15-01-2013 / 17:35:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+javaClassPath
+    <resource: #obsolete>
+
+    "Defines paths to Java .class files (for packages that
+     contains Java code"    
+    ^#()
+
+    "Created: / 15-01-2013 / 18:04:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !stx_libjava class methodsFor:'description - project information'!
@@ -454,25 +623,29 @@
 companyName
     "Return a companyname which will appear in <lib>.rc"
 
-    ^ 'eXept Software AG'
+    ^ 'eXept Software AG & SWING Research Group'
+
+    "Modified: / 15-11-2012 / 23:51:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 description
-    "Return a description string which will appear in vc.def / bc.def"
+    "Description string which will appear in vc.def / bc.def"
 
-    ^ 'Smalltalk/X Class library'
+    ^ 'Java support for Smalltalk/X'
+
+    "Modified: / 15-11-2012 / 23:51:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 legalCopyright
-    "Return a copyright string which will appear in <lib>.rc"
+    "Copyright string which will appear in <lib>.rc"
 
-    ^ 'Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b          SWING Research Group, Czech Technical University In Prague'
+    ^ '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'
 
-    "Modified: / 26-07-2011 / 17:13:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 15-11-2012 / 23:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 productName
-    "Return a product name which will appear in <lib>.rc"
+    "Return product name which will appear in <lib>.rc"
 
     ^ 'Smalltalk/X'
 ! !
@@ -482,21 +655,22 @@
 svnRepositoryUrlString
     "Return a SVN repository URL of myself.
      (Generated since 2011-04-08)
-    "
+     Do not make the string shorter!!!!!! We have to use fixed-length keyword!!!!!!
+    "        
 
-    ^ '$URL: https://swing.fit.cvut.cz/svn/stx/libjava/branches/jk_new_structure/src/stx_libjava.st $'
+    ^ '$URL::                                                                                                                        $'
 !
 
 svnRevisionNr
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"'1260'"$"
+    ^ "$SVN-Revision:"'2242            '"$"
 ! !
 
 !stx_libjava class methodsFor:'file generation'!
 
-basicFileNamesToGenerate
+basicFileNamesToGenerat
     "answer a dictionary (filename -> generator method) with all the files, that have to be generated for this
      package"
 
@@ -504,8 +678,8 @@
 
     dict := super basicFileNamesToGenerate.
 
-    dict
-	at:'builder/package.deps.rake' put: #'generate_package_dot_deps_dot_rake'.
+    dict 
+        at:'builder/package.deps.rake' put: #'generate_package_dot_deps_dot_rake'.
 
     ^ dict.
 
@@ -514,14 +688,16 @@
 
 !stx_libjava class methodsFor:'documentation'!
 
-version
-    ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.5 2012-03-16 08:52:02 cg Exp $'
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.6 2013-02-16 18:08:32 vrany Exp $'
 !
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.5 2012-03-16 08:52:02 cg Exp $'
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '§Id: stx_libjava.st,v 1.1 2011/08/18 19:06:53 vrany Exp §'
+    ^ '§Id§'
 ! !
+