--- a/abbrev.stc	Fri Nov 22 21:14:07 2002 +0100
+++ b/abbrev.stc	Fri Nov 22 21:14:42 2002 +0100
@@ -1,127 +1,45 @@
-AbstractJavaTestCase AbstractJavaTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-Byte Byte stx:libjava 'Magnitude-Numbers' 0
-JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 6
-Java Java stx:libjava 'Languages-Java-Support' 0
-JavaAnnotation JavaAnnotation stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationContainer JavaAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaAnnotationDefault JavaAnnotationDefault stx:libjava 'Languages-Java-Annotations' 1
-JavaAnnotationDictionary JavaAnnotationDictionary stx:libjava 'Languages-Java-Annotations' 1
-JavaAnnotationValue JavaAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAntProjectResource JavaAntProjectResource stx:libjava 'Languages-Java-Tests' 2
-JavaArray JavaArray stx:libjava 'Languages-Java-Classes' 1
-JavaBehavior JavaBehavior stx:libjava 'Languages-Java-Classes' 0
-JavaByteCodeDisassemblerTests JavaByteCodeDisassemblerTests stx:libjava 'Languages-Java-Tests' 4
-JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava 'Languages-Java-Tests' 4
-JavaByteCodeProcessor JavaByteCodeProcessor stx:libjava 'Languages-Java-Bytecode' 0
-JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 4
-JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
-JavaClassReader2Tests JavaClassReader2Tests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests' 4
-JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support' 0
-JavaContext JavaContext stx:libjava 'Languages-Java-Support' 0
-JavaDecompiler JavaDecompiler stx:libjava 'Languages-Java-Support-Decompiling' 0
-JavaDescriptor JavaDescriptor stx:libjava 'Languages-Java-Support' 0
-JavaError JavaError stx:libjava 'Languages-Java-Support' 1
-JavaEvaluator JavaEvaluator stx:libjava 'Languages-Java-Support' 0
-JavaExceptionTableEntry JavaExceptionTableEntry stx:libjava 'Languages-Java-Support' 0
-JavaExceptionThrowerMock JavaExceptionThrowerMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
-JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaInflater JavaInflater stx:libjava 'Languages-Java-Support' 0
-JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
-JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests' 4
-JavaJavadocNode JavaJavadocNode stx:libjava 'Languages-Java-AST' 0
-JavaLanguage JavaLanguage stx:libjava 'Languages-Java-Support' 1
-JavaLibraries JavaLibraries stx:libjava 'Languages-Java-Support' 0
-JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
-JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
-JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
-JavaLookup JavaLookup stx:libjava 'Languages-Java-Lookup' 0
-JavaLookupTestsResource JavaLookupTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 3
-JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
-JavaNode JavaNode stx:libjava 'Languages-Java-AST' 0
-JavaObject JavaObject stx:libjava 'Languages-Java-Classes' 0
-JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
-JavaPackage JavaPackage stx:libjava 'Languages-Java-Classes' 0
-JavaParseResult JavaParseResult stx:libjava 'Languages-Java-Parser' 0
-JavaParserNavigationTests JavaParserNavigationTests stx:libjava 'Languages-Java-Tests' 4
-JavaParserTestCase JavaParserTestCase stx:libjava 'Languages-Java-Tests' 4
-JavaParserTests JavaParserTests stx:libjava 'Languages-Java-Tests' 4
-JavaPopUpView JavaPopUpView stx:libjava 'Languages-Java-Views-Support' 2
-JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes' 0
-JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
-JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
-JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
-JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
-JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
-JavaStartup JavaStartup stx:libjava 'Languages-Java-Support' 1
-JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 6
-JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
-JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
-JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 4
-JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
-JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
-JavaView JavaView stx:libjava 'Languages-Java-Views-Support' 2
-LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 4
-PPJavaNode PPJavaNode stx:libjava 'Languages-Java-AST' 0
-Short Short stx:libjava 'Magnitude-Numbers' 0
-SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
-SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
-TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 6
-stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
-JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationEnumValue JavaAnnotationEnumValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationNestedAnnotationValue JavaAnnotationNestedAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaAnnotationPrimitiveValue JavaAnnotationPrimitiveValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaByteCodeDisassembler JavaByteCodeDisassembler stx:libjava 'Languages-Java-Bytecode' 0
-JavaByteCodeEnumerator JavaByteCodeEnumerator stx:libjava 'Languages-Java-Support-Decompiling' 0
-JavaByteCodeInterpreter JavaByteCodeInterpreter stx:libjava 'Languages-Java-Bytecode' 0
-JavaClass JavaClass stx:libjava 'Languages-Java-Classes' 0
-JavaClassAnnotationContainer JavaClassAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaClassContentRef2 JavaClassContentRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaClassRef2 JavaClassRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaEmbeddedFrameView JavaEmbeddedFrameView stx:libjava 'Languages-Java-Views-Support' 2
-JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
-JavaFormalParameterNode JavaFormalParameterNode stx:libjava 'Languages-Java-AST' 0
-JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
-JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
-JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodDeclaratorNode JavaMethodDeclaratorNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodDescriptor JavaMethodDescriptor stx:libjava 'Languages-Java-Support' 0
-JavaMethodNode JavaMethodNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
-JavaParser JavaParser stx:libjava 'Languages-Java-Parser' 0
-JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaTypeNode JavaTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
-JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support' 0
-JavaUnresolvedStringConstant JavaUnresolvedStringConstant stx:libjava 'Languages-Java-Reader-Support' 0
-JavadocDeclarationNode JavadocDeclarationNode stx:libjava 'Languages-Java-AST' 0
-JavaArrayTypeNode JavaArrayTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaBooleanTypeNode JavaBooleanTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaBothOldAndNewClassRef JavaBothOldAndNewClassRef stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava 'Languages-Java-Bytecode' 0
-JavaCharTypeNode JavaCharTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaClassOrInterfaceTypeNode JavaClassOrInterfaceTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaDoubleTypeNode JavaDoubleTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaFieldRef2 JavaFieldRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaFloatTypeNode JavaFloatTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaIntTypeNode JavaIntTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaLongTypeNode JavaLongTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodRef2 JavaMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes' 0
-JavaVoidTypeNode JavaVoidTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
+Java Java stx:libjava 'Languages-Java-Support'
+JavaAppletComponentSpec JavaAppletComponentSpec stx:libjava 'Languages-Java-Views-Support'
+JavaBuiltInClassPointerRef JavaBuiltInClassPointerRef stx:libjava 'Languages-Java-Reader-Support'
+JavaByteCodeEnumerator JavaByteCodeEnumerator stx:libjava 'Languages-Java-Support-Decompiling'
+JavaClass JavaClass stx:libjava 'Languages-Java-Classes'
+JavaClassPointerRef JavaClassPointerRef stx:libjava 'Languages-Java-Reader-Support'
+JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support'
+JavaClassRef JavaClassRef stx:libjava 'Languages-Java-Reader-Support'
+JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support'
+JavaContext JavaContext stx:libjava 'Languages-Java-Support'
+JavaDecompiler JavaDecompiler stx:libjava 'Languages-Java-Support-Decompiling'
+JavaEmbeddedFrameView JavaEmbeddedFrameView stx:libjava 'Languages-Java-Views-Support'
+JavaExceptionTableEntry JavaExceptionTableEntry stx:libjava 'Languages-Java-Support'
+JavaField JavaField stx:libjava 'Languages-Java-Reader-Support'
+JavaFieldref JavaFieldref stx:libjava 'Languages-Java-Reader-Support'
+JavaInterfaceMethodref JavaInterfaceMethodref stx:libjava 'Languages-Java-Reader-Support'
+JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support'
+JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support'
+JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes'
+JavaMethodWithBreakpoint JavaMethodWithBreakpoint stx:libjava 'Languages-Java-Classes'
+JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes'
+JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes'
+JavaMethodref JavaMethodref stx:libjava 'Languages-Java-Reader-Support'
+JavaNameandType JavaNameandType stx:libjava 'Languages-Java-Reader-Support'
+JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes'
+JavaObject JavaObject stx:libjava 'Languages-Java-Classes'
+JavaPopUpView JavaPopUpView stx:libjava 'Languages-Java-Views-Support'
+JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes'
+JavaRef JavaRef stx:libjava 'Languages-Java-Reader-Support'
+JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support'
+JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support'
+JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedFieldrefConstant JavaUnresolvedFieldrefConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedInterfaceMethodrefConstant JavaUnresolvedInterfaceMethodrefConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedMethodrefConstant JavaUnresolvedMethodrefConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedNameandTypeConstant JavaUnresolvedNameandTypeConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedRefConstant JavaUnresolvedRefConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedSTArrayConstant JavaUnresolvedSTArrayConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaUnresolvedStringConstant JavaUnresolvedStringConstant stx:libjava 'Languages-Java-Reader-Support'
+JavaVM JavaVM stx:libjava 'Languages-Java-Support'
+JavaView JavaView stx:libjava 'Languages-Java-Views-Support'
+SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support'
+SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support'
+UIGalleryJavaEntry UIGalleryJavaEntry stx:libjava 'Java-Views-Support'