--- a/src/abbrev.stc	Tue May 10 22:04:56 2011 +0000
+++ b/src/abbrev.stc	Thu May 12 14:28:39 2011 +0000
@@ -1,3 +1,4 @@
+AbstractJavaTestCase AbstractJavaTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 Byte Byte stx:libjava 'Magnitude-Numbers' 0
 JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-JUnit' 5
 Java Java stx:libjava 'Languages-Java-Support' 0
@@ -13,11 +14,9 @@
 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
 JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support' 0
 JavaConstantPoolContent JavaConstantPoolContent stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaConstantPoolsTests JavaConstantPoolsTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 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
@@ -28,6 +27,8 @@
 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
@@ -47,13 +48,12 @@
 JavaRef JavaRef stx:libjava 'Languages-Java-Reader-Support' 0
 JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
 JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaResolverTests JavaResolverTests 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
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 3
 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
@@ -64,7 +64,7 @@
 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-JUnit' 5
+TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-JUnit' 0
 stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 4
 JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
@@ -77,23 +77,29 @@
 JavaClass JavaClass stx:libjava 'Languages-Java-Classes' 0
 JavaClassAnnotationContainer JavaClassAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaClassReader2 JavaClassReader2 stx:libjava 'Languages-Java-Support' 0
+JavaClassReader2Tests JavaClassReader2Tests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaClassRef JavaClassRef stx:libjava 'Languages-Java-Reader-Support' 0
+JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaEmbeddedFrameView JavaEmbeddedFrameView stx:libjava 'Languages-Java-Views-Support' 2
 JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
 JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
+JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaFieldref JavaFieldref stx:libjava 'Languages-Java-Reader-Support' 0
 JavaFormalParameterNode JavaFormalParameterNode stx:libjava 'Languages-Java-AST' 0
+JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 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
+JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
 JavaMethodref JavaMethodref stx:libjava 'Languages-Java-Reader-Support' 0
 JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaParser JavaParser stx:libjava 'Languages-Java-Parser' 0
 JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaTypeNode JavaTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
@@ -111,18 +117,13 @@
 JavaClassOrInterfaceTypeNode JavaClassOrInterfaceTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaClassPointerRef JavaClassPointerRef stx:libjava 'Languages-Java-Reader-Support' 0
 JavaClassRef2 JavaClassRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaDoubleTypeNode JavaDoubleTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaFloatTypeNode JavaFloatTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaIntTypeNode JavaIntTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaInterfaceMethodref JavaInterfaceMethodref stx:libjava 'Languages-Java-Reader-Support' 0
 JavaLongTypeNode JavaLongTypeNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes' 0
 JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefTests JavaRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 4
 JavaUnresolvedFieldrefConstant JavaUnresolvedFieldrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaUnresolvedMethodrefConstant JavaUnresolvedMethodrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaVoidTypeNode JavaVoidTypeNode stx:libjava 'Languages-Java-AST' 0
@@ -132,4 +133,3 @@
 JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
 JavaUnresolvedInterfaceMethodrefConstant JavaUnresolvedInterfaceMethodrefConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-