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.
Removed breakpoints when removing Java classes. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 17 Apr 2013 21:39:03 +0200
branchdevelopment
changeset 2520 33a10f31ae47
parent 2519 cf9c44024c16
child 2521 c8bbef09a411
Removed breakpoints when removing Java classes.
Java.st file | annotate | diff | comparison | revisions
JavaLanguage.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libjava.rc file | annotate | diff | comparison | revisions
stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/Java.st	Wed Apr 17 19:49:55 2013 +0200
+++ b/Java.st	Wed Apr 17 21:39:03 2013 +0200
@@ -1187,17 +1187,17 @@
 
     |javaName sym cls p ns|
 
-    self breakPoint: #jv.
-    self breakPoint: #mh.
+"/    self breakPoint: #jv.
+"/    self breakPoint: #mh.
 
     javaName := aJavaClass fullName.
 
     sym := javaName asSymbolIfInterned.
     sym notNil ifTrue:[
-	cls := JavaVM classForName: sym definedBy: aJavaClass classLoader.
+        cls := JavaVM classForName: sym definedBy: aJavaClass classLoader.
     ].
     (cls notNil and:[cls == aJavaClass]) ifTrue:[
-	self updateClassRefsFrom:aJavaClass to:nil.
+        self updateClassRefsFrom:aJavaClass to:nil.
     ].
     Smalltalk removeKey:('JAVA::' , javaName) asSymbol.
     Smalltalk removeKey:javaName asSymbol.
@@ -1208,16 +1208,16 @@
 
     p := aJavaClass nameSpacePath.
     p knownAsSymbol ifTrue:[
-	ns := Smalltalk at:p asSymbol.
-	(ns notNil and:[ns isNameSpace]) ifTrue:[
-	    Smalltalk removeKey:(p , '::' , aJavaClass lastName) asSymbol
-	]
+        ns := Smalltalk at:p asSymbol.
+        (ns notNil and:[ns isNameSpace]) ifTrue:[
+            Smalltalk removeKey:(p , '::' , aJavaClass lastName) asSymbol
+        ]
     ].
 
     JavaVM registry unregisterClass: aJavaClass.
 
     "Modified: / 19-10-1998 / 20:58:49 / cg"
-    "Modified: / 04-04-2012 / 02:42:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-04-2013 / 21:29:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 unresolvedClassRefFor:aClassName
--- a/JavaLanguage.st	Wed Apr 17 19:49:55 2013 +0200
+++ b/JavaLanguage.st	Wed Apr 17 21:39:03 2013 +0200
@@ -194,6 +194,9 @@
     | sclass |
 
     self assert: isNamespace not.
+    JavaVM booted ifFalse:[
+        JavaVM boot.
+    ].
     superClass isJavaClass ifFalse:[
         sclass := Java classForName:'java.lang.Object'
     ] ifTrue:[
@@ -214,7 +217,7 @@
             yourself)
 
     "Created: / 18-02-2012 / 18:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 15-04-2013 / 22:26:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 17-04-2013 / 21:01:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaLanguage class methodsFor:'documentation'!
--- a/Make.proto	Wed Apr 17 19:49:55 2013 +0200
+++ b/Make.proto	Wed Apr 17 21:39:03 2013 +0200
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libwidg2
 
 
 # if you need any additional defines for embedded C code,
@@ -145,6 +145,7 @@
 	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/Make.spec	Wed Apr 17 19:49:55 2013 +0200
+++ b/Make.spec	Wed Apr 17 21:39:03 2013 +0200
@@ -94,6 +94,7 @@
 	JavaPopUpView \
 	JavaProcess \
 	JavaRef2 \
+	JavaRelease \
 	JavaResolver \
 	JavaShort \
 	JavaSlotIndexCache \
@@ -105,7 +106,6 @@
 	JavaUnresolvedConstant \
 	JavaUtilities \
 	JavaVMData \
-	JavaRelease \
 	JavaView \
 	JavaZipSupport \
 	PPJavaNode \
@@ -222,6 +222,7 @@
     $(OUTDIR_SLASH)JavaPopUpView.$(O) \
     $(OUTDIR_SLASH)JavaProcess.$(O) \
     $(OUTDIR_SLASH)JavaRef2.$(O) \
+    $(OUTDIR_SLASH)JavaRelease.$(O) \
     $(OUTDIR_SLASH)JavaResolver.$(O) \
     $(OUTDIR_SLASH)JavaShort.$(O) \
     $(OUTDIR_SLASH)JavaSlotIndexCache.$(O) \
@@ -233,7 +234,6 @@
     $(OUTDIR_SLASH)JavaUnresolvedConstant.$(O) \
     $(OUTDIR_SLASH)JavaUtilities.$(O) \
     $(OUTDIR_SLASH)JavaVMData.$(O) \
-    $(OUTDIR_SLASH)JavaRelease.$(O) \
     $(OUTDIR_SLASH)JavaView.$(O) \
     $(OUTDIR_SLASH)JavaZipSupport.$(O) \
     $(OUTDIR_SLASH)PPJavaNode.$(O) \
--- a/abbrev.stc	Wed Apr 17 19:49:55 2013 +0200
+++ b/abbrev.stc	Wed Apr 17 21:39:03 2013 +0200
@@ -37,6 +37,7 @@
 JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaFinalizationRegistry JavaFinalizationRegistry stx:libjava 'Languages-Java-Support' 0
 JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
+JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
 JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests-Libraries' 1
 JavaLanguage JavaLanguage stx:libjava 'Languages-Java-Support' 1
@@ -114,7 +115,6 @@
 JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
 JavaFieldDescriptorWithUnionType JavaFieldDescriptorWithUnionType stx:libjava 'Languages-Java-Support' 0
-JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
 JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
 JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
 JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
--- a/bc.mak	Wed Apr 17 19:49:55 2013 +0200
+++ b/bc.mak	Wed Apr 17 21:39:03 2013 +0200
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libwidg2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -55,6 +55,7 @@
 	pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/libjava.rc	Wed Apr 17 19:49:55 2013 +0200
+++ b/libjava.rc	Wed Apr 17 21:39:03 2013 +0200
@@ -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", "Mon, 15 Apr 2013 21:53:21 GMT\0"
+      VALUE "ProductDate", "Wed, 17 Apr 2013 19:37:13 GMT\0"
     END
 
   END
--- a/stx_libjava.st	Wed Apr 17 19:49:55 2013 +0200
+++ b/stx_libjava.st	Wed Apr 17 21:39:03 2013 +0200
@@ -162,15 +162,14 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPCompositeParserTest - superclass of JavaParserIITests "
-        #'stx:goodies/sunit'    "TestAsserter - superclass of JavaClassReloadingTests "
-        #'stx:libbasic'    "Exception - superclass of JavaError "
-        #'stx:libbasic2'    "SignedLongIntegerArray - extended "
+        #'stx:goodies/petitparser'    "PPParser - superclass of JavaParser "
+        #'stx:libbasic'    "ArithmeticValue - superclass of JavaByte "
+        #'stx:libbasic2'    "BooleanArray - extended "
         #'stx:libbasic3'    "WrappedMethod - extended "
-        #'stx:libcomp'    "ParseNode - superclass of JavaTypeDeclarationNode "
-        #'stx:libtool'    "Tools::CodeViewService - superclass of JavaCompilerProblemService "
-        #'stx:libview'    "GraphicsMedium - superclass of JavaListInspectorView "
-        #'stx:libview2'    "Model - superclass of JavaSettingsApplication "
+        #'stx:libcomp'    "ParseNode - superclass of JavaImportDeclarationNode "
+        #'stx:libtool'    "AbstractSettingsApplication - superclass of JavaSettingsApplication "
+        #'stx:libview'    "GraphicsContext - superclass of JavaTopView "
+        #'stx:libview2'    "Model - superclass of JavaCodeLibraryEditor "
         #'stx:libwidg2'    "HierarchicalItem - superclass of JavaCodeBundleEditor::Item "
     )
 !
@@ -208,10 +207,11 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
+        #'stx:goodies/sunit'    "TestSuite - referenced by JavaTestsLoader class>>buildSuiteFrom: "
         #'stx:libhtml'    "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
-        #'stx:libjava/experiments'    "JavaByteCodeInterpreter - referenced by JavaMethod>>interpretWithReceiver:arguments: "
-        #'stx:libjava/tools'    "JavaSyntaxHighlighter::Builder - referenced by JavaSyntaxHighlighter>>format:kind:in: "
-        #'stx:libwidg'    "SelectionInList - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WListPeer_create: "
+        #'stx:libjava/experiments'    "JavaCompiler - referenced by JavaLanguage>>compilerClass "
+        #'stx:libjava/tools'    "JavaCodeLibraryEditor - referenced by JavaCodeBundleEditor>>doBrowseFiles "
+        #'stx:libwidg'    "Label - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WLabelPeer_create: "
     )
 !
 
@@ -372,6 +372,7 @@
         (JavaFieldRefTests autoload)
         JavaFinalizationRegistry
         (JavaFreshlyInitializedResource autoload)
+        (JavaInitializedResource autoload)
         (JavaInterfaceMethodRefTests autoload)
         (JavaJUnitTests autoload)
         JavaLanguage
@@ -401,6 +402,7 @@
         JavaRef2
         (JavaRefMock autoload)
         (JavaRefsAndConstantPoolTestCase autoload)
+        JavaRelease
         JavaResolver
         (JavaRuntimeConstantPoolTests autoload)
         JavaShort
@@ -416,7 +418,6 @@
         JavaUnresolvedConstant
         JavaUtilities
         JavaVMData
-        JavaRelease
         JavaView
         JavaZipSupport
         PPJavaNode
@@ -449,7 +450,6 @@
         JavaFieldAnnotationContainer
         JavaFieldDescriptor
         JavaFieldDescriptorWithUnionType
-        (JavaInitializedResource autoload)
         JavaInvalidRefError
         JavaMethod
         JavaMethodAnnotationContainer
hg/stx-libjava