Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes in resolving + preresolver jk_new_structure
authorvranyj1
Wed, 29 Feb 2012 11:31:36 +0000
branchjk_new_structure
changeset 1393 dc859d4870f1
parent 1392 b8cd2c9cf1ef
child 1394 dc7d95a99161
Fixes in resolving + preresolver
src/JavaClass.st file | annotate | diff | comparison | revisions
src/JavaResolver.st file | annotate | diff | comparison | revisions
src/LookupIntegrationTests.st file | annotate | diff | comparison | revisions
src/LookupIntegrationTestsResource.st file | annotate | diff | comparison | revisions
src/Make.proto file | annotate | diff | comparison | revisions
src/Make.spec file | annotate | diff | comparison | revisions
src/bc.mak file | annotate | diff | comparison | revisions
src/libjava.rc file | annotate | diff | comparison | revisions 
--- a/src/JavaClass.st	Wed Feb 29 09:12:56 2012 +0000
+++ b/src/JavaClass.st	Wed Feb 29 11:31:36 2012 +0000
@@ -124,7 +124,7 @@
     "/ This allows java.foo.bar to be visible in ST/X
     "/ under the name JAVA::java::foo::bar
 
-    accessor := JavaClassAccessor fullName: aString.    
+    accessor := cls"JavaClassAccessor fullName: aString".    
     ns := JAVA.
 
     nameComponents size > 1 ifTrue:[
@@ -151,7 +151,7 @@
 
     "Created: / 15-04-1996 / 15:52:55 / cg"
     "Modified: / 03-01-1998 / 22:32:25 / cg"
-    "Modified: / 28-02-2012 / 19:43:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-02-2012 / 11:24:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 name:aString
--- a/src/JavaResolver.st	Wed Feb 29 09:12:56 2012 +0000
+++ b/src/JavaResolver.st	Wed Feb 29 11:31:36 2012 +0000
@@ -213,22 +213,32 @@
 !
 
 loadUnresolvedClass: aJavaClassRef 
-    | nm |
+    | nm cls i |
 
     nm := aJavaClassRef name.
-    nm size == 1 
-        and: [ JavaDescriptor baseTypes at: nm first ifPresent: [:cls | ^ cls ] ].
-     "Note, that loadClass itself deals with class loaders.
+    nm size == 1 ifTrue:[ 
+        JavaDescriptor baseTypes at: nm first ifPresent: [:cls | ^ cls ] 
+    ].
+    "Note, that JavaVM>>classForName: itself deals with class loaders.
      The caller of me should set one using code like:
      
-     JavaClassReader classLoaderQuerySignal answer: loader do:[call me]
-     
+     JavaClassReader classLoaderQuerySignal answer: loader do:[call me]     
     "
-    ^ JavaVM classForName: nm.       
+    cls := JavaVM classForName: nm.
+    (nm startsWith:$[) ifTrue:[
+        i := 1.
+        [ (nm at:i) == $[ ] whileTrue:[
+            cls := cls javaArrayClass.
+            i := i + 1.                                        
+        ].
+        self assert: (nm at:i) == $L.
+    ].
+
+    ^cls.
 
     "Created: / 11-04-2011 / 19:27:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 23-05-2011 / 21:06:25 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 08-09-2011 / 08:33:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-02-2012 / 09:20:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 lookupClassIfAlreadyResolved: javaClassName 
--- a/src/LookupIntegrationTests.st	Wed Feb 29 09:12:56 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,344 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- 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
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- [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' }"
-
-TestCase subclass:#LookupIntegrationTests
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	category:'Languages-Java-Experiments-Tests'
-!
-
-!LookupIntegrationTests class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- 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
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- [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
-
-"
-! !
-
-!LookupIntegrationTests class methodsFor:'resources'!
-
-resources
-    ^ Array with: LookupIntegrationTestsResource.
-
-    "Created: / 11-04-2011 / 19:38:11 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 29-08-2011 / 23:35:06 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTests methodsFor:'running - java lookup'!
-
-test3
-    "I am not sure with this test :)"
-    self shouldnt: [(Java classForName: 'cz.cvut.fit.swing.methodLookup.Object') new isNumber] raise: Exception.
-    self assert: (Java classForName: 'cz.cvut.fit.swing.methodLookup.Object') new isNumber = false.
-
-    "Created: / 11-04-2011 / 19:43:37 / kursjan <kursjan@fit.cvut.cz>"
-!
-
-testBasic
-    self 
-        shouldnt:[ (Java classForName:'java.lang.Object') new hash ]
-        raise:Exception.
-    self 
-        shouldnt:[ (Java classForName:'java.lang.Object') new toString ]
-        raise:Exception.
-
-    "Created: / 11-04-2011 / 19:22:07 / kursjan <kursjan@fit.cvut.cz>"
-!
-
-testBoolean
-    self assert: (self javaTestClass new getTrue) = true.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 21:06:13 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testBoolean2
-    self assert: (self javaTestClass new getFalse) = false.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 21:06:25 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testBoolean3
-    self assert: (self javaTestClass new getTruePrim) = true.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 21:07:29 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testBoolean4
-    self assert: (self javaTestClass new getFalsePrim) = false.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 21:07:38 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testBoolean5
-    self assert: (self javaTestClass new getFalseWithConversion) = false.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 19:23:36 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testBoolean6
-    self assert: (self javaTestClass new getFalseFromBooleanValueOf) = false.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 19:40:22 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testClass
-    self assert: ((Java classForName: 'java.lang.Object') isKindOf: JavaClass).
-    self assert: ((Java classForName: 'java.lang.Object') new isKindOf: JavaObject)
-
-
-    "Created: / 11-04-2011 / 19:22:07 / kursjan <kursjan@fit.cvut.cz>"
-!
-
-testDoesNotUnderstand
-    self 
-        should:[ (Java classForName:'java.lang.Object') new bafickyBaf ]
-        raise:MessageNotUnderstood.
-
-    "Created: / 11-04-2011 / 19:22:07 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 30-08-2011 / 22:06:16 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testMultipleParameters
-    "test multiple parameters"
-    
-    self 
-        assert: (self javaTestClass new foo) = 0
-
-    "Created: / 11-04-2011 / 19:48:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 05-09-2011 / 20:18:03 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testMultipleParameters1
-    "test multiple parameters"
-    
-    self 
-        assert: (self javaTestClass new foo: 1) = 1
-
-    "Created: / 11-04-2011 / 19:48:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 20:18:14 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testMultipleParameters2
-    "test multiple parameters"
-    
-    self 
-        assert: (self javaTestClass new foo: 1 and: 2) = 2
-
-    "Created: / 11-04-2011 / 19:48:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 20:18:30 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testSayHello
-    self assert: (self javaTestClass new sayHello = 'hello').
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 05-09-2011 / 21:05:40 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testSayHelloStatic
-    self assert: self javaTestClass staticSayHello = 'static hello'.
-
-    "Created: / 11-04-2011 / 19:32:51 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 20:26:44 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testTypeOverloading
-    "test type overloading"
-    
-    self 
-        assert:(self javaTestClass new overloadedMethod: 1) = 4
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 05-09-2011 / 21:37:53 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testTypeOverloading2
-    "test type overloading"
-    
-    self 
-        assert:(self javaTestClass new overloadedMethod: 'Hi') = 3.
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 05-09-2011 / 21:37:57 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTests methodsFor:'running - smalltalk lookup'!
-
-testPersonManipulator_getAge
-    "test interaction of Smalltallk objects with Java code"
-    | person |
-    person := PersonSample new.
-
-    person name: 'Anne'.
-    person age: 18.
-
-    self 
-        assert:(self personManipulatorClass new getPersonAge: person) = 18.
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 17:27:45 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testPersonManipulator_getName
-    "test interaction of Smalltallk objects with Java code"
-    | person |
-    person := PersonSample new.
-
-    person name: 'Anne'.
-    person age: 18.
-
-    self 
-        assert:(self personManipulatorClass new getPersonName: person) = 'Anne'.
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 17:27:34 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testSetManipulator_add
-    "test interaction of smalltalk Set and java.util.Set"
-    | aSet anObject |
-    self breakPoint: #jk info: 'using SetSample, because it contains DNU hook - this is workaround'.
-    aSet := SetSample new.
-    anObject := Object new.
-
-    self setManipulatorClass new addElement: aSet and: anObject.
-    self assert: aSet size = 1.
-    self assert:(self setManipulatorClass new getSize: aSet) = 1.
-    self assert:(aSet contains: [:e | e = anObject ]).
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 17:28:11 / Jan Kurs <kursjan@fit.cvut.cz>"
-    "Modified: / 09-10-2011 / 22:39:48 / kursjan <kursjan@fit.cvut.cz>"
-!
-
-testSetManipulator_contains
-    "test interaction of smalltalk Set and java.util.Set"
-    | aSet anObject |
-    self breakPoint: #jk info: 'using SetSample, because it contains DNU hook - this is workaround'.
-    aSet := SetSample new.
-    anObject := Object new.
-
-    self assert: (self setManipulatorClass new contains: aSet and: anObject) = false.
-    aSet add: anObject.
-    self assert: (self setManipulatorClass new contains: aSet and: anObject) = true.
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 18:04:00 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testSetManipulator_getSize
-    "test interaction of smalltalk Set and java.util.Set"
-    | aSet |
-    self breakPoint: #jk info: 'using SetSample, because it contains DNU hook - this is workaround'.
-    aSet := SetSample new.
-
-    self  assert:(self setManipulatorClass new getSize: aSet) = 0.
-    aSet add: Object new.
-    self  assert:(self setManipulatorClass new getSize: aSet) = 1.
-
-    "Created: / 11-04-2011 / 20:02:54 / kursjan <kursjan@fit.cvut.cz>"
-    "Created: / 25-09-2011 / 17:27:58 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-testSetManipulator_isEmpty
-    "test interaction of smalltalk Set and java.util.Set"
-    | aSet |
-    self breakPoint: #jk info: 'using SetSample, because it contains DNU hook - this is workaround'.
-    aSet := SetSample new.
-
-    self  assert: (self setManipulatorClass new isEmpty:aSet).
-    aSet add: Object new.
-    self  assert: (self setManipulatorClass new isEmpty:aSet) not.
-
-    "Created: / 09-10-2011 / 21:55:38 / kursjan <kursjan@fit.cvut.cz>"
-!
-
-testSetManipulator_remove
-    "test interaction of smalltalk Set and java.util.Set"
-    | aSet anObject |
-    self breakPoint: #jk info: 'using SetSample, because it contains DNU hook - this is workaround'.
-    aSet := SetSample new.
-    anObject := Object new.
-
-
-    aSet add: anObject.
-    self setManipulatorClass new remove: aSet and: anObject.
-    self assert: aSet size = 0.
-    self assert:(self setManipulatorClass new getSize: aSet) = 0.
-    self assert:(aSet contains: [:e | e = anObject ]) not.
-
-    "Created: / 25-09-2011 / 17:28:11 / Jan Kurs <kursjan@fit.cvut.cz>"
-    "Created: / 09-10-2011 / 22:37:37 / kursjan <kursjan@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTests methodsFor:'support'!
-
-javaTestClass
-    ^ Java classForName: 'cz.cvut.fit.swing.methodLookup.Object'
-
-    "Created: / 05-09-2011 / 20:13:48 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-personManipulatorClass
-    "Person Manipulator can interact with Person class defined in Java"
-    ^ Java classForName: 'cz.cvut.fit.swing.methodLookup.PersonManipulator'
-
-    "Created: / 06-09-2011 / 21:48:16 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-setManipulatorClass
-    "Person Manipulator can interact with Person class defined in Java"
-    ^ Java classForName: 'cz.cvut.fit.swing.methodLookup.SetManipulator'
-
-    "Created: / 25-09-2011 / 16:41:02 / Jan Kurs <kursjan@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTests class methodsFor:'documentation'!
-
-version_SVN
-    ^ '$Id$'
-! !
--- a/src/LookupIntegrationTestsResource.st	Wed Feb 29 09:12:56 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- 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
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- [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' }"
-
-TestResource subclass:#LookupIntegrationTestsResource
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	category:'Languages-Java-Experiments-Tests'
-!
-
-LookupIntegrationTestsResource class instanceVariableNames:'projectDir projectBuilded'
-
-"
- The following class instance variables are inherited by this class:
-
-	TestResource - current
-	TestAsserter - 
-	Object - 
-"
-!
-
-!LookupIntegrationTestsResource class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- 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
- inclusion of the above copyright notice.   This software may not
- be provided or otherwise made available to, or used by, any
- other person.  No title to or ownership of the software is
- hereby transferred.
-
- [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
-
-"
-! !
-
-!LookupIntegrationTestsResource class methodsFor:'initialization'!
-
-initialize
-    "Invoked at system start or when the class is dynamically loaded."
-
-    "/ please change as required (and remove this comment)
-
-    projectDir := 
-        (Smalltalk packageDirectoryForPackageId: 'stx:libjava') asFilename
-            / 'java' / 'libjava-projects/MethodLookupTests' .
-
-    projectBuilded := false.
-
-    "Modified: / 16-03-2011 / 14:33:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-04-2011 / 19:30:29 / kursjan <kursjan@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTestsResource class methodsFor:'accessing'!
-
-projectBuilded:aBoolean
-
-    "
-        JavaTestsResource projectBuilded: true.
-        JavaTestsResource projectBuilded: false.
-    "
-
-    projectBuilded := aBoolean.
-
-    "Modified: / 16-03-2011 / 15:20:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-projectDir
-    ^ projectDir
-!
-
-resources
-
-    ^ { JavaInitializedResource }
-
-    "Created: / 01-01-2012 / 17:24:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTestsResource class methodsFor:'running'!
-
-buildProject
-
-    "
-        JavaTestsResource projectBuilded: true.
-        JavaTestsResource projectBuilded: false.
-    "
-
-
-    projectBuilded == true ifFalse:[ 
-        "Check for ant"
-        self assert: (OperatingSystem canExecuteCommand:'ant')
-             description: 'Cannot execute ant'.
-
-        self assert: (self projectDir / 'build.xml') exists
-             description: 'No build.xml in ' , self projectDir asString.
-
-
-        "Launch ant"
-        Transcript show:'Running ant in '; showCR: self projectDir asString.
-        OperatingSystem
-                executeCommand:'ant -f build.xml' 
-                inputFrom:nil 
-                outputTo:Stdout 
-                errorTo:Stderr 
-                inDirectory: self projectDir
-                onError:
-                    [:status | 
-                    Transcript showCR:'ANT FAILED!!!!!!'.
-                    self error:'ant failed'.
-                    ^self].
-
-        Transcript show:'Ant finished'].
-    ^ projectBuilded
-
-    "Modified: / 16-03-2011 / 15:20:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTestsResource methodsFor:'running'!
-
-setUp
-    self class buildProject.
-
-"/    Java flushAllJavaResources.
-"/    Java initialize.                                             "Initialize classPath and other stuff"
-"/    JavaVM initializeVM. 
-
-    Java addToClassPath: (self class projectDir / 'bin') asString.
-    JavaLookup cleanup.
-"/    JavaObject lookupObject: JavaLookup instance.
-
-    "Created: / 06-03-2011 / 14:50:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 16-03-2011 / 14:38:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-04-2011 / 20:15:15 / kursjan <kursjan@fit.cvut.cz>"
-    "Modified: / 05-09-2011 / 20:15:27 / Jan Kurs <kursjan@fit.cvut.cz>"
-!
-
-tearDown
-"/    JavaObject lookupObject: nil
-
-    "Modified: / 16-03-2011 / 14:38:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Created: / 11-04-2011 / 20:15:28 / kursjan <kursjan@fit.cvut.cz>"
-! !
-
-!LookupIntegrationTestsResource class methodsFor:'documentation'!
-
-version_SVN
-    ^ '$Id$'
-! !
-
-LookupIntegrationTestsResource initialize!
--- a/src/Make.proto	Wed Feb 29 09:12:56 2012 +0000
+++ b/src/Make.proto	Wed Feb 29 11:31:36 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-02-28 22:24:00.338.
+# automagically generated from the projectDefinition: stx_libjava at 2012-02-29 11:24:39.510.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -232,7 +232,7 @@
 $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)/stx/libjava/JavaDescriptor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPetitParser.$(O) JavaPetitParser.$(H): JavaPetitParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaPetitParser.$(O) JavaPetitParser.$(H): JavaPetitParser.st $(INCLUDE_TOP)/squeak/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/squeak/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/src/Make.spec	Wed Feb 29 09:12:56 2012 +0000
+++ b/src/Make.spec	Wed Feb 29 11:31:36 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-02-28 22:23:59.315.
+# automagically generated from the projectDefinition: stx_libjava at 2012-02-29 11:24:37.965.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/bc.mak	Wed Feb 29 09:12:56 2012 +0000
+++ b/src/bc.mak	Wed Feb 29 11:31:36 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-02-28 22:24:00.826.
+# automagically generated from the projectDefinition: stx_libjava at 2012-02-29 11:24:40.400.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -180,7 +180,7 @@
 $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodDescriptor.$(O) JavaMethodDescriptor.$(H): JavaMethodDescriptor.st $(INCLUDE_TOP)\stx\libjava\JavaDescriptor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaMethodNode.$(O) JavaMethodNode.$(H): JavaMethodNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPetitParser.$(O) JavaPetitParser.$(H): JavaPetitParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
+$(OUTDIR)JavaPetitParser.$(O) JavaPetitParser.$(H): JavaPetitParser.st $(INCLUDE_TOP)\squeak\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\squeak\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(STCHDR)
 $(OUTDIR)JavaStringRef2.$(O) JavaStringRef2.$(H): JavaStringRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaTypeNode.$(O) JavaTypeNode.$(H): JavaTypeNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/src/libjava.rc	Wed Feb 29 09:12:56 2012 +0000
+++ b/src/libjava.rc	Wed Feb 29 11:31:36 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1738,1738
+  FILEVERSION     6,2,1745,1745
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.1738.1738\0"
+      VALUE "FileVersion", "6.2.1745.1745\0"
       VALUE "InternalName", "stx:libjava\0"
       VALUE "LegalCopyright", "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\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Tue, 28 Feb 2012 22:26:17 GMT\0"
+      VALUE "ProductDate", "Wed, 29 Feb 2012 11:24:47 GMT\0"
     END
 
   END
hg/stx-libjava