This commit was manufactured by cvs2svn to create tag 'v20050808a'.

Sprout from master 2005-08-08 17:59:40 UTC Kevin Barnes <krbarnes> 'Bug 106361 - NPE when adding a new JRE'
Cherrypick from master 2005-08-08 18:53:17 UTC Darin Wright <darin> '*** empty log message ***':
    org.eclipse.jdt.debug/buildnotes_jdt-debug.html
Delete:
    org.eclipse.jdt.debug.jdi.tests/.classpath
    org.eclipse.jdt.debug.jdi.tests/.cvsignore
    org.eclipse.jdt.debug.jdi.tests/.project
    org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.jdt.debug.jdi.tests/about.html
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AutomatedSuite.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Test shared config.launch
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java
    org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java
    org.eclipse.jdt.debug.tests/.classpath
    org.eclipse.jdt.debug.tests/.cvsignore
    org.eclipse.jdt.debug.tests/.plugins-path
    org.eclipse.jdt.debug.tests/.project
    org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.jdt.debug.tests/.settings/org.eclipse.pde.prefs
    org.eclipse.jdt.debug.tests/about.html
    org.eclipse.jdt.debug.tests/build.properties
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java
    org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java
    org.eclipse.jdt.debug.tests/plugin.properties
    org.eclipse.jdt.debug.tests/plugin.xml
    org.eclipse.jdt.debug.tests/scripts/buildTestSourceAttachmentJar.xml
    org.eclipse.jdt.debug.tests/scripts/generateTests.xml
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DynamicRenderingBindings.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ExpressionWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlock.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockDynamic.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockOne.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockThree.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockTwo.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NullVariableInitializer.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/RenderingTypeDelegate.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestClasspathContainerInitializer.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestJavaApplicationTabGroup.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestLaunchDelegate.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestModeLaunchDelegate.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java
    org.eclipse.jdt.debug.tests/test.xml
    org.eclipse.jdt.debug.tests/testjars/A.jar
    org.eclipse.jdt.debug.tests/testprograms/ArgumentCounter.java
    org.eclipse.jdt.debug.tests/testprograms/ArgumentPrinter.java
    org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
    org.eclipse.jdt.debug.tests/testprograms/ArrayTests.java
    org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
    org.eclipse.jdt.debug.tests/testprograms/BreakpointsLocation.java
    org.eclipse.jdt.debug.tests/testprograms/CompileError.java
    org.eclipse.jdt.debug.tests/testprograms/ConditionalStepReturn.java
    org.eclipse.jdt.debug.tests/testprograms/Console80Chars.java
    org.eclipse.jdt.debug.tests/testprograms/ConsoleInput.java
    org.eclipse.jdt.debug.tests/testprograms/ConsoleStackTrace.java
    org.eclipse.jdt.debug.tests/testprograms/ConsoleVariableLineLength.java
    org.eclipse.jdt.debug.tests/testprograms/DefPkgReturnType.java
    org.eclipse.jdt.debug.tests/testprograms/DropTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
    org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
    org.eclipse.jdt.debug.tests/testprograms/FloodConsole.java
    org.eclipse.jdt.debug.tests/testprograms/FooPropertyPrinter.java
    org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
    org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
    org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
    org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
    org.eclipse.jdt.debug.tests/testprograms/InstanceFilterObject.java
    org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/LabelTest.java
    org.eclipse.jdt.debug.tests/testprograms/LargeSourceFile.java
    org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/LotsOfFields.java
    org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
    org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
    org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
    org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
    org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
    org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
    org.eclipse.jdt.debug.tests/testprograms/OneToTen.java
    org.eclipse.jdt.debug.tests/testprograms/OneToTenPrint.java
    org.eclipse.jdt.debug.tests/testprograms/PerfLoop.java
    org.eclipse.jdt.debug.tests/testprograms/PrintConcatenation.java
    org.eclipse.jdt.debug.tests/testprograms/StackTraces.java
    org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
    org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
    org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
    org.eclipse.jdt.debug.tests/testprograms/TestIO.java
    org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
    org.eclipse.jdt.debug.tests/testprograms/VariableChanges.java
    org.eclipse.jdt.debug.tests/testprograms/VariableDetails.java
    org.eclipse.jdt.debug.tests/testprograms/WatchItemTests.java
    org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/non-java.txt
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallStack.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassOne.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassTwo.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HcrClass.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/SourceLookup.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Source_$_Lookup.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
    org.eclipse.jdt.debug.tests/testresources/TestSource.jar
    org.eclipse.jdt.debug.tests/testresources/source-test.zip
    org.eclipse.jdt.debug.tests/testresources/testJarWithOutRoot.jar
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugPerformanceTest.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArchiveSourceLookupTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArrayTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointLocationVerificationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DebugEventTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DefaultSourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceLookupTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EnvironmentTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExternalArchiveSourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/FolderSourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaBreakpointListenerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaLibraryPathTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaProjectSourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchDelegateTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchModeTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchesTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MemoryRenderingTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PreLaunchBreakpointTest.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProjectSourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RefreshTabTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RemoteAttachTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RunToLineTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLookupTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepIntoSelectionTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StratumTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkingDirectoryTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkspaceSourceContainerTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignmentTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_120.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_145.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_155.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_179.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_214.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_252.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_279.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_315.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_354.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_381.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_417.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_455.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_481.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_517.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_529.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_566.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_592.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_616.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_626.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_65.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_664.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_69.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_690.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_714.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_724.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_739.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_94.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfDebugBaselineTest.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/OpenLaunchConfigurationDialogTests.java
    org.eclipse.jdt.launching.macosx/.classpath
    org.eclipse.jdt.launching.macosx/.cvsignore
    org.eclipse.jdt.launching.macosx/.project
    org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
    org.eclipse.jdt.launching.macosx/about.html
    org.eclipse.jdt.launching.macosx/build.properties
    org.eclipse.jdt.launching.macosx/icons/full/ctool16/exportappbundle_wiz.gif
    org.eclipse.jdt.launching.macosx/icons/full/wizban/exportapp_wiz.gif
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleMessages.properties
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/Util.java
    org.eclipse.jdt.launching.macosx/plugin.properties
    org.eclipse.jdt.launching.macosx/plugin.xml
    org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
    org.eclipse.jdt.launching/.classpath
    org.eclipse.jdt.launching/.cvsignore
    org.eclipse.jdt.launching/.externalToolBuilders/Build Launching Support JAR.launch
    org.eclipse.jdt.launching/.project
    org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs
    org.eclipse.jdt.launching/.settings/org.eclipse.pde.prefs
    org.eclipse.jdt.launching/META-INF/MANIFEST.MF
    org.eclipse.jdt.launching/about.html
    org.eclipse.jdt.launching/build.properties
    org.eclipse.jdt.launching/component.xml
    org.eclipse.jdt.launching/doc/.cvsignore
    org.eclipse.jdt.launching/java.policy.applet
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaClasspathVariablesInitializer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchConfigurationUtils.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.properties
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ListenerList.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVM.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMRunner.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMType.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVM.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry2.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntryResolver.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathProvider.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeContainerComparator.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMConnector.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall2.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallChangedListener.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallType.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMRunner.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMStandin.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/package.html
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/IJavaSourceLocation.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/LocalFileStorage.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ZipEntryStorage.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/package.html
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/package.html
    org.eclipse.jdt.launching/lib/.cvsignore
    org.eclipse.jdt.launching/plugin.properties
    org.eclipse.jdt.launching/plugin.xml
    org.eclipse.jdt.launching/r3_0_changes.html
    org.eclipse.jdt.launching/schema/classpathProviders.exsd
    org.eclipse.jdt.launching/schema/runtimeClasspathEntries.exsd
    org.eclipse.jdt.launching/schema/runtimeClasspathEntryResolvers.exsd
    org.eclipse.jdt.launching/schema/vmConnectors.exsd
    org.eclipse.jdt.launching/schema/vmInstallTypes.exsd
    org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml
    org.eclipse.jdt.launching/scripts/exportplugin.xml
    org.eclipse.jdt.launching/support/org/eclipse/jdt/internal/launching/support/LibraryDetector.java
diff --git a/org.eclipse.jdt.debug.jdi.tests/.classpath b/org.eclipse.jdt.debug.jdi.tests/.classpath
deleted file mode 100644
index 3467cbe..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.debug.jdi.tests/.cvsignore b/org.eclipse.jdt.debug.jdi.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.debug.jdi.tests/.project b/org.eclipse.jdt.debug.jdi.tests/.project
deleted file mode 100644
index ad19e84..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.project
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.debug.jdi.tests</name>
-	<comment></comment>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9d1188a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Aug 02 09:29:15 GMT-08:00 2004

-org.eclipse.jdt.core.compiler.problem.unusedImport=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-eclipse.preferences.version=1

diff --git a/org.eclipse.jdt.debug.jdi.tests/about.html b/org.eclipse.jdt.debug.jdi.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
deleted file mode 100644
index 7e70a08..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractJDITest.java
+++ /dev/null
@@ -1,1433 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import org.eclipse.jdi.Bootstrap;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ArrayType;
-import com.sun.jdi.ClassLoaderReference;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.LocalVariable;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.Value;
-import com.sun.jdi.VirtualMachineManager;
-import com.sun.jdi.connect.AttachingConnector;
-import com.sun.jdi.connect.Connector;
-import com.sun.jdi.connect.IllegalConnectorArgumentsException;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.ExceptionRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for com.sun.jdi.* and JDWP commands.
- * These tests assume that the target program is 
- * "org.eclipse.debug.jdi.tests.program.MainClass".
- *
- * Examples of arguments:
- *   -launcher SunVMLauncher -address c:\jdk1.2.2\ -cp d:\target
- *   -launcher J9VMLauncher -address d:\ive\ -cp d:\target
- */
-public abstract class AbstractJDITest extends TestCase {
-	static int TIMEOUT = 10000; //ms
-	static protected int fBackEndPort = 9900;
-	// We want subsequent connections to use different ports.
-	protected static String fVMLauncherName;
-	protected static String fTargetAddress;
-	protected static String fClassPath;
-	protected static String fBootPath;
-	protected static String fVMType;
-	protected com.sun.jdi.VirtualMachine fVM;
-	protected Process fLaunchedProxy;
-	protected Process fLaunchedVM;
-	protected static int fVMTraceFlags = com.sun.jdi.VirtualMachine.TRACE_NONE;
-	protected EventReader fEventReader;
-	protected AbstractReader fConsoleReader;
-	protected AbstractReader fConsoleErrorReader;
-	protected AbstractReader fProxyReader;
-	protected AbstractReader fProxyErrorReader;
-	protected boolean fInControl = true;
-	// Whether this test should control the VM (ie. starting it and shutting it down)
-	protected static boolean fVerbose;
-	protected static String fStdoutFile;
-	protected static String fStderrFile;
-	protected static String fProxyoutFile;
-	protected static String fProxyerrFile;
-	protected static String fVmCmd;
-	protected static String fProxyCmd;
-
-	// Stack offset to the MainClass.run() method
-	protected static final int RUN_FRAME_OFFSET = 1;
-
-	/**
-	 * Constructs a test case with a default name.
-	 */
-	public AbstractJDITest() {
-		super("JDI Test");
-	}
-	/**
-	 * Returns the names of the tests that are known to not work
-	 * By default, none are excluded.
-	 */
-	protected String[] excludedTests() {
-		return new String[] {
-		};
-	}
-	/**
-	 * Creates and returns an access watchpoint request
-	 * for the field "fBool" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 * NOTE: This assumes that the VM can watch field access.
-	 */
-	protected AccessWatchpointRequest getAccessWatchpointRequest() {
-		// Get the field
-		Field field = getField("fBool");
-
-		// Create an access watchpoint for this field
-		return fVM.eventRequestManager().createAccessWatchpointRequest(field);
-	}
-	/**
-	 * Returns all tests that start with the given string.
-	 * Returns a vector of String.
-	 */
-	protected Vector getAllMatchingTests(String match) {
-		Class theClass = this.getClass();
-		java.lang.reflect.Method[] methods = theClass.getDeclaredMethods();
-		Vector result = new Vector();
-		for (int i = 0; i < methods.length; i++) {
-			java.lang.reflect.Method m = methods[i];
-			String name = m.getName();
-			Class[] parameters = m.getParameterTypes();
-			if (parameters.length == 0 && name.startsWith(match)) {
-				if (!isExcludedTest(name)) {
-					result.add(name);
-				} else
-					System.out.println(name + " is excluded.");
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns an array reference.
-	 */
-	protected ArrayReference getObjectArrayReference() {
-		// Get static field "fArray"
-		Field field = getField("fArray");
-
-		// Get value of "fArray"
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	
-	/**
-	 * Returns another array reference.
-	 */
-	protected ArrayReference getNonEmptyDoubleArrayReference() {
-		// Get static field "fDoubleArray"
-		Field field = getField("fDoubleArray");
-
-		// Get value of "fDoubleArray"
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	
-	/**
-	 * One-dimensional empty array reference getters
-	 */
-	protected ArrayReference getByteArrayReference() {
-		Field field = getField("byteArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getShortArrayReference() {
-		Field field = getField("shortArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getIntArrayReference() {
-		Field field = getField("intArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getLongArrayReference() {
-		Field field = getField("longArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getDoubleArrayReference() {
-		Field field = getField("doubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getFloatArrayReference() {
-		Field field = getField("floatArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getCharArrayReference() {
-		Field field = getField("charArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getBooleanArrayReference() {
-		Field field = getField("booleanArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	/**
-	 * Two-dimensional array reference getters
-	 */
-	protected ArrayReference getByteDoubleArrayReference() {
-		Field field = getField("byteDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getShortDoubleArrayReference() {
-		Field field = getField("shortDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getIntDoubleArrayReference() {
-		Field field = getField("intDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getLongDoubleArrayReference() {
-		Field field = getField("longDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getFloatDoubleArrayReference() {
-		Field field = getField("floatDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getDoubleDoubleArrayReference() {
-		Field field = getField("doubleDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getCharDoubleArrayReference() {
-		Field field = getField("charDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	protected ArrayReference getBooleanDoubleArrayReference() {
-		Field field = getField("booleanDoubleArray");
-		return (ArrayReference) getMainClass().getValue(field);
-	}
-	
-	/**
-	 * Returns the array type.
-	 */
-	protected ArrayType getArrayType() {
-		// Get array reference
-		ArrayReference value = getObjectArrayReference();
-
-		// Get reference type of "fArray"
-		return (ArrayType) value.referenceType();
-	}
-	/**
-	 * One-dimensional primitive array getters
-	 */
-	protected ArrayType getByteArrayType() {
-		ArrayReference value = getByteArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getShortArrayType() {
-		ArrayReference value = getShortArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getIntArrayType() {
-		ArrayReference value = getIntArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getLongArrayType() {
-		ArrayReference value = getLongArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getFloatArrayType() {
-		ArrayReference value = getFloatArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getDoubleArrayType() {
-		ArrayReference value = getDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getCharArrayType() {
-		ArrayReference value = getCharArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getBooleanArrayType() {
-		ArrayReference value = getBooleanArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	/**
-	 * Two-dimensional primitive array getters
-	 */
-	protected ArrayType getByteDoubleArrayType() {
-		ArrayReference value = getByteDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getShortDoubleArrayType() {
-		ArrayReference value = getShortDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getIntDoubleArrayType() {
-		ArrayReference value = getIntDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getLongDoubleArrayType() {
-		ArrayReference value = getLongDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getFloatDoubleArrayType() {
-		ArrayReference value = getFloatDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getDoubleDoubleArrayType() {
-		ArrayReference value = getDoubleDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getCharDoubleArrayType() {
-		ArrayReference value = getCharDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	protected ArrayType getBooleanDoubleArrayType() {
-		ArrayReference value = getBooleanDoubleArrayReference();
-		return (ArrayType) value.referenceType();
-	}
-	
-	/**
-	 * Creates and returns a breakpoint request in the first 
-	 * instruction of the MainClass.triggerBreakpointEvent() method.
-	 */
-	protected BreakpointRequest getBreakpointRequest() {
-		// Create a breakpoint request
-		return fVM.eventRequestManager().createBreakpointRequest(getLocation());
-	}
-	/**
-	 * Returns the class with the given name or null if not loaded.
-	 */
-	protected ClassType getClass(String name) {
-		List classes = fVM.classesByName(name);
-		if (classes.size() == 0)
-			return null;
-		
-		return (ClassType) classes.get(0);
-	}
-	/**
-	 * Returns the class loader of
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected ClassLoaderReference getClassLoaderReference() {
-		// Get main class
-		ClassType type = getMainClass();
-
-		// Get its class loader
-		return type.classLoader();
-	}
-	/**
-	 * Creates and returns an exception request for uncaught exceptions.
-	 */
-	protected ExceptionRequest getExceptionRequest() {
-		return fVM.eventRequestManager().createExceptionRequest(null, false, true);
-	}
-	/**
-	 * Returns the static field "fObject" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected Field getField() {
-		return getField("fObject");
-	}
-	/**
-	 * Returns the field with the given name in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass.
-	 */
-	protected Field getField(String fieldName) {
-		// Get main class
-		ClassType type = getMainClass();
-
-		// Get field 
-		Field result = type.fieldByName(fieldName);
-		if (result == null)
-			throw new Error("Unknown field: " + fieldName);
-		
-		return result;
-	}
-	/**
-	 * Returns the n frame (starting at the top of the stack) of the thread 
-	 * contained in the static field "fThread" of org.eclipse.debug.jdi.tests.program.MainClass.
-	 */
-	protected StackFrame getFrame(int n) {
-		// Make sure the thread is suspended
-		ThreadReference thread = getThread();
-		assertTrue(thread.isSuspended());
-
-		// Get the frame
-		StackFrame frame = null;
-		try {
-			List frames = thread.frames();
-			frame = (StackFrame) frames.get(n);
-		} catch (IncompatibleThreadStateException e) {
-			throw new Error("Thread was not suspended");
-		}
-
-		return frame;
-	}
-	/**
-	 * Returns the interface type org.eclipse.debug.jdi.tests.program.Printable.
-	 */
-	protected InterfaceType getInterfaceType() {
-		List types = fVM.classesByName("org.eclipse.debug.jdi.tests.program.Printable");
-		return (InterfaceType) types.get(0);
-	}
-	/**
-	 * Returns the variable "t" in the frame running MainClass.run().
-	 */
-	protected LocalVariable getLocalVariable() {
-		try {
-			return getFrame(RUN_FRAME_OFFSET).visibleVariableByName("t");
-		} catch (AbsentInformationException e) {
-			return null;
-		}
-	}
-	/**
-	 * Returns the firt location in MainClass.print(OutputStream).
-	 */
-	protected Location getLocation() {
-		return getMethod().location();
-	}
-	/**
-	 * Returns the class org.eclipse.debug.jdi.tests.program.MainClass.
-	 */
-	protected ClassType getMainClass() {
-		return getClass("org.eclipse.debug.jdi.tests.program.MainClass");
-	}
-	/**
-	 * Returns the method "print(Ljava/io/OutputStream;)V" 
-	 * in org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected Method getMethod() {
-		return getMethod("print", "(Ljava/io/OutputStream;)V");
-	}
-	/**
-	 * Returns the method with the given name and signature
-	 * in org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected Method getMethod(String name, String signature) {
-		return getMethod(
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			name,
-			signature);
-	}
-	/**
-	 * Returns the method with the given name and signature
-	 * in the given class.
-	 */
-	protected Method getMethod(String className, String name, String signature) {
-		// Get main class
-		ClassType type = getClass(className);
-
-		// Get method print(OutputStream)
-		Method method = null;
-		List methods = type.methods();
-		ListIterator iterator = methods.listIterator();
-		while (iterator.hasNext()) {
-			Method m = (Method) iterator.next();
-			if ((m.name().equals(name)) && (m.signature().equals(signature))) {
-				method = m;
-				break;
-			}
-		}
-		if (method == null)
-			throw new Error("Unknown method: " + name + signature);
-		
-		return method;
-	}
-	/**
-	 * Creates and returns a modification watchpoint request
-	 * for the field "fBool" in
-	 * org.eclipse.debug.jdi.tests.program.MainClass.
-	 * NOTE: This assumes that the VM can watch field modification.
-	 */
-	protected ModificationWatchpointRequest getModificationWatchpointRequest() {
-		// Get the field
-		Field field = getField("fBool");
-
-		// Create a modification watchpoint for this field
-		return fVM.eventRequestManager().createModificationWatchpointRequest(field);
-	}
-	/**
-	 * Returns the value of the static field "fObject" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected ObjectReference getObjectReference() {
-		// Get main class
-		ClassType type = getMainClass();
-
-		// Get field "fObject"
-		Field field = getField();
-
-		// Get value of "fObject"
-		return (ObjectReference) type.getValue(field);
-	}
-	/**
-	 * Creates and returns an access watchpoint request
-	 * for the static field "fString" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 * NOTE: This assumes that the VM can watch field access.
-	 */
-	protected AccessWatchpointRequest getStaticAccessWatchpointRequest() {
-		// Get the static field
-		Field field = getField("fString");
-
-		// Create an access watchpoint for this field
-		return fVM.eventRequestManager().createAccessWatchpointRequest(field);
-	}
-	/**
-	 * Creates and returns a modification watchpoint request
-	 * for the static field "fString" in
-	 * org.eclipse.debug.jdi.tests.program.MainClass.
-	 * NOTE: This assumes that the VM can watch field modification.
-	 */
-	protected ModificationWatchpointRequest getStaticModificationWatchpointRequest() {
-		// Get the field
-		Field field = getField("fString");
-
-		// Create a modification watchpoint for this field
-		return fVM.eventRequestManager().createModificationWatchpointRequest(field);
-	}
-	/**
-	 * Returns the value of the static field "fString" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected StringReference getStringReference() {
-		// Get field "fString"
-		Field field = getField("fString");
-
-		// Get value of "fString"
-		return (StringReference) getMainClass().getValue(field);
-	}
-	/**
-	 * Returns the class java.lang.Object.
-	 */
-	protected ClassType getSystemType() {
-		List classes = fVM.classesByName("java.lang.Object");
-		if (classes.size() == 0)
-			return null;
-		
-		return (ClassType) classes.get(0);
-	}
-	/**
-	 * Returns the thread contained in the static field "fThread" in 
-	 * org.eclipse.debug.jdi.tests.program.MainClass
-	 */
-	protected ThreadReference getThread() {
-		return getThread("fThread");
-	}
-
-	protected ThreadReference getMainThread() {
-		return getThread("fMainThread");
-	}
-
-	private ThreadReference getThread(String fieldName) {
-		ClassType type = getMainClass();
-		if (type == null)
-			return null;
-
-		// Get static field "fThread"
-		List fields = type.fields();
-		ListIterator iterator = fields.listIterator();
-		Field field = null;
-		while (iterator.hasNext()) {
-			field = (Field) iterator.next();
-			if (field.name().equals(fieldName))
-				break;
-		}
-
-		// Get value of "fThread"
-		Value value = type.getValue(field);
-		if (value == null)
-			return null;
-		
-		return (ThreadReference) value;
-	}
-	/**
-	 * Returns the VM info for this test.
-	 */
-	VMInformation getVMInfo() {
-		return new VMInformation(
-			fVM,
-			fVMType,
-			fLaunchedVM,
-			fEventReader,
-			fConsoleReader);
-	}
-	/**
-	 * Returns whether the given test is excluded for the VM we are testing.
-	 */
-	private boolean isExcludedTest(String testName) {
-		String[] excludedTests = excludedTests();
-		if (excludedTests == null)
-			return false;
-		for (int i = 0; i < excludedTests.length; i++)
-			if (testName.equals(excludedTests[i]))
-				return true;
-		return false;
-	}
-
-	/**
-	 * Launches the target VM and connects to VM.
-	 */
-	protected void launchTargetAndConnectToVM() {
-		launchTarget();
-		connectToVM();
-	}
-
-	protected boolean vmIsRunning() {
-		boolean isRunning = false;
-		try {
-			if (fLaunchedVM != null)
-				fLaunchedVM.exitValue();
-		} catch (IllegalThreadStateException e) {
-			isRunning = true;
-		}
-		return isRunning;
-	}
-
-	protected void launchTarget() {
-		if (fVmCmd != null)
-			launchCommandLineTarget();
-		else if (fVMLauncherName.equals("SunVMLauncher"))
-			launchSunTarget();
-		else if (fVMLauncherName.equals("IBMVMLauncher"))
-			launchIBMTarget();
-		else
-			launchJ9Target();
-	}
-
-	/**
-	 * Launches the target VM specified on the command line.
-	 */
-	private void launchCommandLineTarget() {
-		try {
-			if (fProxyCmd != null) {
-				fLaunchedProxy = Runtime.getRuntime().exec(fProxyCmd);
-			}
-			fLaunchedVM = Runtime.getRuntime().exec(fVmCmd);
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Launches the target J9 VM.
-	 */
-	private void launchJ9Target() {
-		try {
-			// Launch proxy
-			String proxyString[] = new String[3];
-			int index = 0;
-			String binDirectory =
-				fTargetAddress
-					+ System.getProperty("file.separator")
-					+ "bin"
-					+ System.getProperty("file.separator");
-			proxyString[index++] = binDirectory + "j9proxy";
-			proxyString[index++] = "localhost:" + (fBackEndPort - 1);
-			proxyString[index++] = "" + fBackEndPort;
-			fLaunchedProxy = Runtime.getRuntime().exec(proxyString);
-
-			// Launch target VM
-			String[] vmString;
-			if (fBootPath.length() > 0)
-				vmString = new String[5];
-			else
-				vmString = new String[4];
-
-			index = 0;
-			vmString[index++] = binDirectory + "j9w";
-			File vm= new File(vmString[index - 1] + ".exe");
-			if (!vm.exists()) {
-				vmString[index - 1] = binDirectory + "j9";
-			}
-			if (fBootPath.length() > 0)
-				vmString[index++] = "-bp:" + fBootPath;
-			vmString[index++] = "-cp:" + fClassPath;
-			vmString[index++] = "-debug:" + (fBackEndPort - 1);
-			vmString[index++] = "org.eclipse.debug.jdi.tests.program.MainClass";
-			fLaunchedVM = Runtime.getRuntime().exec(vmString);
-
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Launches the target Sun VM.
-	 */
-	private void launchSunTarget() {
-		try {
-			// Launch target VM
-			StringBuffer binDirectory= new StringBuffer();
-			if (fTargetAddress.endsWith("jre")) {
-				binDirectory.append(fTargetAddress.substring(0, fTargetAddress.length() - 4));
-			} else {
-				binDirectory.append(fTargetAddress);
-			}
-			binDirectory.append(System.getProperty("file.separator"));
-			binDirectory.append("bin").append(System.getProperty("file.separator"));
-			String[] vmString;
-			if (fBootPath.length() > 0)
-				vmString = new String[10];
-			else
-				vmString = new String[8];
-
-			int index = 0;
-			vmString[index++] = binDirectory.toString() + "javaw";
-			File vm= new File(vmString[index - 1] + ".exe");
-			if (!vm.exists()) {
-				vmString[index - 1] = binDirectory + "java";
-			}
-			if (fBootPath.length() > 0) {
-				vmString[index++] = "-bootpath";
-				vmString[index++] = fBootPath;
-			}
-			vmString[index++] = "-classpath";
-			vmString[index++] = fClassPath;
-			vmString[index++] = "-Xdebug";
-			vmString[index++] = "-Xnoagent";
-			vmString[index++] = "-Djava.compiler=NONE";
-			vmString[index++] =
-				"-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y";
-			vmString[index++] = "org.eclipse.debug.jdi.tests.program.MainClass";
-			fLaunchedVM = Runtime.getRuntime().exec(vmString);
-
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-	/**
-	 * Launches the target IBM VM.
-	 */
-	private void launchIBMTarget() {
-		try {
-			// Launch target VM
-			String binDirectory =
-				fTargetAddress
-					+ System.getProperty("file.separator")
-					+ "bin"
-					+ System.getProperty("file.separator");
-			String[] vmString;
-			if (fBootPath.length() > 0)
-				vmString = new String[10];
-			else
-				vmString = new String[8];
-
-			int index = 0;
-			vmString[index++] = binDirectory + "javaw";
-			if (fBootPath.length() > 0) {
-				vmString[index++] = "-bootpath";
-				vmString[index++] = fBootPath;
-			}
-			vmString[index++] = "-classpath";
-			vmString[index++] = fClassPath;
-			vmString[index++] = "-Xdebug";
-			vmString[index++] = "-Xnoagent";
-			vmString[index++] = "-Djava.compiler=NONE";
-			vmString[index++] =
-				"-Xrunjdwp:transport=dt_socket,address=" + fBackEndPort + ",suspend=y,server=y";
-			vmString[index++] = "org.eclipse.debug.jdi.tests.program.MainClass";
-			fLaunchedVM = Runtime.getRuntime().exec(vmString);
-
-		} catch (IOException e) {
-			throw new Error("Could not launch the VM because " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Conects to the target vm.
-	 */
-	protected void connectToVM() {
-		// Start the console reader if possible so that the VM doesn't block when the stdout is full
-		startConsoleReaders();
-		
-
-		// Contact the VM (try 10 times)
-		for (int i = 0; i < 10; i++) {
-			try {
-				VirtualMachineManager manager = Bootstrap.virtualMachineManager();
-				List connectors = manager.attachingConnectors();
-				if (connectors.size() == 0)
-					break;
-				AttachingConnector connector = (AttachingConnector) connectors.get(0);
-				Map args = connector.defaultArguments();
-				((Connector.Argument) args.get("port")).setValue(String.valueOf(fBackEndPort));
-				((Connector.Argument) args.get("hostname")).setValue("localhost");
-
-				fVM = connector.attach(args);
-				if (fVMTraceFlags != com.sun.jdi.VirtualMachine.TRACE_NONE)
-					fVM.setDebugTraceMode(fVMTraceFlags);
-				break;
-			} catch (IllegalConnectorArgumentsException e) {
-			} catch (IOException e) {
-//				System.out.println("Got exception: " + e.getMessage());
-				try {
-					if (i == 9) {
-						System.out.println(
-							"Could not contact the VM at localhost" + ":" + fBackEndPort + ".");
-					}
-					Thread.sleep(200);
-				} catch (InterruptedException e2) {
-				}
-			}
-		}
-		if (fVM == null) {
-			if (fLaunchedVM != null) {
-				// If the VM is not running, output error stream
-				try {
-					if (!vmIsRunning()) {
-						InputStream in = fLaunchedVM.getErrorStream();
-						int read;
-						do {
-							read = in.read();
-							if (read != -1)
-								System.out.print((char) read);
-						} while (read != -1);
-					}
-				} catch (IOException e) {
-				}
-
-				// Shut it down
-				killVM();
-			}
-			throw new Error("Could not contact the VM");
-		}
-		startEventReader();
-	}
-	/**
-	 * Initializes the fields that are used by this test only.
-	 */
-	public abstract void localSetUp();
-	/**
-	 * Makes sure the test leaves the VM in the same state it found it.
-	 * Default is to do nothing.
-	 */
-	public void localTearDown() {
-	}
-	/**
-	 * Parses the given arguments and store them in this tests
-	 * fields.
-	 * Returns whether the parsing was successfull.
-	 */
-	protected static boolean parseArgs(String[] args) {
-		// Default values
-		String vmVendor = System.getProperty("java.vm.vendor");
-		String vmVersion = System.getProperty("java.vm.version");
-		String targetAddress = System.getProperty("java.home");
-		String vmLauncherName;
-		if (vmVendor != null
-			&& vmVendor.equals("Sun Microsystems Inc.")
-			&& vmVersion != null) {
-			vmLauncherName = "SunVMLauncher";
-		} else if (
-			vmVendor != null && vmVendor.equals("IBM Corporation") && vmVersion != null) {
-			vmLauncherName = "IBMVMLauncher";
-		} else {
-			vmLauncherName = "J9VMLauncher";
-		}
-		String classPath = System.getProperty("java.class.path");
-		String bootPath = "";
-		String vmType = "?";
-		boolean verbose = false;
-
-		// Parse arguments
-		for (int i = 0; i < args.length; ++i) {
-			String arg = args[i];
-			if (arg.startsWith("-")) {
-				if (arg.equals("-verbose") || arg.equals("-v")) {
-					verbose = true;
-				} else {
-					String next = (i < args.length - 1) ? args[++i] : null;
-					// If specified, passed values overide default values
-					if (arg.equals("-launcher")) {
-						vmLauncherName = next;
-					} else if (arg.equals("-address")) {
-						targetAddress = next;
-					} else if (arg.equals("-port")) {
-						fBackEndPort = Integer.parseInt(next);
-					} else if (arg.equals("-cp")) {
-						classPath = next;
-					} else if (arg.equals("-bp")) {
-						bootPath = next;
-					} else if (arg.equals("-vmtype")) {
-						vmType = next;
-					} else if (arg.equals("-stdout")) {
-						fStdoutFile = next;
-					} else if (arg.equals("-stderr")) {
-						fStderrFile = next;
-					} else if (arg.equals("-proxyout")) {
-						fProxyoutFile = next;
-					} else if (arg.equals("-proxyerr")) {
-						fProxyerrFile = next;
-					} else if (arg.equals("-vmcmd")) {
-						fVmCmd = next;
-					} else if (arg.equals("-proxycmd")) {
-						fProxyCmd = next;
-					} else if (arg.equals("-trace")) {
-						if (next.equals("all")) {
-							fVMTraceFlags = com.sun.jdi.VirtualMachine.TRACE_ALL;
-						} else {
-							fVMTraceFlags = Integer.decode(next).intValue();
-						}
-					} else {
-						System.out.println("Invalid option: " + arg);
-						printUsage();
-						return false;
-					}
-				}
-			}
-		}
-		fVMLauncherName = vmLauncherName;
-		fTargetAddress = targetAddress;
-		fClassPath = classPath;
-		fBootPath = bootPath;
-		fVMType = vmType;
-		fVerbose = verbose;
-		return true;
-	}
-	/**
-	 * Prints the various options to pass to the constructor.
-	 */
-	protected static void printUsage() {
-		System.out.println("Possible options:");
-		System.out.println("-launcher <Name of the launcher class>");
-		System.out.println("-address <Address of the target VM>");
-		System.out.println("-port <Debug port number>");
-		System.out.println("-cp <Path to the test program>");
-		System.out.println("-bp <Boot classpath for the system class library>");
-		System.out.println("-vmtype <The type of VM: JDK, J9, ...>");
-		System.out.println("-verbose | -v");
-		System.out.println("-stdout <file where VM output is written to>");
-		System.out.println("-stderr <file where VM error output is written to>");
-		System.out.println("-proxyout <file where proxy output is written to>");
-		System.out.println("-proxyerr <file where proxy error output is written to>");
-		System.out.println("-vmcmd <exec string to start VM>");
-		System.out.println("-proxycmd <exec string to start proxy>");
-	}
-	/**
-	 * Set the value of the "fBool" field back to its original value
-	 */
-	protected void resetField() {
-		Field field = getField("fBool");
-		Value value = null;
-		value = fVM.mirrorOf(false);
-		try {
-			getObjectReference().setValue(field, value);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("resetField.2", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("resetField.3", false);
-		}
-	}
-	/**
-	 * Set the value of the "fString" field back to its original value
-	 */
-	protected void resetStaticField() {
-		Field field = getField("fString");
-		Value value = null;
-		value = fVM.mirrorOf("Hello World");
-		try {
-			getMainClass().setValue(field, value);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("resetField.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("resetField.2", false);
-		}
-	}
-	/**
-	 * Runs this test's suite with the given arguments.
-	 */
-	protected void runSuite(String[] args) {
-		// Check args
-		if (!parseArgs(args))
-			return;
-
-		// Run test
-		System.out.println(new java.util.Date());
-		System.out.println("Begin testing " + getName() + "...");
-		junit.textui.TestRunner.run(suite());
-		System.out.println("Done testing " + getName() + ".");
-	}
-	/**
-	 * Sets the 'in control of the VM' flag for this test.
-	 */
-	void setInControl(boolean inControl) {
-		fInControl = inControl;
-	}
-	/**
-	 * Launch target VM and start program in target VM.
-	 */
-	protected void launchTargetAndStartProgram() {
-		launchTargetAndConnectToVM();
-		startProgram();
-	}
-	/**
-	 * Init tests
-	 */
-	protected void setUp() {
-		if (fVM == null || fInControl) {
-			launchTargetAndStartProgram();
-		}
-		try {
-			verbose("Setting up the test");
-			localSetUp();
-		} catch (RuntimeException e) {
-			System.out.println("Runtime exception during set up:");
-			e.printStackTrace();
-		} catch (Error e) {
-			System.out.println("Error during set up:");
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * Sets the VM info for this test.
-	 */
-	void setVMInfo(VMInformation info) {
-		if (info != null) {
-			fVM = info.fVM;
-			fLaunchedVM = info.fLaunchedVM;
-			fEventReader = info.fEventReader;
-			fConsoleReader = info.fConsoleReader;
-		}
-	}
-	/**
-	 * Stop console and event readers.
-	 */
-	protected void stopReaders() {
-		stopEventReader();
-		stopConsoleReaders();
-	}
-	/**
-	 * Shut down the target.
-	 */
-	protected void shutDownTarget() {
-		stopReaders();
-		if (fVM != null) {
-			try {
-				fVM.exit(0);
-			} catch (VMDisconnectedException e) {
-			}
-		}
-
-		fVM = null;
-		fLaunchedVM = null;
-
-		// We want subsequent connections to use different ports, unless a
-		// VM exec sting is given.
-		if (fVmCmd == null)
-			fBackEndPort += 2;
-	}
-	/**
-	 * Starts the threads that reads from the VM and proxy input and error streams
-	 */
-	private void startConsoleReaders() {
-		if (fStdoutFile != null) {
-			fConsoleReader =
-				new FileConsoleReader(
-					"JDI Tests Console Reader",
-					fStdoutFile,
-					fLaunchedVM.getInputStream());
-		} else {
-			fConsoleReader =
-				new NullConsoleReader("JDI Tests Console Reader", fLaunchedVM.getInputStream());
-		}
-		fConsoleReader.start();
-
-		if (fStderrFile != null) {
-			fConsoleErrorReader =
-				new FileConsoleReader(
-					"JDI Tests Console Error Reader",
-					fStderrFile,
-					fLaunchedVM.getErrorStream());
-		} else {
-			fConsoleErrorReader =
-				new NullConsoleReader(
-					"JDI Tests Console Error Reader",
-					fLaunchedVM.getErrorStream());
-		}
-		fConsoleErrorReader.start();
-
-		if (fLaunchedProxy == null)
-			return;
-
-		if (fProxyoutFile != null) {
-			fProxyReader =
-				new FileConsoleReader(
-					"JDI Tests Proxy Reader",
-					fProxyoutFile,
-					fLaunchedProxy.getInputStream());
-		} else {
-			fProxyReader =
-				new NullConsoleReader(
-					"JDI Tests Proxy Reader",
-					fLaunchedProxy.getInputStream());
-		}
-		fProxyReader.start();
-
-		if (fProxyerrFile != null) {
-			fProxyErrorReader =
-				new FileConsoleReader(
-					"JDI Tests Proxy Error Reader",
-					fProxyerrFile,
-					fLaunchedProxy.getErrorStream());
-		} else {
-			fProxyErrorReader =
-				new NullConsoleReader(
-					"JDI Tests Proxy Error Reader",
-					fLaunchedProxy.getErrorStream());
-		}
-		fProxyErrorReader.start();
-	}
-	/**
-	 * Stops the console reader.
-	 */
-	private void stopConsoleReaders() {
-		if (fConsoleReader != null)
-			fConsoleReader.stop();
-		if (fConsoleErrorReader != null)
-			fConsoleErrorReader.stop();
-		if (fProxyReader != null)
-			fProxyReader.stop();
-		if (fProxyErrorReader != null)
-			fProxyErrorReader.stop();
-	}
-	/**
-	 * Starts event reader.
-	 */
-	private void startEventReader() {
-		// Create the VM event reader.
-		fEventReader = new EventReader("JDI Tests Event Reader", fVM.eventQueue());
-	}
-	/**
-	 * Stops the event reader.
-	 */
-	private void stopEventReader() {
-		fEventReader.stop();
-	}
-	protected void killVM() {
-		if (fLaunchedVM != null)
-			fLaunchedVM.destroy();
-		if (fLaunchedProxy != null)
-			fLaunchedProxy.destroy();
-	}
-	/**
-	 * Starts the target program.
-	 */
-	protected void startProgram() {
-		verbose("Starting target program");
-
-		// Request class prepare events
-		EventRequest classPrepareRequest =
-			fVM.eventRequestManager().createClassPrepareRequest();
-		classPrepareRequest.enable();
-
-		// Prepare to receive the token class prepare event
-		ClassPrepareEventWaiter waiter =
-			new ClassPrepareEventWaiter(
-				classPrepareRequest,
-				true,
-				"org.eclipse.debug.jdi.tests.program.MainClass");
-		fEventReader.addEventListener(waiter);
-
-		// Start the event reader (this will start the VM when the VMStartEvent is picked up)
-		fEventReader.start();
-
-		// Wait until the program has started
-		Event event = (ClassPrepareEvent) waitForEvent(waiter, 3 * TIMEOUT);
-		fEventReader.removeEventListener(waiter);
-		if (event == null) {
-//			try {
-				System.out.println(
-					"\nThe program doesn't seem to have started after " + (3 * TIMEOUT) + "ms");
-//				InputStream errorStream = fLaunchedVM.getErrorStream();
-//				int read;
-//				do {
-//					read = errorStream.read();
-//					if (read != -1)
-//						System.out.print((char) read);
-//				} while (read != -1);
-//			} catch (IOException e) {
-//			}
-		}
-
-		// Stop class prepare events
-		fVM.eventRequestManager().deleteEventRequest(classPrepareRequest);
-
-		// Wait for the program to be ready to be tested
-		waitUntilReady();
-	}
-	/**
-	 * Returns all tests 
-	 */
-	protected Test suite() {
-		JDITestSuite suite = new JDITestSuite(this);
-		Vector testNames = getAllMatchingTests("testJDI");
-		Iterator iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-		return suite;
-	}
-	/**
-	 * Undo the initialization of the test.
-	 */
-	protected void tearDown() {
-		try {
-			super.tearDown();
-		} catch (Exception e) {
-			System.out.println("Exception during tear down:");
-			e.printStackTrace();
-		}
-		try {
-			verbose("Tearing down the test");
-			localTearDown();
-
-			// Ensure that the test didn't leave a modification watchpoint that could change the expected state of the program
-			if (fVM != null) {
-				assertTrue(fVM.eventRequestManager().modificationWatchpointRequests().size() == 0);
-				if (fInControl) {
-					shutDownTarget();
-				}
-			}
-
-		} catch (RuntimeException e) {
-			System.out.println("Runtime exception during tear down:");
-			e.printStackTrace();
-		} catch (Error e) {
-			System.out.println("Error during tear down:");
-			e.printStackTrace();
-		}
-
-	}
-	/**
-	 * Triggers and waits for the given event to come in.
-	 * Let the thread go if asked.
-	 * Throws an Error if the event didn't come in after TIMEOUT ms
-	 */
-	protected Event triggerAndWait(
-		EventRequest request,
-		String eventType,
-		boolean shouldGo) {
-		Event event = triggerAndWait(request, eventType, shouldGo, TIMEOUT);
-		if (event == null)
-			throw new Error(
-				"Event for " + request + " didn't come in after " + TIMEOUT + "ms");
-		
-		return event;
-	}
-	/**
-	 * Triggers and waits for the given event to come in.
-	 * Let the thread go if asked.
-	 * Returns null if the event didn't come in after the given amount of time (in ms)
-	 */
-	protected Event triggerAndWait(
-		EventRequest request,
-		String eventType,
-		boolean shouldGo,
-		long time) {
-		// Suspend only if asked
-		if (shouldGo)
-			request.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		else
-			request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-
-		// Enable request
-		request.enable();
-
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(request, shouldGo);
-		fEventReader.addEventListener(waiter);
-
-		// Trigger the event
-		triggerEvent(eventType);
-
-		// Wait for the event to come in
-		Event event = waitForEvent(waiter, TIMEOUT);
-		fEventReader.removeEventListener(waiter);
-
-		if (shouldGo) {
-			// Wait for the program to be ready
-			waitUntilReady();
-		}
-
-		// Clear request
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		return event;
-	}
-	/**
-	 * Triggers the given type of event. See the MainClass for details on types of event.
-	 */
-	protected void triggerEvent(String eventType) {
-		// Set the "fEventType" field to the given eventType
-		ClassType type = getMainClass();
-		Field field = type.fieldByName("fEventType");
-		assertTrue("1", field != null);
-
-		Value value = null;
-		value = fVM.mirrorOf(eventType);
-		try {
-			type.setValue(field, value);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("3", false);
-		}
-
-		// Resume the test thread
-		ThreadReference thread = getThread();
-		int suspendCount = thread.suspendCount();
-		for (int i = 0; i < suspendCount; i++)
-			thread.resume();
-	}
-	/**
-	 * Triggers a step event and waits for it to come in.
-	 */
-	protected StepEvent triggerStepAndWait() {
-		return triggerStepAndWait(
-			getThread(),
-			StepRequest.STEP_MIN,
-			StepRequest.STEP_OVER);
-	}
-
-	protected StepEvent triggerStepAndWait(
-		ThreadReference thread,
-		int gran,
-		int depth) {
-		// Request for step events
-		EventRequest eventRequest =
-			fVM.eventRequestManager().createStepRequest(thread, gran, depth);
-		eventRequest.addCountFilter(1);
-		eventRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		eventRequest.enable();
-
-		return triggerStepAndWait(thread, eventRequest, TIMEOUT);
-	}
-
-	protected StepEvent triggerStepAndWait(
-		ThreadReference thread,
-		EventRequest eventRequest,
-		int timeout) {
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(eventRequest, true);
-		fEventReader.addEventListener(waiter);
-
-		// Trigger step event
-		int suspendCount = thread.suspendCount();
-		for (int i = 0; i < suspendCount; i++)
-			thread.resume();
-
-		// Wait for the event to come in
-		StepEvent event = (StepEvent) waitForEvent(waiter, timeout);
-		fEventReader.removeEventListener(waiter);
-		if (event == null)
-			throw new Error("StepEvent didn't come in after " + timeout + "ms");
-
-		// Stop getting step events
-		fVM.eventRequestManager().deleteEventRequest(eventRequest);
-
-		// Wait for the program to be ready
-		waitUntilReady();
-
-		return event;
-	}
-	/**
-	 * Output verbose string if asked for.
-	 */
-	protected void verbose(String verboseString) {
-		if (fVerbose)
-			System.out.println(verboseString);
-	}
-	/**
-	 * Waits for an event to come in using the given waiter.
-	 * Waits for the given time. If it times out, returns null.
-	 */
-	protected Event waitForEvent(EventWaiter waiter, long time) {
-		Event event;
-		try {
-			event = waiter.waitEvent(time);
-		} catch (InterruptedException e) {
-			event = null;
-		}
-		return event;
-	}
-	/**
-	 * Waits until the program is ready to be tested.
-	 * The default behaviour is to wait until the "Test Thread" throws and catches
-	 * an exception.
-	 */
-	protected void waitUntilReady() {
-		// Make sure the program is running
-		ThreadReference thread = getThread();
-		while (thread == null || thread.suspendCount() > 0) {
-			fVM.resume();
-			thread = getThread();
-		}
-
-		// Create exception request
-		EventRequest request =
-			fVM.eventRequestManager().createExceptionRequest(null, true, false);
-		request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(request, false);
-		fEventReader.addEventListener(waiter);
-
-		request.enable();
-
-		while (true) {
-			// Wait for the event to come in
-			ExceptionEvent event = (ExceptionEvent) waitForEvent(waiter, TIMEOUT);
-
-			// Throw error if event is null
-			if (event == null)
-				throw new Error("Target program was not ready after " + TIMEOUT + "ms");
-
-			// Get the method where the exception was thrown
-			Method meth = event.location().method();
-			if (meth == null || !meth.name().equals("printAndSignal"))
-				fVM.resume();
-			else
-				break;
-		}
-
-		// Disable request
-		fEventReader.removeEventListener(waiter);
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
deleted file mode 100644
index 37523ab..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AbstractReader.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java
deleted file mode 100644
index c530001..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AccessibleTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.Accessible;
-
-/**
- * Tests for JDI com.sun.jdi.Accessible.
- */
-public class AccessibleTest extends AbstractJDITest {
-
-	private Accessible fArrayType, fClassType, fInterfaceType, fField, fMethod;
-	/**
-	 * Creates a new test.
-	 */
-	public AccessibleTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the all kinds of accessible
-
-		// ReferenceType
-		fArrayType = getArrayType();
-		fClassType = getMainClass();
-		fInterfaceType = getInterfaceType();
-
-		// TypeComponent
-		fField = getField();
-		fMethod = getMethod();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new AccessibleTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Accessible";
-	}
-	/**
-	 * Test JDI isPackagePrivate().
-	 */
-	public void testJDIIsPackagePrivate() {
-		assertTrue("1", !fArrayType.isPackagePrivate());
-		assertTrue("2", !fClassType.isPackagePrivate());
-		assertTrue("3", !fInterfaceType.isPackagePrivate());
-		assertTrue("4", !fField.isPackagePrivate());
-		assertTrue("5", !fMethod.isPackagePrivate());
-	}
-	/**
-	 * Test JDI isPrivate().
-	 */
-	public void testJDIIsPrivate() {
-		assertTrue("1", !fField.isPrivate());
-		assertTrue("2", !fMethod.isPrivate());
-
-		// NB: isPrivate() is undefined for a type
-	}
-	/**
-	 * Test JDI isProtected().
-	 */
-	public void testJDIIsProtected() {
-		assertTrue("1", !fField.isProtected());
-		assertTrue("2", !fMethod.isProtected());
-
-		// NB: isProtected() is undefined for a type
-	}
-	/**
-	 * Test JDI isPublic().
-	 */
-	public void testJDIIsPublic() {
-		assertTrue("1", fArrayType.isPublic());
-		assertTrue("2", fClassType.isPublic());
-		assertTrue("3", fInterfaceType.isPublic());
-		assertTrue("4", fField.isPublic());
-		assertTrue("5", fMethod.isPublic());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java
deleted file mode 100644
index b465005..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayReferenceTest.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.DoubleValue;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.StringReference;
-
-/**
- * Tests for JDI com.sun.jdi.ArrayReference
- * and JDWP Array command set.
- */
-public class ArrayReferenceTest extends AbstractJDITest {
-
-	private ArrayReference fArray;
-	private ArrayReference fDoubleArray;
-
-	/**
-	 * Creates a new test.
-	 */
-	public ArrayReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get array references
-		fArray = getObjectArrayReference();
-		fDoubleArray = getNonEmptyDoubleArrayReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ArrayReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ArrayReference";
-	}
-	/**
-	 * Test JDI getValue(int), getValues(), getValues(int,int)
-	 * setValue(Value,int), setValues(List) and setValues(int,List,int,int),
-	 * and JDWP 'Array - Get values' and 'Array - Set values'.
-	 */
-	public void testJDIGetSetDoubleValue() {
-		double one = 1.0;
-		double pi = 3.1415926535;
-		double twos = 2.2;
-		double threes = 3.33;
-		double cnt = 12345;
-		double zero = 0.0;
-		double delta = 0.0;
-
-		DoubleValue dbl = (DoubleValue) fDoubleArray.getValue(0);
-		assertEquals("testJDIGetSetDoubleValue.1", one, dbl.value(), delta);
-
-		DoubleValue piValue = fVM.mirrorOf(pi);
-		DoubleValue cntValue = fVM.mirrorOf(cnt);
-		DoubleValue zeroValue = fVM.mirrorOf(zero);
-		try {
-			fDoubleArray.setValue(0, piValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("testJDIGetSetDoubleValue.3.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("testJDIGetSetDoubleValue.3.2", false);
-		}
-		DoubleValue value = (DoubleValue) fDoubleArray.getValue(0);
-		assertEquals("testJDIGetSetDoubleValue.4.1", value, piValue);
-		assertEquals("testJDIGetSetDoubleValue.4.2", pi, value.value(), delta);
-
-		// getValues()
-		List values = fDoubleArray.getValues();
-		double[] expected = new double[] { pi, twos, threes };
-		ListIterator iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			DoubleValue dv = (DoubleValue) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (dv.value() == expected[i]) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("testJDIGetSetDoubleValue.5." + dv.value(), included);
-		}
-
-		// setValues(List)
-		List newValues = values;
-		newValues.set(1, cntValue);
-		try {
-			fDoubleArray.setValues(newValues);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("testJDIGetSetDoubleValue.7.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("testJDIGetSetDoubleValue.7.2", false);
-		}
-		values = fDoubleArray.getValues();
-		assertEquals("testJDIGetSetDoubleValue.8", values, newValues);
-
-		// getValues(int,int)
-		values = fDoubleArray.getValues(1, 2);
-		expected = new double[] { cnt, threes };
-		iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			DoubleValue dv = (DoubleValue) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (dv.value() == expected[i]) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("testJDIGetSetDoubleValue.9." + dv.value(), included);
-		}
-
-		// setValues(int,List,int,int)
-		newValues = fDoubleArray.getValues(0, 2);
-		newValues.set(0, zeroValue);
-		try {
-			fDoubleArray.setValues(0, newValues, 0, 2);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("testJDIGetSetDoubleValue.11.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("testJDIGetSetDoubleValue.11.2", false);
-		}
-		values = fDoubleArray.getValues(0, 2);
-		assertEquals("testJDIGetSetDoubleValue.12", values, newValues);
-	}
-	/**
-	 * Test JDI getValue(int), getValues(), getValues(int,int)
-	 * setValue(Value,int), setValues(List) and setValues(int,List,int,int),
-	 * and JDWP 'Array - Get values' and 'Array - Set values'.
-	 */
-	public void testJDIGetSetValue() {
-		// getValue(int)
-		StringReference string = (StringReference) fArray.getValue(0);
-		assertEquals("1", "foo", string.value());
-
-		// setValue(int,Value)
-		StringReference newValue = null;
-		newValue = fVM.mirrorOf("biz");
-		try {
-			fArray.setValue(0, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("2.2", false);
-		}
-		StringReference value = (StringReference) fArray.getValue(0);
-		assertEquals("3", value, newValue);
-
-		// getValues()
-		List values = fArray.getValues();
-		String[] expected = new String[] { "biz", "bar", "hop" };
-		ListIterator iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			StringReference ref = (StringReference) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (ref.value().equals(expected[i])) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("4." + ref.value(), included);
-		}
-
-		// setValues(List)
-		List newValues = values;
-		newValue = fVM.mirrorOf("hip");
-		newValues.set(1, newValue);
-		try {
-			fArray.setValues(newValues);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("5.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("6.2", false);
-		}
-		values = fArray.getValues();
-		assertEquals("7", values, newValues);
-
-		// getValues(int,int)
-		values = fArray.getValues(1, 2);
-		expected = new String[] { "hip", "hop" };
-		iterator = values.listIterator();
-		while (iterator.hasNext()) {
-			StringReference ref = (StringReference) iterator.next();
-			boolean included = false;
-			for (int i = 0; i < expected.length; i++) {
-				if (ref.value().equals(expected[i])) {
-					included = true;
-					break;
-				}
-			}
-			assertTrue("8." + ref.value(), included);
-		}
-
-		// setValues(int,List,int,int)
-		newValues = fArray.getValues(0, 2);
-		newValue = fVM.mirrorOf("rap");
-		newValues.set(0, newValue);
-		try {
-			fArray.setValues(0, newValues, 0, 2);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("9.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("9.2", false);
-		}
-		values = fArray.getValues(0, 2);
-		assertEquals("10", values, newValues);
-
-		// test null value
-		newValues.set(0, null);
-		try {
-			fArray.setValues(0, newValues, 0, 2);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("11.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("11.2", false);
-		}
-		values = fArray.getValues(0, 2);
-		assertEquals("12", values.get(0), null);
-	}
-	/**
-	 * Test JDI length() and JDWP 'Array - Get length'.
-	 */
-	public void testJDILength() {
-		int length = fArray.length();
-		assertEquals("1", 3, length);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java
deleted file mode 100644
index d648bf1..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ArrayTypeTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ArrayReference;
-import com.sun.jdi.ArrayType;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.Type;
-
-/**
- * Tests for JDI com.sun.jdi.ArrayType
- * and JDWP Array command set.
- */
-public class ArrayTypeTest extends AbstractJDITest {
-
-	private ArrayType fType;
-	/**
-	 * Creates a new test.
-	 */
-	public ArrayTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get array type
-		fType = getArrayType();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ArrayTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ArrayType";
-	}
-	/**
-	 * Test JDI componentSignature().
-	 */
-	public void testJDIComponentSignature() {
-		String signature = fType.componentSignature();
-		assertEquals("1", "Ljava/lang/String;", signature);
-	}
-	/**
-	 * Test JDI componentType().
-	 */
-	public void testJDIComponentType() {
-		Type expected = (Type) fVM.classesByName("java.lang.String").get(0);
-		Type type = null;
-		try {
-			type = fType.componentType();
-		} catch (ClassNotLoadedException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", expected, type);
-	}
-	/**
-	 * Test JDI componentTypeName().
-	 */
-	public void testJDIComponentTypeName() {
-		String typeName = fType.componentTypeName();
-		assertEquals("1", "java.lang.String", typeName);
-	}
-	/**
-	 * Test JDI newInstance(long).
-	 */
-	public void testJDINewInstance() {
-		ArrayReference instance = fType.newInstance(1);
-		assertTrue("1", instance.type().equals(fType));
-		assertEquals("2", 1, instance.length());
-		assertTrue("3", null == instance.getValue(0));
-
-		ArrayReference instance2 = fType.newInstance(5);
-		try {
-			instance2.setValue(3, fVM.mirrorOf("Yo"));
-		} catch (InvalidTypeException exc) {
-		} catch (ClassNotLoadedException exc) {
-		}
-		assertTrue("4", instance2.getValue(2) == null);
-		assertEquals(
-			"5",
-			((StringReference) (instance2.getValue(3))).value(),
-			"Yo");
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AutomatedSuite.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AutomatedSuite.java
deleted file mode 100644
index e214a49..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/AutomatedSuite.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import junit.framework.TestSuite;
-
-/**
- */
-public class AutomatedSuite extends TestSuite {
-	
-	public static TestSuite suite() {
-		return new AutomatedSuite();
-	}
-	
-	public AutomatedSuite() {
-		AbstractJDITest.parseArgs(new String[0]);
-
-		addTest(new TestSuite(AccessibleTest.class));
-		addTest(new TestSuite(ArrayReferenceTest.class));
-		addTest(new TestSuite(ArrayTypeTest.class));
-		addTest(new TestSuite(BooleanValueTest.class));
-		addTest(new TestSuite(BreakpointRequestTest.class));
-		addTest(new TestSuite(ByteValueTest.class));
-		addTest(new TestSuite(CharValueTest.class));
-		addTest(new TestSuite(ClassLoaderReferenceTest.class));
-		addTest(new TestSuite(ClassPrepareEventTest.class));
-		addTest(new TestSuite(ClassPrepareRequestTest.class));
-		addTest(new TestSuite(ClassTypeTest.class));
-		addTest(new TestSuite(DoubleValueTest.class));
-		addTest(new TestSuite(EventRequestManagerTest.class));
-		addTest(new TestSuite(EventRequestTest.class));
-		addTest(new TestSuite(EventTest.class));
-		addTest(new TestSuite(ExceptionEventTest.class));
-		addTest(new TestSuite(ExceptionRequestTest.class));
-		addTest(new TestSuite(FieldTest.class));
-		addTest(new TestSuite(FloatValueTest.class));
-		addTest(new TestSuite(HotCodeReplacementTest.class));
-		addTest(new TestSuite(IntegerValueTest.class));
-		addTest(new TestSuite(InterfaceTypeTest.class));
-		addTest(new TestSuite(LocalVariableTest.class));
-		addTest(new TestSuite(LocatableTest.class));
-		addTest(new TestSuite(LocationTest.class));
-		addTest(new TestSuite(LongValueTest.class));
-		addTest(new TestSuite(MethodTest.class));
-		addTest(new TestSuite(MethodEntryRequestTest.class));
-		addTest(new TestSuite(MethodExitRequestTest.class));
-		addTest(new TestSuite(MirrorTest.class));
-
-		addTest(new TestSuite(ModificationWatchpointEventTest.class));
-			
-		addTest(new TestSuite(ObjectReferenceTest.class));
-		addTest(new TestSuite(PrimitiveValueTest.class));
-		addTest(new TestSuite(ReferenceTypeTest.class));
-		addTest(new TestSuite(ShortValueTest.class));
-		addTest(new TestSuite(StackFrameTest.class));
-		addTest(new TestSuite(StepEventTest.class));
-		addTest(new TestSuite(StringReferenceTest.class));
-		addTest(new TestSuite(ThreadDeathEventTest.class));
-		addTest(new TestSuite(ThreadGroupReferenceTest.class));
-		addTest(new TestSuite(ThreadReferenceTest.class));
-		addTest(new TestSuite(ThreadStartEventTest.class));
-		addTest(new TestSuite(TypeComponentTest.class));
-		addTest(new TestSuite(TypeTest.class));
-		addTest(new TestSuite(ValueTest.class));
-
-		addTest(new TestSuite(WatchpointEventTest.class));
-		addTest(new TestSuite(WatchpointRequestTest.class));
-
-		addTest(new TestSuite(VirtualMachineExitTest.class));
-		addTest(new TestSuite(VMDisconnectEventTest.class));
-		addTest(new TestSuite(VMDisposeTest.class));
-		
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java
deleted file mode 100644
index 08870c5..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BooleanValueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.BooleanValue;
-
-/**
- * Tests for JDI com.sun.jdi.BooleanValue.
- */
-public class BooleanValueTest extends AbstractJDITest {
-
-	private BooleanValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public BooleanValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get boolean value for "true"
-		fValue = fVM.mirrorOf(true);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new BooleanValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.BooleanValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(true)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(false)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf(true).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(false).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", true == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java
deleted file mode 100644
index 655991c..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/BreakpointRequestTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.request.BreakpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.BreakpointRequest.
- */
-public class BreakpointRequestTest extends AbstractJDITest {
-
-	private BreakpointRequest fRequest;
-	/**
-	 * Creates a new test .
-	 */
-	public BreakpointRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the breakpoint request
-		fRequest = getBreakpointRequest();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the breakpoint request we created in this test
-		fVM.eventRequestManager().deleteEventRequest(fRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new BreakpointRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.BreakpointRequest";
-	}
-	/**
-	 * Test JDI location().
-	 */
-	public void testJDILocation() {
-		assertEquals("1", getLocation(), fRequest.location());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java
deleted file mode 100644
index 6bd7626..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ByteValueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ByteValue;
-
-/**
- * Tests for JDI com.sun.jdi.ByteValue.
- */
-public class ByteValueTest extends AbstractJDITest {
-
-	private ByteValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public ByteValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get byte value for 1
-		fValue = fVM.mirrorOf((byte) 1);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ByteValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ByteValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf((byte) 1)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf((byte) 2)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf((byte) 1).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf((byte) 2).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 1 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java
deleted file mode 100644
index 33920a8..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/CharValueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.CharValue;
-
-/**
- * Tests for JDI com.sun.jdi.CharValue.
- */
-public class CharValueTest extends AbstractJDITest {
-
-	private CharValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public CharValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get char value for 'a'
-		fValue = fVM.mirrorOf('a');
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new CharValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.CharValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf('a')));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf('b')));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf('a').hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf('b').hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 'a' == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java
deleted file mode 100644
index 001cfca..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassLoaderReferenceTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.jdi.ClassLoaderReference;
-import com.sun.jdi.ReferenceType;
-
-/**
- * Tests for JDI com.sun.jdi.ClassLoaderReference.
- */
-public class ClassLoaderReferenceTest extends AbstractJDITest {
-
-	private ClassLoaderReference fClassLoader;
-	/**
-	 * Creates a new test.
-	 */
-	public ClassLoaderReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the class loader of org.eclipse.debug.jdi.tests.program.MainClass
-		fClassLoader = getClassLoaderReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassLoaderReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ClassLoaderReference";
-	}
-	/**
-	 * Test JDI definedClasses().
-	 */
-	public void testJDIDefinedClasses() {
-		Iterator defined = fClassLoader.definedClasses().iterator();
-		int i = 0;
-		while (defined.hasNext())
-			assertTrue(
-				Integer.toString(i++),
-				defined.next() instanceof ReferenceType);
-	}
-	/**
-	 * Test JDI visibleClasses().
-	 */
-	public void testJDIVisibleClasses() {
-		List visible = fClassLoader.visibleClasses();
-		Iterator defined = fClassLoader.definedClasses().iterator();
-		while (defined.hasNext()) {
-			ReferenceType next = (ReferenceType) defined.next();
-			assertTrue(next.name(), visible.contains(next));
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java
deleted file mode 100644
index e55a064..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.request.ClassPrepareRequest;
-
-/**
- * Tests for JDI com.sun.jdi.event.ClassPrepareEvent.
- */
-public class ClassPrepareEventTest extends AbstractJDITest {
-	private ClassPrepareRequest fRequest;
-	private ClassPrepareEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ClassPrepareEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger a class prepare event
-		fRequest = fVM.eventRequestManager().createClassPrepareRequest();
-		fEvent =
-			(ClassPrepareEvent) triggerAndWait(fRequest,
-				"ClassPrepareEvent",
-				true);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-
-		// Delete the class prepare request
-		fVM.eventRequestManager().deleteEventRequest(fRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassPrepareEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ClassPrepareEvent";
-	}
-	/**
-	 * Test JDI referenceType().
-	 */
-	public void testJDIReferenceType() {
-		assertEquals(
-			"1",
-			"org.eclipse.debug.jdi.tests.program.TestClass",
-			fEvent.referenceType().name());
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Thread", fEvent.thread().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java
deleted file mode 100644
index 8cb3172..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareEventWaiter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.request.EventRequest;
-/**
- * Listen for ClassPrepareEvent for a specific class.
- */
-public class ClassPrepareEventWaiter extends EventWaiter {
-	protected String fClassName;
-	/**
-	 * Creates a new ClassPrepareEventWaiter that waits for the given class to be loaded.
-	 */
-	public ClassPrepareEventWaiter(EventRequest request, boolean shouldGo, String className) {
-		super(request, shouldGo);
-		fClassName = className;
-	}
-	public boolean classPrepare(ClassPrepareEvent event) {
-		if (event.referenceType().name().equals(fClassName)) {
-			notifyEvent(event);
-			return fShouldGo;
-		} 
-		return true;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java
deleted file mode 100644
index 28c872b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassPrepareRequestTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.request.ClassPrepareRequest;
-import com.sun.jdi.request.EventRequestManager;
-
-/**
- * Tests for JDI com.sun.jdi.request.ClassPrepareRequest.
- */
-public class ClassPrepareRequestTest extends AbstractJDITest {
-	/**
-	 * Creates a new test.
-	 */
-	public ClassPrepareRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(String[] args) {
-		new ClassPrepareRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.ClassPrepareRequest";
-	}
-	/**
-	 * Test JDI addClassFilter(String).
-	 */
-	public void testJDIAddClassFilterString() {
-		EventRequestManager requestManager = fVM.eventRequestManager();
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.*" and loads org.eclipse.debug.jdi.tests.program.TestClass1
-		ClassPrepareRequest request =
-			requestManager.createClassPrepareRequest();
-		request.addClassFilter("org.eclipse.debug.jdi.tests.program.*");
-		ClassPrepareEvent event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent1",
-				true,
-				5000);
-		assertTrue("1", event != null);
-		assertEquals(
-			"2",
-			"org.eclipse.debug.jdi.tests.program.TestClass1",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "bogus.*" and loads org.eclipse.debug.jdi.tests.program.TestClass2
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("bogus.*");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent2",
-				true,
-				5000);
-		assertTrue("3", event == null);
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "*.TestClass3" and loads org.eclipse.debug.jdi.tests.program.TestClass3
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("*.TestClass3");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent3",
-				true,
-				5000);
-		assertTrue("4", event != null);
-		assertEquals(
-			"5",
-			"org.eclipse.debug.jdi.tests.program.TestClass3",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "*.eclipse.*.jdi.tests.*4" and loads org.eclipse.debug.jdi.tests.program.TestClass4
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("*.eclipse.*.jdi.tests.program.*4");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent4",
-				true,
-				5000);
-		assertTrue("6", event == null);
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "*.eclipse.debug.jdi.tests.program.*" and loads org.eclipse.debug.jdi.tests.program.TestClass5
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter("*.eclipse.debug.jdi.tests.program.*");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent5",
-				true,
-				5000);
-		assertTrue("7", event == null);
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.TestClass6" and loads org.eclipse.debug.jdi.tests.program.TestClass6
-		request = requestManager.createClassPrepareRequest();
-		request.addClassFilter(
-			"org.eclipse.debug.jdi.tests.program.TestClass6");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent6",
-				true,
-				5000);
-		assertTrue("8", event != null);
-		assertEquals(
-			"9",
-			"org.eclipse.debug.jdi.tests.program.TestClass6",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-	}
-	/**
-	 * Test JDI addClassExclusionFilter(String).
-	 */
-	public void testJDIAddClassExclusionFilterString() {
-		EventRequestManager requestManager = fVM.eventRequestManager();
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.TestClass*" and loads org.eclipse.debug.jdi.tests.program.TestClass7 and org.eclipse.debug.jdi.tests.program.TestClazz8.
-		ClassPrepareRequest request =
-			requestManager.createClassPrepareRequest();
-		request.addClassExclusionFilter(
-			"org.eclipse.debug.jdi.tests.program.TestClass*");
-		ClassPrepareEvent event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent7",
-				true,
-				5000);
-		assertTrue("1", event != null);
-		assertEquals(
-			"2",
-			"org.eclipse.debug.jdi.tests.program.TestClazz8",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-		// Filter is "org.eclipse.debug.jdi.tests.program.TestClazz9" and loads org.eclipse.debug.jdi.tests.program.TestClazz9 and org.eclipse.debug.jdi.tests.program.TestClazz10.
-		request = requestManager.createClassPrepareRequest();
-		request.addClassExclusionFilter(
-			"org.eclipse.debug.jdi.tests.program.TestClazz9");
-		event =
-			(ClassPrepareEvent) triggerAndWait(request,
-				"ClassPrepareEvent8",
-				true,
-				5000);
-		assertTrue("3", event != null);
-		assertEquals(
-			"4",
-			"org.eclipse.debug.jdi.tests.program.TestClazz10",
-			event.referenceType().name());
-		requestManager.deleteEventRequest(request);
-
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java
deleted file mode 100644
index 75a1fd2..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.Value;
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.ClassType
- * and JDWP Class command set.
- */
-public class ClassTypeTest extends AbstractJDITest {
-
-	private ClassType fType;
-	/**
-	 * Creates a new test.
-	 */
-	public ClassTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the type org.eclipse.debug.jdi.tests.program.MainClass
-		fType = getMainClass();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ClassType";
-	}
-	/**
-	 * Test JDI allFields().
-	 */
-	public void testJDIAllFields() {
-		boolean found = false;
-		Iterator it = fType.allFields().iterator();
-		while (it.hasNext()) {
-			Field fld = (Field) it.next();
-			if (fld.name().equals("fString")) {
-				found = true;
-			}
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI allInterfaces().
-	 */
-	public void testJDIAllInterfaces() {
-		List all = fType.allInterfaces();
-		boolean found = false;
-		Iterator interfaces = fType.allInterfaces().iterator();
-		while (interfaces.hasNext()) {
-			InterfaceType next = (InterfaceType) interfaces.next();
-			assertTrue(next.name(), all.contains(next));
-			if (next.name().equals("java.lang.Comparable"))
-				found = true;
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI allMethods().
-	 */
-	public void testJDIAllMethods() {
-		boolean found = false;
-		Iterator it = fType.allMethods().iterator();
-		while (it.hasNext()) {
-			Method mth = (Method) it.next();
-			if (mth.name().equals("after")) { // in Date
-				found = true;
-			}
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI concreteMethodByName().
-	 */
-	public void testJDIConcreteMethodByName() {
-		Method method = fType.concreteMethodByName("run", "()V");
-		assertTrue("1", method != null);
-		assertEquals("2", fType, method.declaringType());
-		assertTrue("3", fType.concreteMethodByName("xxx", "(I)Z") == null);
-	}
-	/**
-	 * Test JDI interfaces().
-	 */
-	public void testJDIInterfaces() {
-		boolean found = false;
-		boolean extra = false;
-		List interfaces = fType.interfaces();
-		assertEquals("1", 2, interfaces.size());
-		Iterator iterator = interfaces.iterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			Object next = iterator.next();
-			assertTrue("2." + i++, next instanceof InterfaceType);
-			InterfaceType ift = (InterfaceType) next;
-			if (ift.name().equals("java.lang.Runnable"))
-				found = true;
-			if (ift.name().equals("java.lang.Comparable"))
-				extra = true;
-		}
-		assertTrue("1", found);
-		assertTrue("2", !extra);
-	}
-	/**
-	 * Test JDI invokeMethod(ThreadReference, Method, Value[]).
-	 */
-	public void testJDIInvokeMethod() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		Method inv1 =
-			fType.concreteMethodByName(
-				"invoke1",
-				"(ILjava/lang/Object;)Ljava/lang/String;");
-		List args = new ArrayList();
-		args.add(fVM.mirrorOf(41));
-		args.add(null);
-		Exception oops = null;
-		Value val = null;
-		try {
-			val = fType.invokeMethod(thread, inv1, args, 0);
-		} catch (Exception exc) {
-			oops = exc;
-		}
-		assertTrue("1", oops == null);
-		assertEquals("2", val == null ? null : ((StringReference) val).value(), "41");
-	}
-	/**
-	 * Test JDI invokeMethod - failure.
-	 */
-	public void testJDIInvokeMethodFail() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		Method inv2 = fType.concreteMethodByName("invoke2", "()V");
-		Exception good = null;
-		Exception oops = null;
-		try {
-			fType.invokeMethod(thread, inv2, new ArrayList(), 0);
-		} catch (InvocationException exc) {
-			good = exc;
-		} catch (Exception exc) {
-			oops = exc;
-		}
-		assertTrue("1", oops == null);
-		assertTrue("2", good != null);
-	}
-	/**
-	 * Test JDI locationsOfLine(int).
-	 */
-	public void testJDILocationsOfLine() {
-		int lineNumber = getLocation().lineNumber();
-		List locations = null;
-		try {
-			locations = fType.locationsOfLine(lineNumber);
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 1, locations.size());
-	}
-	/**
-	 * Test JDI methodByName
-	 */
-	public void testJDIMethodByName() {
-		assertTrue("1", fType.methodsByName("main").size() == 1);
-	}
-	/**
-	 * Test JDI methodByNameAndSignature
-	 */
-	public void testJDIMethodByNameAndSignature() {
-		assertTrue("1", fType.methodsByName("printAndSignal", "()V").size() == 1);
-	}
-	/**
-	 * Test JDI methods().
-	 */
-	public void testJDIMethods() {
-		boolean found = false;
-		Iterator it = fType.methods().iterator();
-		while (it.hasNext()) {
-			Method mth = (Method) it.next();
-			if (mth.name().equals("printAndSignal"))
-				found = true;
-		}
-		assertTrue("1", found);
-	}
-	/**
-	 * Test JDI newInstance(ThreadReference, Method, Value[]).
-	 */
-	public void testJDINewInstance() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		Method constructor =
-			(Method) fType
-				.methodsByName("<init>", "(ILjava/lang/Object;Ljava/lang/Object;)V")
-				.get(0);
-		ObjectReference result = null;
-		ArrayList arguments = new ArrayList();
-		arguments.add(fVM.mirrorOf(0));
-		arguments.add(fVM.allThreads().get(0));
-		arguments.add(null);
-
-		try {
-			result = fType.newInstance(thread, constructor, arguments, 0);
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("2", false);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("3", false);
-		} catch (InvocationException e) {
-			assertTrue("4", false);
-		}
-		assertTrue("5", result != null);
-		assertTrue("6", result.referenceType().equals(fType));
-		waitUntilReady();
-	}
-	/**
-	 * Test JDI setValue(Field,Value) and JDWP 'Class - Set Fields Values'.
-	 */
-	public void testJDISetValue() {
-
-		// Get static field "fInt"
-		Field field = fType.fieldByName("fInt");
-		assertTrue("1", field != null);
-		assertTrue("2", field.isStatic());
-
-		// Remember old value
-		Value oldValue = fType.getValue(field);
-
-		// Set to new value
-		Value newValue = fVM.mirrorOf(1234);
-		try {
-			fType.setValue(field, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("3.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("3.2", false);
-		}
-
-		// Ensure the value as been set
-		assertEquals("4", fType.getValue(field), newValue);
-
-		// Cleanup
-		try {
-			fType.setValue(field, oldValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("5.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("5.2", false);
-		}
-
-		// Get static field "fString" to test if it can be set to null.
-		field = fType.fieldByName("fString");
-		assertTrue("6", field != null);
-		assertTrue("7", field.isStatic());
-
-		// Remember old value
-		oldValue = fType.getValue(field);
-
-		// Set to new value
-		newValue = null;
-		try {
-			fType.setValue(field, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("8.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("8.2", false);
-		}
-
-		// Ensure the value as been set
-		assertEquals("9", fType.getValue(field), newValue);
-
-		// Cleanup
-		try {
-			fType.setValue(field, oldValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("10.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("10.2", false);
-		}
-	}
-	/**
-	 * Test JDI subclasses().
-	 */
-	public void testJDISubclasses() {
-		List subclasses = fType.subclasses();
-		assertEquals("1", 1, subclasses.size());
-		Iterator iterator = subclasses.iterator();
-		while (iterator.hasNext()) {
-			ClassType sub = (ClassType) iterator.next();
-			assertEquals("2 " + sub.name(), fType, sub.superclass());
-		}
-	}
-	/**
-	 * Test JDI superclass() and JDWP 'Class - Get superclass'.
-	 */
-	public void testJDISuperclass() {
-		ClassType superclass = fType.superclass();
-		assertEquals("1", "java.util.Date", superclass.name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java
deleted file mode 100644
index ea6ee7a..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassesByNameTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.List;
-
-import com.sun.jdi.Type;
-
-/**
- * Tests for JDI com.sun.jdi.VirtualMachine.classesByName
- */
-public class ClassesByNameTest extends AbstractJDITest {
-
-	/**
-	 * Creates a new test.
-	 */
-	public ClassesByNameTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ClassesByNameTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine.classesByName";
-	}
-	/**
-	 * Test that there is a class object for 'int[]'
-	 */
-	public void testJDIIntArray() {
-		List classes = fVM.classesByName("int[]");
-		assertTrue(
-			"Should be a class for int[]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[I"));
-	}
-	/**
-	 * Test that there is a class object for 'int[][]'
-	 */
-	public void testJDIIntDoubleArray() {
-		List classes = fVM.classesByName("int[][]");
-		assertTrue(
-			"Should be a class for int[][]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[[I"));
-	}
-	public void testJDILongArray() {
-		List classes = fVM.classesByName("long[]");
-		assertTrue(
-			"Should be a class for long[]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[J"));
-	}
-	public void testJDILongDoubleArray() {
-		List classes = fVM.classesByName("long[][]");
-		assertTrue(
-			"Should be a class for long[][]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals("[[J"));
-	}
-	/**
-	 * Test that there is a class object for 'java.lang.String[]'
-	 */
-	public void testJDIStringArray() {
-		List classes = fVM.classesByName("java.lang.String[]");
-		assertTrue(
-			"Should be a class for java.lang.String[]",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals(
-					"[Ljava/lang/String;"));
-	}
-	/**
-	 * Test that there is a class object for 'java.lang.String'
-	 */
-	public void testJDIString() {
-		List classes = fVM.classesByName("java.lang.String");
-		assertTrue(
-			"Should be a class for java.lang.String",
-			classes.size() == 1
-				&& ((Type) classes.get(0)).signature().equals(
-					"Ljava/lang/String;"));
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java
deleted file mode 100644
index 42e22c7..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/DoubleValueTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.DoubleValue;
-
-/**
- * Tests for JDI com.sun.jdi.DoubleValue.
- */
-public class DoubleValueTest extends AbstractJDITest {
-
-	private DoubleValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public DoubleValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get double value for 12345.6789
-		fValue = fVM.mirrorOf(12345.6789);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new DoubleValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.DoubleValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(12345.6789)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(98765.4321)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals(
-			"5",
-			fValue.hashCode(),
-			fVM.mirrorOf(12345.6789).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(98765.4321).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 12345.6789 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java
deleted file mode 100644
index 9efc452..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventListener.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.BreakpointEvent;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.event.ThreadDeathEvent;
-import com.sun.jdi.event.ThreadStartEvent;
-import com.sun.jdi.event.VMDeathEvent;
-import com.sun.jdi.event.VMDisconnectEvent;
-
-/**
- * An event listener that handles all kinds of event coming from the VM.
- */
-
-public interface EventListener {
-	/**
-	 * Handles an access watchpoint event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean accessWatchpoint(AccessWatchpointEvent event);
-	/**
-	 * Handles a breakpoint event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean breakpoint(BreakpointEvent event);
-	/**
-	 * Handles a class prepare event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean classPrepare(ClassPrepareEvent event);
-	/**
-	 * Handles a class unload event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean classUnload(ClassUnloadEvent event);
-	/**
-	 * Handles an exception event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean exception(ExceptionEvent event);
-	public boolean methodEntry(MethodEntryEvent event);
-	public boolean methodExit(MethodExitEvent event);
-	/**
-	 * Handles a modification watchpoint event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean modificationWatchpoint(ModificationWatchpointEvent event);
-	/**
-	 * Handles a step event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean step(StepEvent event);
-	/**
-	 * Handles a thread death event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean threadDeath(ThreadDeathEvent event);
-	/**
-	 * Handles a thread start event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean threadStart(ThreadStartEvent event);
-	/**
-	 * Handles a vm death event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean vmDeath(VMDeathEvent event);
-	/**
-	 * Handles a vm disconnect event.
-	 * Returns whether the VM should be resumed if it was interrupted.
-	 */
-	public boolean vmDisconnect(VMDisconnectEvent event);
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java
deleted file mode 100644
index 920723e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventReader.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.Vector;
-
-import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.BreakpointEvent;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.EventIterator;
-import com.sun.jdi.event.EventQueue;
-import com.sun.jdi.event.EventSet;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.event.ThreadDeathEvent;
-import com.sun.jdi.event.ThreadStartEvent;
-import com.sun.jdi.event.VMDeathEvent;
-import com.sun.jdi.event.VMDisconnectEvent;
-import com.sun.jdi.request.EventRequest;
-
-/**
- * An event reader that continuously reads events coming from the VM
- * and dispatch them to the registered listeners.
- */
-
-public class EventReader extends AbstractReader {
-	private EventQueue fEventQueue;
-	private Vector fEventListeners = new Vector(); // A Vector of EventListener
-	/*
-	 * Creates a new event reader that will read from the given event queue.
-	 */
-	public EventReader(String name, EventQueue queue) {
-		super(name);
-		fEventQueue = queue;
-	}
-	/*
-	 * Registers the given event listener.
-	 */
-	public synchronized void addEventListener(EventListener listener) {
-		fEventListeners.addElement(listener);
-	}
-	/**
-	 * Dispatches the given event to the given listener.
-	 * Returns whether the VM should be resumed.
-	 */
-	private boolean dispath(Event event, EventListener listener) {
-		if (event instanceof AccessWatchpointEvent)
-			return listener.accessWatchpoint((AccessWatchpointEvent) event);
-		if (event instanceof BreakpointEvent)
-			return listener.breakpoint((BreakpointEvent) event);
-		if (event instanceof ClassPrepareEvent)
-			return listener.classPrepare((ClassPrepareEvent) event);
-		if (event instanceof ClassUnloadEvent)
-			return listener.classUnload((ClassUnloadEvent) event);
-		if (event instanceof ExceptionEvent)
-			return listener.exception((ExceptionEvent) event);
-		if (event instanceof MethodEntryEvent)
-			return listener.methodEntry((MethodEntryEvent) event);
-		if (event instanceof MethodExitEvent)
-			return listener.methodExit((MethodExitEvent) event);
-		if (event instanceof ModificationWatchpointEvent)
-			return listener.modificationWatchpoint(
-				(ModificationWatchpointEvent) event);
-		if (event instanceof StepEvent)
-			return listener.step((StepEvent) event);
-		if (event instanceof ThreadDeathEvent)
-			return listener.threadDeath((ThreadDeathEvent) event);
-		if (event instanceof ThreadStartEvent)
-			return listener.threadStart((ThreadStartEvent) event);
-		if (event instanceof VMDisconnectEvent)
-			return listener.vmDisconnect((VMDisconnectEvent) event);
-		if (event instanceof VMDeathEvent)
-			return listener.vmDeath((VMDeathEvent) event);
-		return true;
-	}
-	/**
-	 * Continuously reads events that are coming from the event queue.
-	 */
-	protected void readerLoop() {
-		while (!fIsStopping) {
-			try {
-				if (!fIsStopping) {
-					// Get the next event
-					EventSet eventSet = fEventQueue.remove();
-
-					// Dispatch the events
-					boolean shouldGo = true;
-					EventIterator iterator = eventSet.eventIterator();
-					while (iterator.hasNext()) {
-						Event event = iterator.nextEvent();
-						for (int i = 0; i < fEventListeners.size(); i++) {
-							EventListener listener =
-								(EventListener) fEventListeners.elementAt(i);
-							shouldGo = shouldGo & dispath(event, listener);
-						}
-						if (event instanceof VMDeathEvent)
-							stop();
-					}
-
-					// Let the VM go if it was interrupted
-					if ((!fIsStopping)
-						&& (eventSet != null)
-						&& (eventSet.suspendPolicy() == EventRequest.SUSPEND_ALL)
-						&& shouldGo)
-						synchronized (this) {
-							fEventQueue.virtualMachine().resume();
-						}
-				}
-			} catch (InterruptedException e) {
-				if (!fIsStopping) {
-					System.out.println("Event reader loop was interrupted");
-					return;
-				}
-			} catch (VMDisconnectedException e) {
-				return;
-			}
-		}
-	}
-	/*
-	 * De-registers the given event listener.
-	 */
-	public synchronized void removeEventListener(EventListener listener) {
-		fEventListeners.removeElement(listener);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java
deleted file mode 100644
index 71958be..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestManagerTest.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.Field;
-import com.sun.jdi.Location;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.ClassPrepareRequest;
-import com.sun.jdi.request.ClassUnloadRequest;
-import com.sun.jdi.request.EventRequestManager;
-import com.sun.jdi.request.ExceptionRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-import com.sun.jdi.request.StepRequest;
-import com.sun.jdi.request.ThreadDeathRequest;
-import com.sun.jdi.request.ThreadStartRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.EventRequestManager.
- */
-public class EventRequestManagerTest extends AbstractJDITest {
-
-	private EventRequestManager fManager;
-/**
- * Creates a new test.
- */
-public EventRequestManagerTest() {
-	super();
-}
-/**
- * Init the fields that are used by this test only.
- */
-public void localSetUp() {
-	// Get the event request manager
-	fManager = fVM.eventRequestManager();
-}
-/**
- * Run all tests and output to standard output.
- */
-public static void main(java.lang.String[] args) {
-	new EventRequestManagerTest().runSuite(args);
-}
-/**
- * Gets the name of the test case.
- */
-public String getName() {
-	return "com.sun.jdi.request.EventRequestManager";
-}
-/**
- * Test JDI createAccessWatchpointRequest(Field), accessWatchpointRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIAccessWatchpointRequest() {
-	if (!fVM.canWatchFieldAccess())
-		return;
-	
-	// Create an access watchpoint request
-	Field field = getField();
-	AccessWatchpointRequest request = fManager.createAccessWatchpointRequest(field);
-	assertEquals("1", field, request.field());
-
-	// Get all access watchpoint requests
-	List requests = fManager.accessWatchpointRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("2."+i++, iterator.next() instanceof AccessWatchpointRequest);
-	}
-	
-	// Delete an access watchpoint request
-	fManager.deleteEventRequest(request);
-	assertEquals("3", 0, fManager.accessWatchpointRequests().size());
-}
-/**
- * Test JDI createBreakpointRequest(Location), breakpointRequests(), 
- * deleteEventRequest(EventRequest) and deleteAllBreakpoints()
- */
-public void testJDIBreakpointRequest() {
-	// Create a breakpoint at a valid location
-	Location location = getLocation();
-	BreakpointRequest bp = fManager.createBreakpointRequest(location);
-	assertEquals("1", location, bp.location());
-
-	// Create a breakpoint at an invalid location
-	/* The following fails in Sun's VM:
-	location = getFrame(3).location(); // Inside a native method
-	try {
-		bp = fManager.createBreakpointRequest(location);
-		assertTrue("2", false);
-	} catch (InvalidLocationException e) {
-	}
-	*/
-
-	// Get all breakpoints
-	List breakpoints = fManager.breakpointRequests();
-	ListIterator iterator = breakpoints.listIterator();
-	while (iterator.hasNext()) {
-		Object breakpoint = iterator.next();
-		assertTrue("3", breakpoint instanceof BreakpointRequest);
-	}
-	
-	// Delete a breakpoint
-	fManager.deleteEventRequest(bp);
-	assertEquals("4", 0, fManager.breakpointRequests().size());
-
-	// Delete all breakpoints
-	fManager.createBreakpointRequest(location);
-	fManager.deleteAllBreakpoints();
-	assertEquals("5", 0, fManager.breakpointRequests().size());
-}
-/**
- * Test JDI createClassPrepareRequest(), classPrepareRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIClassPrepareRequest() {
-	// Create a class prepare request
-	ClassPrepareRequest request= fManager.createClassPrepareRequest();
-
-	// Get all class prepare requests
-	List requests = fManager.classPrepareRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("1."+i++, iterator.next() instanceof ClassPrepareRequest);
-	}
-	
-	// Delete a class prepare request
-	fManager.deleteEventRequest(request);
-	assertEquals("2", 0, fManager.classPrepareRequests().size());
-}
-/**
- * Test JDI createClassUnloadRequest(), classUnloadRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIClassUnloadRequest() {
-	// Create a class unload request
-	ClassUnloadRequest request= fManager.createClassUnloadRequest();
-
-	// Get all class unload requests
-	List requests = fManager.classUnloadRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("1."+i++, iterator.next() instanceof ClassUnloadRequest);
-	}
-	
-	// Delete a class unload request
-	fManager.deleteEventRequest(request);
-	assertEquals("2", 0, fManager.classUnloadRequests().size());
-}
-/**
- * Test JDI createExceptionRequest(), exceptionRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIExceptionRequest() {
-	// Create a exception request
-	ExceptionRequest request= fManager.createExceptionRequest(null, true, true);
-
-	// Get all exception requests
-	List requests = fManager.exceptionRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("1."+i++, iterator.next() instanceof ExceptionRequest);
-	}
-	
-	// Delete a exception request
-	fManager.deleteEventRequest(request);
-	assertEquals("2", i-1, fManager.exceptionRequests().size());
-}
-/**
- * Test JDI createModificationWatchpointRequest(Field), 
- * accessWatchpointRequests() and deleteEventRequest(EventRequest)
- */
-public void testJDIModificationWatchpointRequest() {
-	if (!fVM.canWatchFieldAccess())
-		return;
-
-	// Create a modification watchpoint
-	Field field = getField();
-	ModificationWatchpointRequest request = fManager.createModificationWatchpointRequest(field);
-	assertEquals("1", field, request.field());
-
-	// Get all modification watchpoints
-	List requests = fManager.modificationWatchpointRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("2."+i++, iterator.next() instanceof ModificationWatchpointRequest);
-	}
-	
-	// Delete a modification watchpoint
-	fManager.deleteEventRequest(request);
-	assertEquals("3", 0, fManager.modificationWatchpointRequests().size());
-}
-/**
- * Test JDI createStepRequest(), stepRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIStepRequest() {
-	// Create a step request
-	StepRequest request= fManager.createStepRequest(getThread(), StepRequest.STEP_LINE, StepRequest.STEP_OVER);
-
-	// Get all step requests
-	List requests = fManager.stepRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("1."+i++, iterator.next() instanceof StepRequest);
-	}
-	
-	// Delete a step request
-	fManager.deleteEventRequest(request);
-	assertEquals("2", 0, fManager.stepRequests().size());
-}
-/**
- * Test JDI createThreadDeathRequest(), threadDeathRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIThreadDeathRequest() {
-	// Create a ThreadDeath request
-	ThreadDeathRequest request= fManager.createThreadDeathRequest();
-
-	// Get all ThreadDeath requests
-	List requests = fManager.threadDeathRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("1."+i++, iterator.next() instanceof ThreadDeathRequest);
-	}
-	
-	// Delete a ThreadDeath request
-	fManager.deleteEventRequest(request);
-	assertEquals("2", 0, fManager.threadDeathRequests().size());
-}
-/**
- * Test JDI createThreadStartRequest(), classUnloadRequests()
- * and deleteEventRequest(EventRequest)
- */
-public void testJDIThreadStartRequest() {
-	// Create a ThreadStart request
-	ThreadStartRequest request= fManager.createThreadStartRequest();
-
-	// Get all ThreadStart requests
-	List requests = fManager.classUnloadRequests();
-	ListIterator iterator = requests.listIterator();
-	int i=0;
-	while (iterator.hasNext()) {
-		assertTrue("1."+i++, iterator.next() instanceof ThreadStartRequest);
-	}
-	
-	// Delete a ThreadStart request
-	fManager.deleteEventRequest(request);
-	assertEquals("2", 0, fManager.classUnloadRequests().size());
-}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
deleted file mode 100644
index be98ffc..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventRequestTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.EventRequest.
- */
-public class EventRequestTest extends AbstractJDITest {
-
-	private List fRequests = new LinkedList();
-	/**
-	 * Creates a new test.
-	 */
-	public EventRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of request
-		if (fVM.canWatchFieldAccess())
-			fRequests.add(getAccessWatchpointRequest());
-		fRequests.add(getBreakpointRequest());
-		fRequests.add(fVM.eventRequestManager().createClassPrepareRequest());
-		fRequests.add(fVM.eventRequestManager().createClassUnloadRequest());
-		fRequests.add(getExceptionRequest());
-		if (fVM.canWatchFieldModification())
-			fRequests.add(getModificationWatchpointRequest());
-		fRequests.add(
-			fVM.eventRequestManager().createStepRequest(
-				getThread(),
-				StepRequest.STEP_LINE,
-				StepRequest.STEP_OVER));
-		fRequests.add(fVM.eventRequestManager().createThreadDeathRequest());
-		fRequests.add(fVM.eventRequestManager().createThreadStartRequest());
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the requests we created in this test
-		fVM.eventRequestManager().deleteEventRequests(fRequests);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new EventRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.EventRequest";
-	}
-	/**
-	 * Test JDI disable(), enable(), isEnable() and setEnable(boolean).
-	 */
-	public void testJDIEnable() {
-		for (int i = 0; i < fRequests.size(); i++) {
-			EventRequest request = (EventRequest) fRequests.get(i);
-			assertTrue("1." + i, !request.isEnabled());
-			request.setEnabled(true);
-			assertTrue("2." + i, request.isEnabled());
-			request.setEnabled(false);
-			assertTrue("3." + i, !request.isEnabled());
-			request.enable();
-			assertTrue("4." + i, request.isEnabled());
-			request.disable();
-			assertTrue("5." + i, !request.isEnabled());
-		}
-	}
-	/**
-	 * Test JDI setSuspendPolicy(int) and suspendPolicy().
-	 */
-	public void testJDISuspendPolicy() {
-		int policy = EventRequest.SUSPEND_EVENT_THREAD;
-		for (int i = 0; i < fRequests.size(); i++) {
-			EventRequest request = (EventRequest) fRequests.get(i);
-			request.setSuspendPolicy(policy);
-		}
-		for (int i = 0; i < fRequests.size(); i++) {
-			EventRequest request = (EventRequest) fRequests.get(i);
-			assertTrue(String.valueOf(i), request.suspendPolicy() == policy);
-		}
-	}
-	/**
-	 * Test JDI putProperty and getProperty.
-	 */
-	public void testJDIProperties() {
-		EventRequest request = (EventRequest) fRequests.get(0);
-		request.putProperty(new Integer(0), "prop1");
-		String prop = (String) request.getProperty(new Integer(0));
-		assertTrue("1", prop.equals("prop1"));
-
-		request.putProperty(new Integer(0), null);
-		prop = (String) request.getProperty(new Integer(0));
-		assertTrue("2", prop == null);
-
-		request.putProperty(new Integer(0), "prop2");
-		request.putProperty(new Integer(0), "prop3");
-		prop = (String) request.getProperty(new Integer(0));
-		assertTrue("3", prop.equals("prop3"));
-
-		request.putProperty(new Integer(0), null);
-		prop = (String) request.getProperty(new Integer(0));
-		assertTrue("4", prop == null);
-
-		request.putProperty(new Integer(1), null);
-		prop = (String) request.getProperty(new Integer(1));
-		assertTrue("5", prop == null);
-
-		request.putProperty(new Integer(1), "prop1");
-		prop = (String) request.getProperty(new Integer(1));
-		assertTrue("6", prop.equals("prop1"));
-
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java
deleted file mode 100644
index 9fd9822..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import com.sun.jdi.event.Event;
-import com.sun.jdi.request.EventRequest;
-
-/**
- * Tests for JDI com.sun.jdi.event.Event.
- */
-public class EventTest extends AbstractJDITest {
-	private HashMap fAllEvents = new HashMap();
-	/**
-	 * Creates a new test.
-	 */
-	public EventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// All events...
-
-		EventRequest request;
-
-		// AccessWatchpointEvent
-		if (fVM.canWatchFieldAccess()) {
-			request = getAccessWatchpointRequest();
-			fAllEvents.put(
-				request,
-				triggerAndWait(request, "AccessWatchpointEvent", true));
-		}
-
-		// BreakpointEvent
-		request = getBreakpointRequest();
-		fAllEvents.put(
-			request,
-			triggerAndWait(request, "BreakpointEvent", true));
-
-		// ClassPrepareEvent
-		// TO DO
-
-		// ClassUnloadEvent
-		// TO DO
-
-		// ExceptionEvent
-		// TO DO
-
-		// ModificationWatchpointEvent
-		if (fVM.canWatchFieldModification()) {
-			request = getModificationWatchpointRequest();
-			fAllEvents.put(
-				request,
-				triggerAndWait(request, "ModificationWatchpointEvent", true));
-		}
-
-		// StepEvent
-		// TO DO
-
-		// ThreadEndEvent
-		// TO DO
-
-		// ThreadStartEvent
-		// TO DO
-
-		// VMDeathEvent
-		// TO DO?
-
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fBool" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Remove the requests
-		fVM.eventRequestManager().deleteEventRequests(
-			new LinkedList(fAllEvents.keySet()));
-
-		// Set the value of the "fBool" field back to its original value
-		resetField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new EventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.Event";
-	}
-	/**
-	 * Test JDI request().
-	 */
-	public void testJDIRequest() {
-		Iterator iterator = fAllEvents.keySet().iterator();
-		while (iterator.hasNext()) {
-			EventRequest request = (EventRequest) iterator.next();
-			Event event = (Event) fAllEvents.get(request);
-
-			assertEquals(event.toString(), request, event.request());
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
deleted file mode 100644
index d262bff..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/EventWaiter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.BreakpointEvent;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.ExceptionEvent;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.event.ThreadDeathEvent;
-import com.sun.jdi.event.ThreadStartEvent;
-import com.sun.jdi.event.VMDeathEvent;
-import com.sun.jdi.event.VMDisconnectEvent;
-import com.sun.jdi.request.EventRequest;
-
-/**
- * Listen for a specific kind of event.
- */
-public class EventWaiter implements EventListener {
-	protected EventRequest fRequest;
-	protected boolean fShouldGo;
-	protected Event fEvent;
-	/**
-	 * Creates a new EventWaiter for the given request. Sets whether it
-	 * should let the VM go after it got the event.
-	 */
-	public EventWaiter(EventRequest request, boolean shouldGo) {
-		fRequest = request;
-		fShouldGo = shouldGo;
-	}
-	public boolean accessWatchpoint(AccessWatchpointEvent event) {
-		return handleEvent(event);
-	}
-	public boolean methodEntry(MethodEntryEvent event) {
-		return handleEvent(event);
-	}
-	public boolean methodExit(MethodExitEvent event) {
-		return handleEvent(event);
-	}
-	public boolean breakpoint(BreakpointEvent event) {
-		return handleEvent(event);
-	}
-	public boolean classPrepare(ClassPrepareEvent event) {
-		return handleEvent(event);
-	}
-	public boolean classUnload(ClassUnloadEvent event) {
-		return handleEvent(event);
-	}
-	public boolean exception(ExceptionEvent event) {
-		return handleEvent(event);
-	}
-	/**
-	 * Handles an incoming event.
-	 * Returns whether the VM should be resumed if it was suspended.
-	 */
-	protected boolean handleEvent(Event event) {
-		if ((event.request() != null) && (event.request().equals(fRequest))) {
-			notifyEvent(event);
-			return fShouldGo;
-		} 
-		return true;
-	}
-	public boolean modificationWatchpoint(ModificationWatchpointEvent event) {
-		return handleEvent(event);
-	}
-	/**
-	 * Notify any object that is waiting for an event.
-	 */
-	synchronized protected void notifyEvent(Event event) {
-		notify();
-		fEvent = event;
-	}
-	public boolean step(StepEvent event) {
-		return handleEvent(event);
-	}
-	public boolean threadDeath(ThreadDeathEvent event) {
-		return handleEvent(event);
-	}
-	public boolean threadStart(ThreadStartEvent event) {
-		return handleEvent(event);
-	}
-	public boolean vmDeath(VMDeathEvent event) {
-		if (fEvent == null) {
-			// This is the last event we can ever get an this was not the one we expected
-			notifyEvent(null);
-			return true;
-		}
-		return handleEvent(event);
-	}
-	public boolean vmDisconnect(VMDisconnectEvent event) {
-		return handleEvent(event);
-	}
-	/**
-	 * Waits for the first event corresponding to this waiter's request.
-	 */
-	synchronized public Event waitEvent() throws InterruptedException {
-		if (fEvent == null) // If event didn't already come in
-			wait();
-		Event result = fEvent;
-		fEvent = null;
-		return result;
-	}
-	/**
-	 * Waits for the first event corresponding to this waiter's request
-	 * for the given time (in ms). If it times out, return null.
-	 */
-	synchronized public Event waitEvent(long time)
-		throws InterruptedException {
-		if (fEvent == null) // If event didn't already come in
-			wait(time);
-		Event result = fEvent;
-		fEvent = null;
-		return result;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java
deleted file mode 100644
index 37dd2ad..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionEventTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.event.ExceptionEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.ExceptionEvent.
- */
-public class ExceptionEventTest extends AbstractJDITest {
-
-	private ExceptionEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ExceptionEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger an exception event
-		fEvent =
-			(ExceptionEvent) triggerAndWait(getExceptionRequest(),
-				"ExceptionEvent",
-				false);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has interrupted the VM, so let it go
-		fVM.resume();
-
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ExceptionEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ExceptionEvent";
-	}
-	/**
-	 * Test JDI catchLocation().
-	 */
-	public void testJDICatchLocation() {
-		// Uncaught exception
-		assertTrue("1", fEvent.catchLocation() == null);
-
-		// TO DO: Caught exception
-	}
-	/**
-	 * Test JDI exception().
-	 */
-	public void testJDIException() {
-		ReferenceType expected =
-			(ReferenceType) fVM.classesByName("java.lang.Error").get(0);
-		assertEquals("1", expected, fEvent.exception().referenceType());
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Exception Event", fEvent.thread().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java
deleted file mode 100644
index 275d56d..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ExceptionRequestTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.request.ExceptionRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.ExceptionRequest.
- */
-public class ExceptionRequestTest extends AbstractJDITest {
-
-	private ExceptionRequest fRequest;
-	/**
-	 * Creates a new test .
-	 */
-	public ExceptionRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the exception request
-		fRequest = getExceptionRequest();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the exception request we created in this test
-		fVM.eventRequestManager().deleteEventRequest(fRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ExceptionRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.ExceptionRequest";
-	}
-	/**
-	 * Test JDI exception().
-	 */
-	public void testJDIException() {
-		assertTrue("1", fRequest.exception() == null);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java
deleted file mode 100644
index 295a539..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FieldTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.Field;
-
-/**
- * Tests for JDI com.sun.jdi.Field.
- */
-public class FieldTest extends AbstractJDITest {
-
-	private Field fField;
-	/**
-	 * Creates a new test.
-	 */
-	public FieldTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get static field "fObject"
-		fField = getField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new FieldTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Field";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fField.equals(fField));
-		Field other = getField("fString");
-		assertTrue("2", !fField.equals(other));
-		assertTrue("3", !fField.equals(new Object()));
-		assertTrue("4", !fField.equals(null));
-	}
-	/**
-	 * Test JDI isTransient().
-	 */
-	public void testJDIIsTransient() {
-		assertTrue("1", !fField.isTransient());
-	}
-	/**
-	 * Test JDI isVolatile().
-	 */
-	public void testJDIIsVolatile() {
-		assertTrue("1", !fField.isVolatile());
-	}
-	/**
-	 * Test JDI type().
-	 */
-	public void testJDIType() {
-		try {
-			assertEquals("1", getMainClass(), fField.type());
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI typeName().
-	 */
-	public void testJDITypeName() {
-		assertEquals(
-			"1",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			fField.typeName());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java
deleted file mode 100644
index 8a4797d..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FileConsoleReader.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class FileConsoleReader extends AbstractReader {
-	private InputStream fInput;
-	private FileOutputStream fFileOutputStream;
-	/*
-	 * Creates a new console reader that will read from the given input stream.
-	 */
-	public FileConsoleReader(String name, String fileName, InputStream input) {
-		super(name);
-		fInput = input;
-		try {
-			fFileOutputStream = new FileOutputStream(new File(fileName));
-		} catch (IOException e) {
-			System.out.println("Got exception: " + e.getMessage());
-		}
-	}
-	/**
-	 * Continuously reads events that are coming from the event queue.
-	 */
-	protected void readerLoop() {
-		BufferedReader input = new BufferedReader(new InputStreamReader(fInput));
-		try {
-			int read = 0;
-			while (!fIsStopping && read != -1) {
-				read = input.read();
-				if (read != -1) {
-					fFileOutputStream.write(read);
-				}
-				fFileOutputStream.flush();
-			}
-		} catch (IOException e) {
-		}
-	}
-
-	public void stop() {
-		try {
-			fFileOutputStream.close();
-		} catch (IOException e) {
-			System.out.println("Got exception: " + e.getMessage());
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java
deleted file mode 100644
index c784aed..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/FloatValueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.FloatValue;
-
-/**
- * Tests for JDI com.sun.jdi.FloatValue.
- */
-public class FloatValueTest extends AbstractJDITest {
-
-	private FloatValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public FloatValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get float value for 123.45f
-		fValue = fVM.mirrorOf(123.45f);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new FloatValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.FloatType";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(123.45f)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(54.321f)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf(123.45f).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(54.321f).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 123.45f == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java
deleted file mode 100644
index f7a43d5..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HotCodeReplacementTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.Location;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.ClassPrepareEvent;
-import com.sun.jdi.event.ClassUnloadEvent;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.request.ClassPrepareRequest;
-import com.sun.jdi.request.ClassUnloadRequest;
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for the hot code replacement JDI extension.
- */
-public class HotCodeReplacementTest extends AbstractJDITest {
-	/**
-	 * Creates a new test.
-	 */
-	public HotCodeReplacementTest() {
-		super();
-	}
-	private void dropTopFrame(
-		ThreadReference thread,
-		org.eclipse.jdi.hcr.ThreadReference hcrThread) {
-		// Get stack size
-		int stackSize = 0;
-		try {
-			stackSize = thread.frames().size();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("dropTopFrame.1", false);
-		}
-
-		// Create and install step out request
-		StepRequest request =
-			fVM.eventRequestManager().createStepRequest(
-				thread,
-				StepRequest.STEP_MIN,
-				StepRequest.STEP_OUT);
-		request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		request.enable();
-
-		// Prepare to receive the event
-		EventWaiter waiter = new EventWaiter(request, false);
-		fEventReader.addEventListener(waiter);
-
-		// Do return
-		boolean finallyBlocksSkipped = hcrThread.doReturn(null, true);
-		assertTrue("dropTopFrame.2", !finallyBlocksSkipped);
-
-		// Wait for the event to come in
-		Event event = waitForEvent(waiter, 10000); // Wait 10s max
-		assertTrue("dropTopFrame.3", event != null);
-		fEventReader.removeEventListener(waiter);
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		// Check thread has dropped top frame
-		assertTrue("dropTopFrame.4", thread.isSuspended());
-		int newStackSize = 0;
-		try {
-			newStackSize = thread.frames().size();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("dropTopFrame.5", false);
-		}
-		assertEquals("dropTopFrame.6", stackSize - 1, newStackSize);
-	}
-	
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(String[] args) {
-		new HotCodeReplacementTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "Hot code replacement extension to JDI (org.eclipse.jdi.hcr) tests";
-	}
-	private void reenterOnExit(ThreadReference thread) {
-		// Get top frame's location
-		Location location = null;
-		try {
-			StackFrame frame = (StackFrame) thread.frames(0, 1).get(0);
-			location = frame.location();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("reenterOnExit.1", false);
-		}
-
-		// Create and install reenter step request
-		org.eclipse.jdi.hcr.EventRequestManager eventRequestManager =
-			(org.eclipse.jdi.hcr.EventRequestManager) fVM.eventRequestManager();
-		org.eclipse.jdi.hcr.ReenterStepRequest request =
-			eventRequestManager.createReenterStepRequest(thread);
-		request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		request.enable();
-
-		// Prepare to receive the step event
-		EventWaiter waiter = new EventWaiter(request, false);
-		fEventReader.addEventListener(waiter);
-
-		// Resume thread with a doReturn so that the frame is reentered right away
-		 ((org.eclipse.jdi.hcr.ThreadReference) thread).doReturn(null, false);
-
-		// Wait for the step event to come in
-		StepEvent event = (StepEvent) waitForEvent(waiter, 10000); // Wait 10s max
-		assertTrue("reenterOnExit.2", event != null);
-		fEventReader.removeEventListener(waiter);
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		// Check that the top frame location is as expected
-		Location newLocation = null;
-		try {
-			StackFrame frame = (StackFrame) thread.frames(0, 1).get(0);
-			newLocation = frame.location();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("reenterOnExit.3", false);
-		}
-		assertTrue("reenterOnExit.4", !newLocation.equals(location));
-		assertTrue("reenterOnExit.5", newLocation.codeIndex() <= location.codeIndex());
-
-	}
-	private void reloadClasses() {
-		// Gets the old class
-		ReferenceType oldType = getMainClass();
-
-		// Create and install class unload and class prepare event requests
-		ClassUnloadRequest unloadRequest =
-			fVM.eventRequestManager().createClassUnloadRequest();
-		unloadRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		unloadRequest.enable();
-		ClassPrepareRequest loadRequest =
-			fVM.eventRequestManager().createClassPrepareRequest();
-		loadRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
-		loadRequest.enable();
-
-		// Prepare to receive the class unload event
-		EventWaiter unloadEventWaiter = new EventWaiter(unloadRequest, true);
-		fEventReader.addEventListener(unloadEventWaiter);
-
-		// Prepare to receive the class prepare event
-		EventWaiter loadEventWaiter = new EventWaiter(loadRequest, true);
-		fEventReader.addEventListener(loadEventWaiter);
-
-		// Reload classes
-		org.eclipse.jdi.hcr.VirtualMachine vm =
-			(org.eclipse.jdi.hcr.VirtualMachine) fVM;
-		int result =
-			vm.classesHaveChanged(
-				new String[] { "org.eclipse.debug.jdi.tests.program.MainClass" });
-		assertEquals("reloadClasses.1", org.eclipse.jdi.hcr.VirtualMachine.RELOAD_SUCCESS, result);
-
-		// Wait for the class unload event to come in
-		ClassUnloadEvent unloadEvent =
-			(ClassUnloadEvent) waitForEvent(unloadEventWaiter, 10000);
-		// Wait 10s max
-		assertTrue("reloadClasses.2", unloadEvent != null);
-		fEventReader.removeEventListener(unloadEventWaiter);
-		fVM.eventRequestManager().deleteEventRequest(unloadRequest);
-		assertEquals(
-			"reloadClasses.3",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			unloadEvent.className());
-
-		// Wait for the class prepare event to come in
-		ClassPrepareEvent loadEvent =
-			(ClassPrepareEvent) waitForEvent(loadEventWaiter, 10000);
-		// Wait 10s max
-		assertTrue("reloadClasses.4", loadEvent != null);
-		fEventReader.removeEventListener(loadEventWaiter);
-		fVM.eventRequestManager().deleteEventRequest(loadRequest);
-		ReferenceType newType = loadEvent.referenceType();
-		assertEquals(
-			"reloadClasses.5",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			newType.name());
-		assertTrue("reloadClasses.6", !oldType.equals(newType));
-	}
-	/**
-	 * Use case 1:
-	 * . get a thread and suspend it
-	 * . get hot code replacement capabilities
-	 * . drop the top a frame
-	 * . reload some classes
-	 * . request reeenter on exit
-	 * . resume thread
-	 * . get step event
-	 * . get class file version for some classes
-	 */
-	public void testJDIUseCase1() {
-		// Get the suspended thread
-		ThreadReference thread = getThread();
-		assertTrue("1", thread.isSuspended());
-		assertEquals("2", 1, thread.suspendCount());
-		org.eclipse.jdi.hcr.ThreadReference hcrThread =
-			(org.eclipse.jdi.hcr.ThreadReference) thread;
-
-		org.eclipse.jdi.hcr.VirtualMachine vm =
-			(org.eclipse.jdi.hcr.VirtualMachine) fVM;
-
-		
-		// Drop the top a frame
-		try {
-			if (vm.canDoReturn()) {
-				dropTopFrame(thread, hcrThread);
-			}
-		} catch (UnsupportedOperationException e) {
-			//not using a VM that supports the extension
-			return;
-		}
-
-		// Reload classes
-		if (vm.canReloadClasses())
-			reloadClasses();
-
-		// Reenter on exit
-		if (vm.canReenterOnExit())
-			reenterOnExit(thread);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		waitUntilReady();
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java
deleted file mode 100644
index c5ca788..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/IntegerValueTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.IntegerValue;
-
-/**
- * Tests for JDI com.sun.jdi.IntegerValue.
- */
-public class IntegerValueTest extends AbstractJDITest {
-
-	private IntegerValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public IntegerValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get int value for 12345
-		fValue = fVM.mirrorOf(12345);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new IntegerValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.IntegerValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(12345)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(54321)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals("5", fValue.hashCode(), fVM.mirrorOf(12345).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(54321).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 12345 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java
deleted file mode 100644
index 6488d57..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/InterfaceTypeTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.InterfaceType;
-import com.sun.jdi.Method;
-
-/**
- * Tests for JDI com.sun.jdi.InterfaceType
- * and JDWP Interface command set.
- */
-public class InterfaceTypeTest extends AbstractJDITest {
-
-	private InterfaceType fType;
-	/**
-	 * Creates a new test.
-	 */
-	public InterfaceTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get interface type "org.eclipse.debug.jdi.tests.program.Printable"
-		fType = getInterfaceType();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new InterfaceTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.InterfaceType";
-	}
-	/**
-	 * Test JDI allFields().
-	 */
-	public void testJDIAllFields() {
-		assertEquals("1", 1, fType.allFields().size());
-	}
-	/**
-	 * Test JDI allMethods().
-	 */
-	public void testJDIAllMethods() {
-		boolean found = false;
-		Iterator it = fType.allMethods().iterator();
-		while (it.hasNext()) {
-			Method mth = (Method) it.next();
-			if (mth.name().equals("print")) {
-				found = true;
-			}
-		}
-		assertTrue("1", fType.allMethods().size() == 1);
-		assertTrue("2", found);
-	}
-	/**
-	 * Test JDI implementors().
-	 */
-	public void testJDIImplementors() {
-		List implementors = fType.implementors();
-		assertEquals("1", 1, implementors.size());
-		ClassType implementor = (ClassType) implementors.get(0);
-		assertEquals("2", getMainClass(), implementor);
-	}
-	/**
-	 * Test JDI subinterfaces().
-	 */
-	public void testJDISubinterfaces() {
-		List subinterfaces = fType.subinterfaces();
-		assertEquals("1", 0, subinterfaces.size());
-	}
-	/**
-	 * Test JDI superinterfaces().
-	 */
-	public void testJDISuperinterfaces() {
-		List superinterfaces = fType.superinterfaces();
-		assertEquals("1", 1, superinterfaces.size());
-		InterfaceType superinterface = (InterfaceType) superinterfaces.get(0);
-		InterfaceType expected =
-			(InterfaceType) fVM.classesByName("java.lang.Cloneable").get(0);
-		assertEquals("2", expected, superinterface);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java
deleted file mode 100644
index f29c1c5..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.lang.reflect.Method;
-import junit.framework.TestCase;
-
-/**
- * Wrapper to be able to use the JDI tests in a test suite without
- * starting and shuting down the VM after each test.
- */
-public class JDITestCase extends TestCase {
-	private AbstractJDITest fTest;
-	/**
-	 * Creates a new test for the given JDI test.
-	 */
-	public JDITestCase(AbstractJDITest test, String name) {
-		super(name);
-		fTest = test;
-	}
-	/**
-	 * Override to run the test and assert its state.
-	 * @exception Throwable if any exception is thrown
-	 */
-	protected void runTest() throws Throwable {
-		Method runMethod = null;
-		try {
-			runMethod = fTest.getClass().getMethod(getName(), new Class[0]);
-		} catch (NoSuchMethodException e) {
-			e.fillInStackTrace();
-			throw e;
-		}
-		try {
-			fTest.verbose("Running " + getName());
-			runMethod.invoke(fTest, new Class[0]);
-		} catch (java.lang.reflect.InvocationTargetException e) {
-			if (e.getTargetException() instanceof NotYetImplementedException)
-				System.out.println("\n" + getName() + " is not yet implemented.");
-			else {
-				e.fillInStackTrace();
-				throw e.getTargetException();
-			}
-		} catch (IllegalAccessException e) {
-			e.fillInStackTrace();
-			throw e;
-		}
-	}
-	/**
-	 * Init tests
-	 */
-	protected void setUp() {
-		// Ignore setUp since it is done once for all tests in the test suite
-	}
-	/**
-	 * Tears down the fixture.
-	 */
-	protected void tearDown() {
-		// Ignore tearDown since it is done once for all tests in the test suite
-	}
-	/**
-	 * Returns a string representation of the test case
-	 */
-	public String toString() {
-		return fTest.getClass().getName() + "." + getName() + "()";
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java
deleted file mode 100644
index 58ab27f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/JDITestSuite.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-/**
- * A JDI test suite runs all tests defined in a JDI test case class.
- * It runs the setUp method once before running the tests and the
- * tearDown method once after.
- */
-public class JDITestSuite extends TestSuite {
-	private AbstractJDITest fTest;
-	/**
-	 * Creates a new test suite for the given JDI test.
-	 */
-	public JDITestSuite(AbstractJDITest test) {
-		super();
-		fTest = test;
-	}
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 */
-	public void run(TestResult result) {
-		fTest.setUp();
-		super.run(result);
-		fTest.tearDown();
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java
deleted file mode 100644
index 52508ee..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocalVariableTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.LocalVariable;
-
-/**
- * Tests for JDI com.sun.jdi.LocalVariable.
- */
-public class LocalVariableTest extends AbstractJDITest {
-
-	private LocalVariable fVar;
-	/**
-	 * Creates a new test.
-	 */
-	public LocalVariableTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Wait for the program to be ready
-		waitUntilReady();
-
-		// Get local variable "t" in the frame running MainClass.run()
-		fVar = getLocalVariable();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LocalVariableTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.LocalVariable";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fVar.equals(fVar));
-		LocalVariable other = null;
-		try {
-			other = getFrame(RUN_FRAME_OFFSET).visibleVariableByName("o");
-		} catch (AbsentInformationException e) {
-			assertTrue("2", false);
-		}
-		assertTrue("3", !fVar.equals(other));
-		assertTrue("4", !fVar.equals(new Object()));
-		assertTrue("5", !fVar.equals(null));
-		assertTrue("6", fVar.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI isArgument().
-	 */
-	public void testJDIIsArgument() {
-		assertTrue("1", !fVar.isArgument());
-	}
-	/**
-	 * Test JDI isVisible(StackFrame).
-	 */
-	public void testJDIIsVisible() {
-		assertTrue("1", fVar.isVisible(getFrame(RUN_FRAME_OFFSET)));
-
-		boolean gotException = false;
-		try {
-			fVar.isVisible(getFrame(0));
-		} catch (IllegalArgumentException e) {
-			gotException = true;
-		}
-		assertTrue("2", gotException);
-	}
-	/**
-	 * Test JDI name().
-	 */
-	public void testJDIName() {
-		assertEquals("1", "t", fVar.name());
-	}
-	/**
-	 * Test JDI signature().
-	 */
-	public void testJDISignature() {
-		assertEquals("1", "Ljava/lang/Thread;", fVar.signature());
-	}
-	/**
-	 * Test JDI type().
-	 */
-	public void testJDIType() {
-		try {
-			assertEquals(
-				"1",
-				fVM.classesByName("java.lang.Thread").get(0),
-				fVar.type());
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI typeName().
-	 */
-	public void testJDITypeName() {
-		assertEquals("1", "java.lang.Thread", fVar.typeName());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java
deleted file mode 100644
index 30213fb..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocatableTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.Locatable;
-import com.sun.jdi.Location;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.Locatable.
- */
-public class LocatableTest extends AbstractJDITest {
-
-	private List fLocatables = new LinkedList();
-	private List fRequests = new LinkedList();
-	/**
-	 * Creates a new test.
-	 */
-	public LocatableTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of locatable
-
-		BreakpointRequest bp = getBreakpointRequest();
-		fLocatables.add(bp); // BreakpointRequest
-
-		//ExceptionRequest er = getExceptionRequest();
-		//fLocatables.add(triggerAndWait(er, 'e')); // ExceptionEvent
-
-		fLocatables.add(getMethod()); // Method
-
-		fLocatables.add(triggerStepAndWait()); // StepEvent
-
-		fRequests.add(bp);
-		fLocatables.add(triggerAndWait(bp, "BreakpointEvent", true));
-		// BreakpointEvent
-
-		if (fVM.canWatchFieldAccess()) {
-			AccessWatchpointRequest ap = getAccessWatchpointRequest();
-			fRequests.add(ap);
-			fLocatables.add(triggerAndWait(ap, "AccessWatchpointEvent", true));
-			// AccessWatchpointEvent
-		}
-
-		if (fVM.canWatchFieldModification()) {
-			ModificationWatchpointRequest mp =
-				getModificationWatchpointRequest();
-			fRequests.add(mp);
-			fLocatables.add(
-				triggerAndWait(mp, "ModificationWatchpointEvent", false));
-			// ModificationWatchpointEvent
-		}
-
-		// Note we can use the stack frame only if the thread is suspended,
-		// that's why the previoue triggerAndWait doesn't resume the thread
-		// and this Locatable is added last in the list
-		fLocatables.add(getFrame(RUN_FRAME_OFFSET)); // StackFrame
-
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fBool" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Delete the event requests we created in this test
-		fVM.eventRequestManager().deleteEventRequests(fRequests);
-
-		// Set the value of the "fBool" field back to its original value
-		resetField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LocatableTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Locatable";
-	}
-	/**
-	 * Test JDI location()
-	 */
-	public void testJDILocation() {
-		ListIterator iterator = fLocatables.listIterator();
-		while (iterator.hasNext()) {
-			Locatable locatable = (Locatable) iterator.next();
-			Location location = locatable.location();
-			assertTrue("1." + locatable, location != null);
-			assertTrue(
-				"2." + locatable,
-				(location.codeIndex()) >= 0 || (location.codeIndex() == -1));
-			assertTrue("3." + locatable, location.declaringType() != null);
-			assertTrue(
-				"4." + locatable,
-				(location.lineNumber() > 0) || (location.lineNumber() == -1));
-			assertNotNull("5", location.method());
-			try {
-				location.sourceName();
-			} catch (AbsentInformationException e) {
-				assertTrue("7", false);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java
deleted file mode 100644
index 49a0edf..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LocationTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-
-/**
- * Tests for JDI com.sun.jdi.Location.
- */
-public class LocationTest extends AbstractJDITest {
-
-	private Location fLocation;
-	/**
-	 * Creates a new test.
-	 */
-	public LocationTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Ensure we're in a good state
-		fVM.resume();
-		waitUntilReady();
-
-		// Get the location of the stack frame running the method MainClass.run()
-		fLocation = getLocation();
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LocationTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Location";
-	}
-	/**
-	 * Test JDI codeIndex().
-	 */
-	public void testJDICodeIndex() {
-		fLocation.codeIndex();
-	}
-	/**
-	 * Test JDI declaringType().
-	 */
-	public void testJDIDeclaringType() {
-		ReferenceType expected = getMainClass();
-		ReferenceType declaringType = fLocation.declaringType();
-		assertEquals("1", expected.name(), declaringType.name());
-		// Use name to work around a pb in Sun's VM
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fLocation.equals(fLocation));
-		Location other = getFrame(0).location();
-		assertTrue("2", !fLocation.equals(other));
-		assertTrue("3", !fLocation.equals(new Object()));
-		assertTrue("4", !fLocation.equals(null));
-		assertTrue("5", fLocation.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI lineNumber().
-	 */
-	public void testJDILineNumber() {
-		assertEquals("1", 120, fLocation.lineNumber());
-	}
-	/**
-	 * Test JDI method().
-	 */
-	public void testJDIMethod() {
-		Method method = fLocation.method();
-		assertEquals("1", "print", method.name());
-	}
-	/**
-	 * Test JDI sourceName().
-	 */
-	public void testJDISourceName() {
-		String sourceName = null;
-		try {
-			sourceName = fLocation.sourceName();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", "MainClass.java", sourceName);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java
deleted file mode 100644
index c8899e0..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/LongValueTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.LongValue;
-
-/**
- * Tests for JDI com.sun.jdi.LongValue.
- */
-public class LongValueTest extends AbstractJDITest {
-
-	private LongValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public LongValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get long value for 123456789l
-		fValue = fVM.mirrorOf(123456789l);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new LongValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.LongValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf(123456789l)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf(987654321l)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals(
-			"5",
-			fValue.hashCode(),
-			fVM.mirrorOf(123456789l).hashCode());
-		assertTrue("6", fValue.hashCode() != fVM.mirrorOf(987654321l).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", 123456789l == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java
deleted file mode 100644
index 02ae207..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodEntryRequestTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.MethodEntryEvent;
-import com.sun.jdi.request.MethodEntryRequest;
-
-public class MethodEntryRequestTest extends AbstractJDITest {
-
-	public void localSetUp() {
-	}
-
-	public void localTearDown() {
-		fVM.resume();
-		waitUntilReady();
-	}
-
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MethodEntryRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.MethodEntryRequest";
-	}
-
-	protected MethodEntryRequest getMethodEntryRequest() {
-		return fVM.eventRequestManager().createMethodEntryRequest();
-	}
-
-	public void testJDIWithoutFilter() {
-		MethodEntryRequest request = getMethodEntryRequest();
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		assertEquals(getThread(), event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassExclusionFilter() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		request.addClassExclusionFilter("org.eclipse.debug.jdi.tests.program.*");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertTrue("1", !r.name().startsWith("org.eclipse.debug.jdi.tests.program."));
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter1() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		ClassType clazz = getClass("java.io.PrintStream");
-		request.addClassFilter(clazz);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals(clazz, r);
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter2() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		request.addClassFilter("java.io.PrintStream");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals("java.io.PrintStream", r.name());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithThreadFilter() {
-		MethodEntryRequest request = getMethodEntryRequest();
-		ThreadReference thr = getMainThread();
-		request.addThreadFilter(thr);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodEntryEvent event = (MethodEntryEvent) e;
-		assertEquals(thr, event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java
deleted file mode 100644
index 0cdf0ef..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodExitRequestTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Method;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.Event;
-import com.sun.jdi.event.MethodExitEvent;
-import com.sun.jdi.request.MethodExitRequest;
-
-public class MethodExitRequestTest extends AbstractJDITest {
-
-	public void localSetUp() {
-	}
-	public void localTearDown() {
-		fVM.resume();
-		waitUntilReady();
-	}
-
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MethodExitRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.MethodExitRequest";
-	}
-
-	protected MethodExitRequest getMethodExitRequest() {
-		return fVM.eventRequestManager().createMethodExitRequest();
-	}
-	public void testJDIWithoutFilter() {
-		MethodExitRequest request = getMethodExitRequest();
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		assertEquals(getThread(), event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassExclusionFilter() {
-		MethodExitRequest request = getMethodExitRequest();
-		request.addClassExclusionFilter("org.eclipse.debug.jdi.tests.program.*");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertTrue("1", !r.name().startsWith("org.eclipse.debug.jdi.tests.program."));
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter1() {
-		MethodExitRequest request = getMethodExitRequest();
-		ClassType clazz = getClass("java.io.PrintStream");
-		request.addClassFilter(clazz);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals(clazz, r);
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithClassFilter2() {
-		MethodExitRequest request = getMethodExitRequest();
-		request.addClassFilter("java.io.PrintStream");
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		Method m = event.method();
-		ReferenceType r = m.location().declaringType();
-		assertEquals("java.io.PrintStream", r.name());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIWithThreadFilter() {
-		MethodExitRequest request = getMethodExitRequest();
-		ThreadReference thr = getMainThread();
-		request.addThreadFilter(thr);
-
-		Event e = triggerAndWait(request, "BreakpointEvent", true);
-		assertEquals(request, e.request());
-
-		MethodExitEvent event = (MethodExitEvent) e;
-		assertEquals(thr, event.thread());
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java
deleted file mode 100644
index 97d7525..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MethodTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.List;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.LocalVariable;
-import com.sun.jdi.Location;
-import com.sun.jdi.Method;
-import com.sun.jdi.NativeMethodException;
-import com.sun.jdi.VoidType;
-
-/**
- * Tests for JDI com.sun.jdi.Method
- * and JDWP Method command set.
- */
-public class MethodTest extends AbstractJDITest {
-
-	private Method fMethod1;
-	/**
-	 * Creates a new test.
-	 */
-	public MethodTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get method useLocalVars(Thread, MainClass)
-		fMethod1 =
-			getMethod(
-				"useLocalVars",
-				"(Ljava/lang/Thread;Lorg/eclipse/debug/jdi/tests/program/MainClass;)V");
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MethodTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Method";
-	}
-	/**
-	 * Test JDI arguments() and JDWP 'Method - Get variable table'.
-	 */
-	public void testJDIArguments() {
-		List arguments = null;
-		try {
-			arguments = fMethod1.arguments();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, arguments.size());
-		assertEquals("3", "t", ((LocalVariable) arguments.get(0)).name());
-		assertEquals("4", "o", ((LocalVariable) arguments.get(1)).name());
-	}
-	/**
-	 * Test JDI argumentTypeNames().
-	 */
-	public void testJDIArgumentTypeNames() {
-		List names = fMethod1.argumentTypeNames();
-		assertEquals("1", 2, names.size());
-		assertEquals("2", "java.lang.Thread", names.get(0));
-		assertEquals(
-			"3",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			names.get(1));
-	}
-	/**
-	 * Test JDI argumentTypes().
-	 */
-	public void testJDIArgumentTypes() {
-		List types = null;
-		try {
-			types = fMethod1.argumentTypes();
-		} catch (ClassNotLoadedException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, types.size());
-		assertEquals("3", fVM.classesByName("java.lang.Thread").get(0), types.get(0));
-		assertEquals(
-			"4",
-			fVM.classesByName("org.eclipse.debug.jdi.tests.program.MainClass").get(0),
-			types.get(1));
-	}
-	/**
-	 * Test JDI bytecodes().
-	 */
-	public void testJDIBytecodes() {
-		if (!fVM.canGetBytecodes())
-			return;
-
-		byte[] bytecodes = fMethod1.bytecodes();
-		assertEquals("1", 27, bytecodes.length);
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fMethod1.equals(fMethod1));
-		Method other = getMethod("run", "()V");
-		assertTrue("2", !fMethod1.equals(other));
-		assertTrue("3", !fMethod1.equals(new Object()));
-		assertTrue("4", !fMethod1.equals(null));
-		assertTrue("5", fMethod1.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI isAbstract().
-	 */
-	public void testJDIIsAbstract() {
-		assertTrue("1", !fMethod1.isAbstract());
-	}
-	/**
-	 * Test JDI isConstructor().
-	 */
-	public void testJDIIsConstructor() {
-		assertTrue("1", !fMethod1.isConstructor());
-	}
-	/**
-	 * Test JDI isNative().
-	 */
-	public void testJDIIsNative() {
-		assertTrue("1", !fMethod1.isNative());
-	}
-	/**
-	 * Test JDI isStaticInitializer().
-	 */
-	public void testJDIIsStaticInitializer() {
-		assertTrue("1", !fMethod1.isStaticInitializer());
-	}
-	/**
-	 * Test JDI isSynchronized().
-	 */
-	public void testJDIIsSynchronized() {
-		assertTrue("1", !fMethod1.isSynchronized());
-	}
-	/**
-	 * Test JDI locationOfCodeIndex(long).
-	 */
-	public void testJDILocationOfCodeIndex() {
-		Location expected = fMethod1.location();
-		Location result = fMethod1.locationOfCodeIndex(expected.codeIndex());
-		assertEquals("1", expected, result);
-	}
-	/**
-	 * Test JDI locationsOfLine(int) and JDWP 'Method - Get line table'.
-	 */
-	public void testJDILocationsOfLine() {
-		int expected = fMethod1.location().lineNumber();
-		List locations = null;
-		try {
-			locations = fMethod1.locationsOfLine(expected);
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 1, locations.size());
-		assertEquals("3", expected, ((Location) locations.get(0)).lineNumber());
-	}
-	/**
-	 * Test JDI returnType().
-	 */
-	public void testJDIReturnType() {
-		try {
-			assertTrue("1", fMethod1.returnType() instanceof VoidType);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI returnTypeName().
-	 */
-	public void testJDIReturnTypeName() {
-		assertEquals("1", "void", fMethod1.returnTypeName());
-	}
-	/**
-	 * Test JDI variables() and JDWP 'Method - Get variable table'.
-	 */
-	public void testJDIVariables() {
-		List variables = null;
-		try {
-			variables = fMethod1.variables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, variables.size());
-		assertEquals("3", "t", ((LocalVariable) variables.get(0)).name());
-		assertEquals("4", "o", ((LocalVariable) variables.get(1)).name());
-	}
-
-	/**
-	 * Test JDI variables() and JDWP 'Method - Get variable table'
-	 * for native method.
-	 */
-	public void testJDINativeMethodVariables() {
-		Method method = getMethod("java.lang.Thread", "sleep", "(J)V");
-
-		try {
-			method.variables();
-		} catch (AbsentInformationException e) {
-			// since 1.4, returns an AbsentInformationException for native methods
-			assertFalse("1", "1.3".equals(fVM.version()));
-			return;
-		} catch (NativeMethodException nme) {
-			assertTrue("1", "1.3".equals(fVM.version()));
-			return;
-		}
-		assertTrue("Should have thrown native method exception", false);
-	}
-
-	/**
-	 * Test JDI variables() and JDWP 'Method - Get variable table'
-	 * for non-native method with a long argument.
-	 */
-	public void testJDIMethodVariablesWithLong() {
-		List variables = null;
-		Method method = getMethod("variablesTest", "(J)V");
-
-		try {
-			variables = method.variables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("1", 1, variables.size());
-	}
-
-	/**
-	 * Test JDI variablesByName(String) and JDWP 'Method - Get variable table'.
-	 */
-	public void testJDIVariablesByName() {
-		String varName = "t";
-		List variables = null;
-		try {
-			variables = fMethod1.variablesByName(varName);
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 1, variables.size());
-		assertEquals("3", varName, ((LocalVariable) variables.get(0)).name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java
deleted file mode 100644
index 296b16f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/MirrorTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.Mirror;
-import com.sun.jdi.request.AccessWatchpointRequest;
-import com.sun.jdi.request.BreakpointRequest;
-import com.sun.jdi.request.ModificationWatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.Mirror.
- */
-public class MirrorTest extends AbstractJDITest {
-	List fMirrors = new LinkedList();
-	/**
-	 * Creates a new test.
-	 */
-	public MirrorTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of concrete mirror that can be found in the VM
-		// in alphabetical order.
-
-		//TO DO: Add events too
-
-		fMirrors = new LinkedList();
-
-		if (fVM.canWatchFieldAccess())
-			fMirrors.add(getAccessWatchpointRequest());
-		// AccessWatchpointRequest
-
-		fMirrors.add(getObjectArrayReference()); // ArrayReference
-		fMirrors.add(getArrayType()); // ArrayType
-		fMirrors.add(fVM.mirrorOf(true)); // BooleanValue
-		fMirrors.add(getBreakpointRequest()); // BreakpointRequest
-		fMirrors.add(fVM.mirrorOf((byte) 1)); // ByteValue
-		fMirrors.add(fVM.mirrorOf('1')); // CharValue
-		fMirrors.add(getClassLoaderReference()); // ClassLoaderReference
-		fMirrors.add(getMainClass()); // ClassType
-		fMirrors.add(fVM.mirrorOf(12345.6789)); // DoubleValue
-		fMirrors.add(fVM.eventRequestManager()); // EventRequestManager
-		fMirrors.add(fVM.eventQueue()); // EventQueue
-		fMirrors.add(getField()); // Field
-		fMirrors.add(fVM.mirrorOf(123.45f)); // FieldValue
-		fMirrors.add(fVM.mirrorOf(12345)); // IntegerValue
-		fMirrors.add(getInterfaceType()); // InterfaceType
-		fMirrors.add(getLocalVariable()); // LocalVariable
-		fMirrors.add(getLocation()); // Location
-		fMirrors.add(fVM.mirrorOf(123456789l)); // LongValue
-		fMirrors.add(getMethod()); // Method
-
-		if (fVM.canWatchFieldModification())
-			fMirrors.add(getModificationWatchpointRequest());
-		// ModificationWatchpointRequest
-
-		fMirrors.add(getObjectReference()); // ObjectReference
-		fMirrors.add(fVM.mirrorOf((short) 12345)); // ShortValue
-		fMirrors.add(getFrame(RUN_FRAME_OFFSET)); // StackFrame
-		fMirrors.add(getStringReference()); // StringReference
-		fMirrors.add(getThread().threadGroup()); // ThreadGroupReference
-		fMirrors.add(getThread()); // ThreadReference
-		fMirrors.add(fVM); // VirtualMachine
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		ListIterator iterator = fMirrors.listIterator();
-		while (iterator.hasNext()) {
-			Object mirror = iterator.next();
-
-			// Delete the access watchpoint request we created in this test
-			if (mirror instanceof AccessWatchpointRequest)
-				fVM.eventRequestManager().deleteEventRequest(
-					(AccessWatchpointRequest) mirror);
-
-			// Delete the breakpoint request we created in this test
-			if (mirror instanceof BreakpointRequest)
-				fVM.eventRequestManager().deleteEventRequest(
-					(BreakpointRequest) mirror);
-
-			// Delete the modification watchpoint request we created in this test
-			if (mirror instanceof ModificationWatchpointRequest)
-				fVM.eventRequestManager().deleteEventRequest(
-					(ModificationWatchpointRequest) mirror);
-		}
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new MirrorTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Mirror";
-	}
-	/**
-	 * Test JDI toString().
-	 */
-	public void testJDIToString() {
-		for (int i = 0; i < fMirrors.size(); i++) {
-			Mirror mirror = (Mirror) fMirrors.get(i);
-			assertNotNull(Integer.toString(i), mirror.toString());
-		}
-	}
-	/**
-	 * Test JDI virtualMachine().
-	 */
-	public void testJDIVirtualMachine() {
-		for (int i = 0; i < fMirrors.size(); i++) {
-			Mirror mirror = (Mirror) fMirrors.get(i);
-			assertEquals(Integer.toString(i), fVM, mirror.virtualMachine());
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java
deleted file mode 100644
index 46d5eb4..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ModificationWatchpointEventTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.StringReference;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.request.WatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.ModificationWatchpointEvent.
- */
-public class ModificationWatchpointEventTest extends AbstractJDITest {
-
-	private ModificationWatchpointEvent fWatchpointEvent;
-	private WatchpointRequest fWatchpointRequest;
-	/**
-	 * Creates a new test.
-	 */
-	public ModificationWatchpointEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger a static modification watchpoint event
-		fWatchpointRequest = getStaticModificationWatchpointRequest();
-		fWatchpointEvent =
-			(ModificationWatchpointEvent) triggerAndWait(fWatchpointRequest,
-				"StaticModificationWatchpointEvent",
-				false);
-		// Interrupt the VM so that we can test valueToBe()
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fString" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Remove the modification watchpoint request
-		fVM.eventRequestManager().deleteEventRequest(fWatchpointRequest);
-
-		// Set the value of the "fString" field back to its original value
-		resetStaticField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ModificationWatchpointEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ModificationWatchpointEvent";
-	}
-	/**
-	 * Test JDI valueToBe().
-	 */
-	public void testJDIValueToBe() {
-		assertEquals(
-			"1",
-			"Hello Universe",
-			((StringReference) fWatchpointEvent.valueToBe()).value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java
deleted file mode 100644
index e8a07ad..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NotYetImplementedException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-public class NotYetImplementedException extends RuntimeException {
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * NotYetImplemented constructor comment.
-	 */
-	public NotYetImplementedException() {
-		super();
-	}
-	/**
-	 * NotYetImplemented constructor comment.
-	 * @param s java.lang.String
-	 */
-	public NotYetImplementedException(String s) {
-		super(s);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java
deleted file mode 100644
index 69f3f59..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/NullConsoleReader.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * A null console reader that continuously reads from the VM input stream
- * so that the VM doesn't block when the program writes to the stout.
- */
-
-public class NullConsoleReader extends AbstractReader {
-	private InputStream fInput;
-	/*
-	 * Creates a new console reader that will read from the given input stream.
-	 */
-	public NullConsoleReader(String name, InputStream input) {
-		super(name);
-		fInput = input;
-	}
-	/**
-	 * Continuously reads events that are coming from the event queue.
-	 */
-	protected void readerLoop() {
-		java.io.BufferedReader input =
-			new BufferedReader(new InputStreamReader(fInput));
-		try {
-			int read = 0;
-			while (!fIsStopping && read != -1) {
-				read = input.read();
-			}
-		} catch (IOException e) {
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java
deleted file mode 100644
index 4d3c108..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Vector;
-
-import junit.framework.Test;
-
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.Field;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.IntegerValue;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.Value;
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.ObjectReference
- * and JDWP Object command set.
- */
-public class ObjectReferenceTest extends AbstractJDITest {
-
-	private ObjectReference fObject;
-
-	/**
-	 * Creates a new test.
-	 */
-	public ObjectReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Make sure the object is in expected state (eg. it has not entered a monitor)
-		waitUntilReady();
-
-		// Get static field "fObject"
-		fObject = getObjectReference();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed and suspended the Test Thread. Make sure this
-		// thread is suspended at the right location
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ObjectReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ObjectReference";
-	}
-	/**
-	 * Returns all tests 
-	 */
-	protected Test suite() {
-		JDITestSuite suite = (JDITestSuite) super.suite();
-		Vector testNames = getAllMatchingTests("testLast");
-		Iterator iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-		return suite;
-	}
-	/**
-	 * Test JDI disableCollection(). enableCollection() and isCollected().
-	 */
-	public void testJDIDisableEnableCollection() {
-		assertTrue("1", !fObject.isCollected());
-		fObject.disableCollection();
-		fObject.enableCollection();
-	}
-	/**
-	 * Test JDI entryCount().
-	 */
-	public void testJDIEntryCount() {
-		if (fVM.canGetMonitorInfo()) {
-			// Ensure we're in a good state
-			fVM.resume();
-			waitUntilReady();
-
-			try {
-				assertEquals("1", 1, fObject.entryCount());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fObject.equals(fObject));
-		ObjectReference other = getThread();
-		assertTrue("2", !fObject.equals(other));
-		assertTrue("3", !fObject.equals(new Object()));
-		assertTrue("4", !fObject.equals(null));
-		assertTrue("5", fObject.hashCode() != other.hashCode());
-	}
-	/**
-	 * Test JDI getValue(Field), getValues(List) and setValue(Field,Value)
-	 * and JDWP 'Object - Get Fields Values' and 'Object - Set Fields Values'.
-	 */
-	public void testJDIGetSetValues() {
-		// setup
-		ReferenceType type = fObject.referenceType();
-		List fields = type.fields();
-		ListIterator iterator = fields.listIterator();
-		List instanceFields = new LinkedList();
-		while (iterator.hasNext()) {
-			Field field = (Field) iterator.next();
-			if (!field.isStatic())
-				instanceFields.add(field);
-		}
-		Field field = (Field) instanceFields.get(4);
-		assertEquals("1", "fChar", field.name());
-
-		// getValues(List)
-		Map values = fObject.getValues(instanceFields);
-		assertTrue("2", values.size() == 7);
-		Value value = (Value) values.get(field);
-		assertEquals("3", value, fVM.mirrorOf('a'));
-
-		// setValue(Field,Value)
-		Value newValue = fVM.mirrorOf('b');
-		try {
-			fObject.setValue(field, newValue);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("4.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("4.2", false);
-		}
-
-		// getValue(Field)
-		assertEquals("5", fObject.getValue(field), newValue);
-
-		// test set and get null value.
-		field = (Field) instanceFields.get(5);
-
-		assertEquals("6", "fString2", field.name());
-		try {
-			fObject.setValue(field, null);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("7.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("7.2", false);
-		}
-
-		// getValue(Field)
-		assertEquals("8", fObject.getValue(field), null);
-
-		// test get final value.
-		field = (Field) instanceFields.get(6);
-		assertEquals("9", "fString3", field.name());
-
-		// The value is null and should be because it's final
-		//assertEquals("10", fVM.mirrorOf("HEY"), fObject.getValue(field));
-
-	}
-	/**
-	 * Test JDI invokeMethod.
-	 */
-	public void testJDIInvokeMethod() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-		waitUntilReady();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		ClassType ct = (ClassType) fObject.referenceType();
-		Method inv =
-			ct.concreteMethodByName("invoke3", "(Ljava/lang/String;Ljava/lang/Object;)I");
-		List args = new ArrayList();
-		args.add(fVM.mirrorOf("888"));
-		args.add(null);
-		Exception oops = null;
-		Value val = null;
-		try {
-			val = fObject.invokeMethod(thread, inv, args, 0);
-		} catch (ClassNotLoadedException exc) {
-			oops = exc;
-		} catch (IncompatibleThreadStateException exc) {
-			oops = exc;
-		} catch (InvalidTypeException exc) {
-			oops = exc;
-		} catch (InvocationException exc) {
-			oops = exc;
-		}
-		assertTrue("1", oops == null);
-		assertEquals("2", val == null ? 0 : ((IntegerValue) val).value(), 888);
-	}
-	/**
-	 * Test JDI invokeMethod - failure.
-	 */
-	public void testJDIInvokeMethodFail() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-		waitUntilReady();
-
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-		ClassType ct = (ClassType) fObject.referenceType();
-		Method inv = ct.concreteMethodByName("invoke4", "()J");
-		Exception good = null, oops = null;
-		try {
-			fObject.invokeMethod(thread, inv, new ArrayList(), 0);
-		} catch (ClassNotLoadedException exc) {
-			oops = exc;
-		} catch (IncompatibleThreadStateException exc) {
-			oops = exc;
-		} catch (InvalidTypeException exc) {
-			oops = exc;
-		} catch (InvocationException exc) {
-			good = exc;
-		}
-		assertTrue("1", oops == null);
-		assertTrue("2", good != null);
-	}
-	/**
-	 * Test JDI owningThread().
-	 */
-	public void testJDIOwningThread() {
-		if (fVM.canGetMonitorInfo()) {
-			// Ensure we're in a good state
-			fVM.resume();
-			waitUntilReady();
-
-			try {
-				assertEquals("1", getThread(), fObject.owningThread());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI referenceType() and JDWP 'Type - Get type'.
-	 */
-	public void testJDIReferenceType() {
-		ReferenceType type = fObject.referenceType();
-		assertEquals("1", type.name(), "org.eclipse.debug.jdi.tests.program.MainClass");
-	}
-	/**
-	 * Test JDI uniqueID().
-	 */
-	public void testJDIUniqueID() {
-		fObject.uniqueID();
-	}
-	/**
-	 * Test JDI waitingThreads().
-	 */
-	public void testJDIWaitingThreads() {
-		if (fVM.canGetMonitorInfo()) {
-			try {
-				assertEquals("1", 0, fObject.waitingThreads().size());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java
deleted file mode 100644
index 5f8e229..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/PrimitiveValueTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.PrimitiveValue;
-
-/**
- * Tests for JDI com.sun.jdi.PrimitiveValue.
- */
-public class PrimitiveValueTest extends AbstractJDITest {
-
-	private PrimitiveValue fBoolean,
-		fByte,
-		fChar,
-		fDouble,
-		fFloat,
-		fInt,
-		fLong,
-		fShort;
-	/**
-	 * Creates a new test.
-	 */
-	public PrimitiveValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of prinitive values
-		fBoolean = fVM.mirrorOf(true);
-		fByte = fVM.mirrorOf((byte) 1);
-		fChar = fVM.mirrorOf('a');
-		fDouble = fVM.mirrorOf(12345.6789);
-		fFloat = fVM.mirrorOf(12345.6789f);
-		fInt = fVM.mirrorOf(12345);
-		fLong = fVM.mirrorOf(123456789l);
-		fShort = fVM.mirrorOf((short) 12345);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new PrimitiveValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.PrimitiveValue";
-	}
-	/**
-	 * Test JDI booleanValue().
-	 */
-	public void testJDIBooleanValue() {
-		assertTrue("1", fBoolean.booleanValue());
-		assertTrue("2", fByte.booleanValue());
-		assertTrue("3", fChar.booleanValue());
-		assertTrue("4", fDouble.booleanValue());
-		assertTrue("5", fFloat.booleanValue());
-		assertTrue("6", fInt.booleanValue());
-		assertTrue("7", fLong.booleanValue());
-		assertTrue("8", fShort.booleanValue());
-	}
-	/**
-	 * Test JDI byteValue().
-	 */
-	public void testJDIByteValue() {
-		assertEquals("1", (byte) 1, fBoolean.byteValue());
-		assertEquals("2", (byte) 1, fByte.byteValue());
-		assertEquals("3", (byte) 97, fChar.byteValue());
-		assertEquals("4", (byte) 57, fDouble.byteValue());
-		assertEquals("5", (byte) 57, fFloat.byteValue());
-		assertEquals("6", (byte) 57, fInt.byteValue());
-		assertEquals("7", (byte) 21, fLong.byteValue());
-		assertEquals("8", (byte) 57, fShort.byteValue());
-	}
-	/**
-	 * Test JDI charValue().
-	 */
-	public void testJDICharValue() {
-		assertEquals("1", (char) 1, fBoolean.charValue());
-		assertEquals("2", (char) 1, fByte.charValue());
-		assertEquals("3", 'a', fChar.charValue());
-		assertEquals("4", (char) 12345, fDouble.charValue());
-		assertEquals("5", (char) 12345, fFloat.charValue());
-		assertEquals("6", (char) 12345, fInt.charValue());
-		assertEquals("7", (char) 52501, fLong.charValue());
-		assertEquals("8", (char) 12345, fShort.charValue());
-	}
-	/**
-	 * Test JDI doubleValue().
-	 */
-	public void testJDIDoubleValue() {
-		assertEquals("1", 1, fBoolean.doubleValue(), 0);
-		assertEquals("2", 1, fByte.doubleValue(), 0);
-		assertEquals("3", 97, fChar.doubleValue(), 0);
-		assertEquals("4", 12345.6789, fDouble.doubleValue(), 0);
-		assertEquals("5", 12345.6789, fFloat.doubleValue(), 0.001);
-		assertEquals("6", 12345, fInt.doubleValue(), 0);
-		assertEquals("7", 123456789, fLong.doubleValue(), 0);
-		assertEquals("8", 12345, fShort.doubleValue(), 0);
-	}
-	/**
-	 * Test JDI floatValue().
-	 */
-	public void testJDIFloatValue() {
-		assertEquals("1", 1, fBoolean.floatValue(), 0);
-		assertEquals("2", 1, fByte.floatValue(), 0);
-		assertEquals("3", 97, fChar.floatValue(), 0);
-		assertEquals("4", 12345.6789f, fDouble.floatValue(), 0);
-		assertEquals("5", 12345.6789f, fFloat.floatValue(), 0.001);
-		assertEquals("6", 12345, fInt.floatValue(), 0);
-		assertEquals("7", 123456789, fLong.floatValue(), 100);
-		assertEquals("8", 12345, fShort.floatValue(), 0);
-	}
-	/**
-	 * Test JDI intValue().
-	 */
-	public void testJDIIntValue() {
-		assertEquals("1", 1, fBoolean.intValue());
-		assertEquals("2", 1, fByte.intValue());
-		assertEquals("3", 97, fChar.intValue());
-		assertEquals("4", 12345, fDouble.intValue());
-		assertEquals("5", 12345, fFloat.intValue());
-		assertEquals("6", 12345, fInt.intValue());
-		assertEquals("7", 123456789, fLong.intValue());
-		assertEquals("8", 12345, fShort.intValue());
-	}
-	/**
-	 * Test JDI longValue().
-	 */
-	public void testJDILongValue() {
-		assertEquals("1", 1l, fBoolean.longValue());
-		assertEquals("2", 1l, fByte.longValue());
-		assertEquals("3", 97l, fChar.longValue());
-		assertEquals("4", 12345l, fDouble.longValue());
-		assertEquals("5", 12345l, fFloat.longValue());
-		assertEquals("6", 12345l, fInt.longValue());
-		assertEquals("7", 123456789l, fLong.longValue());
-		assertEquals("8", 12345l, fShort.longValue());
-	}
-	/**
-	 * Test JDI shortValue().
-	 */
-	public void testJDIShortValue() {
-		assertEquals("1", 1, fBoolean.shortValue());
-		assertEquals("2", 1, fByte.shortValue());
-		assertEquals("3", 97, fChar.shortValue());
-		assertEquals("4", 12345, fDouble.shortValue());
-		assertEquals("5", 12345, fFloat.shortValue());
-		assertEquals("6", 12345, fInt.shortValue());
-		assertEquals("7", -13035, fLong.shortValue());
-		assertEquals("8", 12345, fShort.shortValue());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java
deleted file mode 100644
index 5b5375d..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ReferenceTypeTest.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-
-import com.sun.jdi.Field;
-import com.sun.jdi.IntegerValue;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-
-/**
- * Tests for JDI com.sun.jdi.ReferenceType
- * and JDWP Type command set.
- */
-public class ReferenceTypeTest extends AbstractJDITest {
-
-	private List fTypes = new LinkedList();
-
-	// These must match what is done in localSetUp
-	private boolean[] fSystemClassLoader = { true, true, false, false };
-	private boolean[] fHasMethods = { true, false, true, true };
-	private boolean[] fIsAbstract = { false, false, false, true };
-	private boolean[] fIsFinal = { false, true, false, false };
-	private boolean[] fIsStatic = { false, false, false, false };
-	private String[] fTypeName =
-		{
-			"java.lang.Object",
-			"java.lang.String[]",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			"org.eclipse.debug.jdi.tests.program.Printable" };
-	private int fObjectIndex = 0;
-	private int fMainClassIndex = 2;
-
-	/**
-	 * Creates a new test.
-	 */
-	public ReferenceTypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get all kinds of reference type
-		fTypes.add(getSystemType());
-		fTypes.add(getArrayType());
-		fTypes.add(getMainClass());
-		fTypes.add(getInterfaceType());
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ReferenceTypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ReferenceType";
-	}
-	/**
-	 * Test JDI allFields().
-	 */
-	public void testJDIAllFields() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			Iterator all = type.allFields().iterator();
-			int i = 0;
-			while (all.hasNext())
-				assertTrue("1." + type.name() + "." + i++, all.next() instanceof Field);
-		}
-	}
-	/**
-	 * Test JDI allMethods().
-	 */
-	public void testJDIAllMethods() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			Iterator all = type.allMethods().iterator();
-			int i = 0;
-			while (all.hasNext())
-				assertTrue("1." + type.name() + "." + i++, all.next() instanceof Method);
-		}
-	}
-	/**
-	 * Test JDI classLoader() and JDWP 'Type - Get class loader'.
-	 */
-	public void testJDIClassLoader() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			ObjectReference classLoader = type.classLoader();
-			assertTrue("1." + i, (classLoader == null) == fSystemClassLoader[i]);
-		}
-	}
-	/**
-	 * Test JDI classObject().
-	 */
-	public void testJDIClassObject() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue(type.name(), type.classObject() instanceof ObjectReference);
-		}
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		ReferenceType other =
-			(ReferenceType) fVM.classesByName("java.lang.String").get(0);
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name() + ".1", type.equals(type));
-			assertTrue("1." + type.name() + ".2", !type.equals(other));
-			assertTrue("1." + type.name() + ".3", !type.equals(fVM));
-			assertTrue("1." + type.name() + ".4", !type.equals(new Object()));
-			assertTrue("1." + type.name() + ".5", !type.equals(null));
-			assertTrue("1." + type.name() + ".6", type.hashCode() != other.hashCode());
-		}
-	}
-	/**
-	 * Test JDI failedToInitialize().
-	 */
-	public void testJDIFailedToInitialize() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), !type.failedToInitialize());
-		}
-	}
-	/**
-	 * Test JDI fieldByName(String).
-	 */
-	public void testJDIFieldByName() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = (ReferenceType) fTypes.get(fMainClassIndex);
-		Field field = type.fieldByName("fObject");
-		assertTrue("1." + type.name(), field != null);
-	}
-	/**
-	 * Test JDI fields() and JDWP 'Type - Get Fields'.
-	 */
-	public void testJDIFields() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			Iterator fields = type.fields().iterator();
-			int i = 0;
-			while (fields.hasNext())
-				assertTrue("1." + i++ +"." + type.name(), fields.next() instanceof Field);
-		}
-	}
-	/**
-	 * Test JDI getValue(Field) and JDWP 'Type - Get Fields Values'.
-	 */
-	public void testJDIGetValue() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = (ReferenceType) fTypes.get(fMainClassIndex);
-		Field field = type.fieldByName("fInt");
-		assertTrue("1." + type.name(), field != null);
-		assertTrue("2." + type.name(), type.getValue(field) instanceof IntegerValue);
-	}
-	/**
-	 * Test JDI getValues(List) and JDWP 'Type - Get Fields Values'.
-	 */
-	public void testJDIGetValues() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = (ReferenceType) fTypes.get(fMainClassIndex);
-
-		// Get field values
-		List fields = type.fields();
-		ListIterator iterator = fields.listIterator();
-		List staticFields = new LinkedList();
-		while (iterator.hasNext()) {
-			Field field = (Field) iterator.next();
-			if (field.isStatic())
-				staticFields.add(field);
-		}
-		Map values = type.getValues(staticFields);
-		assertEquals("1." + type.name(), 24, values.size());
-
-		// Get value of field fInt in MainClass
-		Field field = (Field) staticFields.get(0);
-		int i = 0;
-		while (!field.name().equals("fInt"))
-			field = (Field) staticFields.get(++i);
-
-		// Ensure it is an integer value
-		assertTrue("2." + type.name(), values.get(field) instanceof IntegerValue);
-	}
-	/**
-	 * Test JDI isAbstract().
-	 */
-	public void testJDIIsAbstract() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			if (type.name().equals("org.eclipse.debug.jdi.tests.program.Printable"))
-				assertTrue("1." + type.name(), type.isAbstract());
-			else
-				assertTrue("2." + type.name(), !type.isAbstract());
-		}
-	}
-	/**
-	 * Test JDI isFinal().
-	 */
-	public void testJDIIsFinal() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			assertTrue("1." + i, type.isFinal() == fIsFinal[i]);
-		}
-	}
-	/**
-	 * Test JDI isInitialized().
-	 */
-	public void testJDIIsInitialized() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), type.isInitialized());
-		}
-	}
-	/**
-	 * Test JDI isPrepared().
-	 */
-	public void testJDIIsPrepared() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), type.isPrepared());
-		}
-	}
-	/**
-	 * Test JDI isStatic().
-	 */
-	public void testJDIIsStatic() {
-		ListIterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			assertTrue("1." + type.name(), !type.isStatic());
-		}
-	}
-	/**
-	 * Test JDI isVerified().
-	 */
-	public void testJDIIsVerified() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			if (i != fObjectIndex) {
-				ReferenceType type = (ReferenceType) fTypes.get(i);
-				assertTrue("1." + type.name(), type.isVerified());
-			}
-		}
-	}
-	/**
-	 * Test JDI methods() and JDWP 'Type - Get Methods'.
-	 */
-	public void testJDIMethods() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			List methods = type.methods();
-			assertTrue("" + i, (methods.size() != 0) == fHasMethods[i]);
-		}
-	}
-	/**
-	 * Test JDI methodsByName(String) and methodsByName(String, String).
-	 */
-	public void testJDIMethodsByName() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-
-			// methodsByName(String)
-			Iterator methods = type.methodsByName("run").iterator();
-			while (methods.hasNext())
-				assertTrue("1." + type.name(), methods.next() instanceof Method);
-			assertEquals("2", 0, type.methodsByName("fraz").size());
-
-			// methodsByName(String, String)
-			methods = type.methodsByName("run", "()V").iterator();
-			while (methods.hasNext())
-				assertTrue("3." + type.name(), methods.next() instanceof Method);
-			assertEquals("4", 0, type.methodsByName("fraz", "()Z").size());
-		}
-	}
-	/**
-	 * Test JDI isAbstract(), isFinal() and isStatic() 
-	 * and JDWP 'Type - Get modifiers'.
-	 */
-	public void testJDIModifiers() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			if (i != 2) {
-				// i == 2 corresponds to an ArrayType, isAbstract() is undefined
-				assertTrue("1." + i, type.isAbstract() == fIsAbstract[i]);
-			}
-			assertTrue("2." + i, type.isFinal() == fIsFinal[i]);
-			assertTrue("3." + i, type.isStatic() == fIsStatic[i]);
-		}
-	}
-	/**
-	 * Test JDI name() and JDWP 'Type - Get signature'.
-	 */
-	public void testJDIName() {
-		for (int i = 0; i < fTypes.size(); ++i) {
-			ReferenceType type = (ReferenceType) fTypes.get(i);
-			assertEquals("" + i, type.name(), fTypeName[i]);
-		}
-	}
-	/**
-	 * Test JDI nestedTypes().
-	 */
-	public void testJDINestedTypes() {
-		// NB: This tests the class type only, it should test the others too
-		ReferenceType type = getClass("org.eclipse.debug.jdi.tests.program.OtherClass");
-		assertTrue("1." + type.name(), type != null);
-		List nestedTypes = type.nestedTypes();
-		assertEquals("2." + type.name(), 1, nestedTypes.size());
-		assertTrue("3." + type.name(), nestedTypes.get(0) instanceof ReferenceType);
-	}
-	/**
-	 * Test JDI visibleFields().
-	 */
-	public void testJDIVisibleFields() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			List all = type.allFields();
-			Iterator visible = type.visibleFields().iterator();
-			while (visible.hasNext()) {
-				Field next = (Field) visible.next();
-				assertTrue("1." + type.name() + "." + next.name(), all.contains(next));
-			}
-		}
-	}
-	/**
-	 * Test JDI visibleMethods().
-	 */
-	public void testJDIVisibleMethods() {
-		Iterator iterator = fTypes.listIterator();
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			List all = type.allMethods();
-			Iterator visible = type.visibleMethods().iterator();
-			while (visible.hasNext()) {
-				Method next = (Method) visible.next();
-				assertTrue("1." + type.name() + "." + next.name(), all.contains(next));
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java
deleted file mode 100644
index 1310874..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ShortValueTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ShortValue;
-
-/**
- * Tests for JDI com.sun.jdi.ShortValue.
- */
-public class ShortValueTest extends AbstractJDITest {
-
-	private ShortValue fValue;
-	/**
-	 * Creates a new test.
-	 */
-	public ShortValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get short value for 12345
-		fValue = fVM.mirrorOf((short) 12345);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ShortValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ShortValue";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		assertTrue("1", fValue.equals(fVM.mirrorOf((short) 12345)));
-		assertTrue("2", !fValue.equals(fVM.mirrorOf((short) 54321)));
-		assertTrue("3", !fValue.equals(new Object()));
-		assertTrue("4", !fValue.equals(null));
-		assertEquals(
-			"5",
-			fValue.hashCode(),
-			fVM.mirrorOf((short) 12345).hashCode());
-		assertTrue(
-			"6",
-			fValue.hashCode() != fVM.mirrorOf((short) 54321).hashCode());
-	}
-	/**
-	 * Test JDI value().
-	 */
-	public void testJDIValue() {
-		assertTrue("1", (short) 12345 == fValue.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java
deleted file mode 100644
index eb58272..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StackFrameTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.sun.jdi.AbsentInformationException;
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.LocalVariable;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.ThreadReference;
-
-/**
- * Tests for JDI com.sun.jdi.StackFrame.
- */
-public class StackFrameTest extends AbstractJDITest {
-
-	private StackFrame fFrame;
-	/**
-	 * Creates a new test.
-	 */
-	public StackFrameTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get the frame running MainClass.run()
-		fFrame = getFrame(RUN_FRAME_OFFSET);
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new StackFrameTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.StackFrame";
-	}
-	/**
-	 * Test JDI equals() and hashCode().
-	 */
-	public void testJDIEquality() {
-		StackFrame sameFrame = getFrame(RUN_FRAME_OFFSET);
-		StackFrame otherFrame = getFrame(0);
-
-		// Not identical
-		assertTrue("1", fFrame != sameFrame);
-		// But equal
-		assertTrue("2", fFrame.equals(sameFrame));
-		assertTrue("3", fFrame.hashCode() == sameFrame.hashCode());
-
-		assertTrue("4", fFrame.equals(fFrame));
-		assertTrue("5", fFrame.hashCode() == fFrame.hashCode());
-
-		assertTrue("6", !fFrame.equals(otherFrame));
-
-		assertTrue("7", !fFrame.equals(new Object()));
-		assertTrue("8", !fFrame.equals(null));
-	}
-	/**
-	 * Test JDI location().
-	 */
-	public void testJDILocation() {
-		assertNotNull("1", fFrame.location());
-	}
-	/**
-	 * Test JDI setValue(LocalVariable, Value), getValue(LocalVariable) and
-	 * getValues(List).
-	 */
-	public void testJDISetGetValue() {
-		// setValue
-		ThreadReference thread = (ThreadReference) fVM.allThreads().get(0);
-		LocalVariable var = getLocalVariable();
-		try {
-			fFrame.setValue(var, thread);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("1.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("1.2", false);
-		}
-
-		// getValue(LocalVariable)
-		ThreadReference value =
-			(ThreadReference) fFrame.getValue(getLocalVariable());
-		assertEquals("2", thread, value);
-
-		// getValues(List)
-		List vars = new LinkedList();
-		vars.add(var);
-		Map values = fFrame.getValues(vars);
-		value = (ThreadReference) values.get(var);
-		assertEquals("3", thread, value);
-
-		// test null value
-		var = getLocalVariable();
-		try {
-			fFrame.setValue(var, null);
-		} catch (ClassNotLoadedException e) {
-			assertTrue("4.1", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("4.2", false);
-		}
-
-		value = (ThreadReference) fFrame.getValue(getLocalVariable());
-		assertEquals("5", null, value);
-
-	}
-	/**
-	 * Test JDI thisObject().
-	 */
-	public void testJDIThisObject() {
-		ObjectReference object = fFrame.thisObject();
-		ReferenceType expected = getMainClass();
-		ReferenceType referenceType = object.referenceType();
-		assertEquals("1", expected, referenceType);
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", getThread(), fFrame.thread());
-	}
-	/**
-	 * Test JDI visibleVariableByName(String).
-	 */
-	public void testJDIVisibleVariableByName() {
-		LocalVariable var = null;
-		try {
-			var = fFrame.visibleVariableByName("t");
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", getLocalVariable(), var);
-		try {
-			var = fFrame.visibleVariableByName("bogus");
-		} catch (AbsentInformationException e) {
-			assertTrue("3", false);
-		}
-		assertTrue("4", null == var);
-	}
-	/**
-	 * Test JDI visibleVariables().
-	 */
-	public void testJDIVisibleVariables() {
-		List vars = null;
-		try {
-			vars = fFrame.visibleVariables();
-		} catch (AbsentInformationException e) {
-			assertTrue("1", false);
-		}
-		assertEquals("2", 2, vars.size());
-
-		LocalVariable var;
-		int i = 0;
-		do {
-			var = (LocalVariable) vars.get(i++);
-		} while (!var.name().equals("t"));
-		assertEquals("3", getLocalVariable(), var);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java
deleted file mode 100644
index 8a14dde..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StepEventTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ClassType;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.StepEvent;
-import com.sun.jdi.request.EventRequest;
-import com.sun.jdi.request.StepRequest;
-
-/**
- * Tests for JDI com.sun.jdi.event.StepEvent.
- */
-public class StepEventTest extends AbstractJDITest {
-
-	private StepEvent fStepEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public StepEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger a step event
-		fStepEvent = triggerStepAndWait();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new StepEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.StepEvent";
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Thread", fStepEvent.thread().name());
-	}
-	/**
-	 * Test all possible steps.
-	 */
-	public void testJDIVariousSteps() {
-		ThreadReference thread = getThread();
-		triggerStepAndWait(thread, StepRequest.STEP_MIN, StepRequest.STEP_INTO);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_MIN, StepRequest.STEP_OVER);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_LINE, StepRequest.STEP_INTO);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_LINE, StepRequest.STEP_OVER);
-		waitUntilReady();
-		triggerStepAndWait(thread, StepRequest.STEP_LINE, StepRequest.STEP_OUT);
-		waitUntilReady();
-	}
-
-	public void testJDIClassFilter1() {
-		// Request for step events
-		StepRequest request = getRequest();
-		request.addClassFilter("java.lang.NegativeArraySizeException");
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-
-		request = getRequest();
-		request.addClassFilter("java.lang.*");
-		request.enable();
-		event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIClassFilter2() {
-		// Request for step events
-		StepRequest request = getRequest();
-		ClassType clazz = getClass("java.lang.NegativeArraySizeException");
-		request.addClassFilter(clazz);
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIClassExclusionFilter1() {
-		// Request for step events
-		StepRequest request = getRequest();
-		request.addClassExclusionFilter(
-			"org.eclipse.debug.jdi.tests.program.MainClass");
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public void testJDIClassExclusionFilter2() {
-		StepRequest request = getRequest();
-		request.addClassExclusionFilter("org.eclipse.*");
-		request.addClassExclusionFilter("java.lang.*");
-		request.enable();
-		StepEvent event = null;
-		try {
-			event = triggerStepAndWait(getThread(), request, 1000);
-		} catch (Error e) {
-		}
-		if (event != null) {
-			System.out.println(event.location().declaringType());
-			assertTrue("1", false);
-		}
-		waitUntilReady();
-		fVM.eventRequestManager().deleteEventRequest(request);
-	}
-
-	public StepRequest getRequest() {
-		StepRequest eventRequest =
-			fVM.eventRequestManager().createStepRequest(
-				getThread(),
-				StepRequest.STEP_LINE,
-				StepRequest.STEP_OVER);
-		eventRequest.addCountFilter(1);
-		eventRequest.setSuspendPolicy(EventRequest.SUSPEND_NONE);
-		return eventRequest;
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java
deleted file mode 100644
index 166f913..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/StringReferenceTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.StringReference;
-
-/**
- * Tests for JDI com.sun.jdi.StringReference
- * and JDWP String command set.
- */
-public class StringReferenceTest extends AbstractJDITest {
-
-	private StringReference fString;
-	/**
-	 * Creates a new test.
-	 */
-	public StringReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get static field "fString"
-		fString = getStringReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new StringReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.StringReference";
-	}
-	/**
-	 * Test JDI value() and JDWP 'String - Get value'.
-	 */
-	public void testJDIValue() {
-		String value = fString.value();
-		assertEquals("1", "Hello World", value);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java
deleted file mode 100644
index 19f20cd..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TestAll.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
- * Run all tests
- */
-public class TestAll {
-/**
- * Returns all the test case classes (a Vector of Class) that are
- * relevant for the given VM information.
- * NB1: This doesn't include the VirtualMachineTest class.
- * NB2: The last element must be the VMDeathEventTest class since 
- *      it shuts the VM down.
- */
-protected static Vector getAllTestCases(VMInformation info) {
-	Vector classes = new Vector();
-	classes.addElement(AccessibleTest.class);
-	classes.addElement(ArrayReferenceTest.class);
-	classes.addElement(ArrayTypeTest.class);
-	classes.addElement(BooleanValueTest.class);
-	classes.addElement(BreakpointRequestTest.class);
-	classes.addElement(ByteValueTest.class);
-	classes.addElement(CharValueTest.class);
-	classes.addElement(ClassLoaderReferenceTest.class);
-	classes.addElement(ClassPrepareEventTest.class);
-	classes.addElement(ClassPrepareRequestTest.class);
-	classes.addElement(ClassTypeTest.class);
-	classes.addElement(DoubleValueTest.class);
-	classes.addElement(EventRequestManagerTest.class);
-	classes.addElement(EventRequestTest.class);
-	classes.addElement(EventTest.class);
-	classes.addElement(ExceptionEventTest.class);
-	classes.addElement(ExceptionRequestTest.class);
-	classes.addElement(FieldTest.class);
-	classes.addElement(FloatValueTest.class);
-	classes.addElement(HotCodeReplacementTest.class);
-	classes.addElement(IntegerValueTest.class);
-	classes.addElement(InterfaceTypeTest.class);
-	classes.addElement(LocalVariableTest.class);
-	classes.addElement(LocatableTest.class);
-	classes.addElement(LocationTest.class);
-	classes.addElement(LongValueTest.class);
-	classes.addElement(MethodTest.class);
-	classes.addElement(MethodEntryRequestTest.class);
-	classes.addElement(MethodExitRequestTest.class);
-	classes.addElement(MirrorTest.class);
-
-	if (info.fVM.canWatchFieldModification())
-		classes.addElement(ModificationWatchpointEventTest.class);
-		
-	classes.addElement(ObjectReferenceTest.class);
-	classes.addElement(PrimitiveValueTest.class);
-	classes.addElement(ReferenceTypeTest.class);
-	classes.addElement(ShortValueTest.class);
-	classes.addElement(StackFrameTest.class);
-	classes.addElement(StepEventTest.class);
-	classes.addElement(StringReferenceTest.class);
-	classes.addElement(ThreadDeathEventTest.class);
-	classes.addElement(ThreadGroupReferenceTest.class);
-	classes.addElement(ThreadReferenceTest.class);
-	classes.addElement(ThreadStartEventTest.class);
-	classes.addElement(TypeComponentTest.class);
-	classes.addElement(TypeTest.class);
-	classes.addElement(ValueTest.class);
-
-	if (info.fVM.canWatchFieldAccess() && info.fVM.canWatchFieldModification()) {
-		classes.addElement(WatchpointEventTest.class);
-		classes.addElement(WatchpointRequestTest.class);
-	}
-
-	classes.addElement(VirtualMachineExitTest.class);
-	classes.addElement(VMDisconnectEventTest.class);
-	classes.addElement(VMDisposeTest.class);	// note that this test does not restore the state properly.
-	return classes;
-}
-/**
- * Run all tests with the given arguments.
- * @see AbstractJDITest.parseArgs(String[]) for details on the arguments.
- */
-public static void main(String[] arguments) throws Throwable {
-	// Create test result
-	TextTestResult result= new TextTestResult();
-
-	// Run the VirtualMachineTest
-	AbstractJDITest test= run(result, VirtualMachineTest.class, arguments, null);
-
-	// Was it possible to run the first test?
-	if (test == null)
-		return;
-	
-	// Get the VM info
-	VMInformation info = test.getVMInfo();
-
-	// Get all test cases
-	Vector classes= getAllTestCases(info);
-
-	// Run the other tests
-	Enumeration enumeration= classes.elements();
-	while (enumeration.hasMoreElements()) {
-		Class testClass= (Class)enumeration.nextElement();
-		test= run(result, testClass, arguments, info);
-		info= test.getVMInfo(); // In case the test has changed this info
-	}
-
-	// Shut down the VM 
-	test.shutDownTarget();
-
-	// Show the result
-	result.print();
-}
-/**
- * Runs the given test with the given arguments.
- * Returns the instance that was created.
- * Returns null if there was a problem with the arguments.
- * @see AbstractJDITest(String[]) for details on the arguments.
- */
-private static AbstractJDITest run(junit.framework.TestResult result, Class testClass, String[] arguments, VMInformation info) throws Throwable {
-	// Create test
-	Class[] argTypes= {};
-	Constructor construct = null;
-	try {
-		construct = testClass.getConstructor(argTypes);
-	} catch (NoSuchMethodException e) {
-	}
-	AbstractJDITest test = null;
-	try {
-		test = (AbstractJDITest) construct.newInstance(new Object[]{});
-	} catch (InstantiationException e) {
-	} catch (IllegalAccessException e) {
-	} catch (InvocationTargetException e) {
-		throw e.getTargetException();
-	}
-	if (!AbstractJDITest.parseArgs(arguments))
-		return null;
-	test.setVMInfo(info);
-	test.setInControl(false);
-
-	// Run test
-	System.out.println("\n" + new java.util.Date());
-	System.out.println("Begin testing " + test.getName() + "...");
-	long startTime= System.currentTimeMillis();
-	test.suite().run(result);
-	long endTime= System.currentTimeMillis();
-	long runTime= endTime-startTime;
-	System.out.println("\nTime: "+runTime/1000+"."+runTime%1000);
-	System.out.println("Done testing " + test.getName() + ".");
-	
-	return test;
-}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java
deleted file mode 100644
index 21bcca6..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TextTestResult.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.Enumeration;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.Test;
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-
-class TextTestResult extends TestResult {
-
-	public synchronized void addError(Test test, Throwable t) {
-		super.addError(test, t);
-		System.out.println("E");
-	}
-	public synchronized void addFailure(Test test, AssertionFailedError t) {
-		super.addFailure(test, t);
-		System.out.print("F");
-	}
-	/**
-	 * Prints failures to the standard output
-	 */
-	public synchronized void print() {
-		printHeader();
-		printErrors();
-		printFailures();
-	}
-	/**
-	 * Prints the errors to the standard output
-	 */
-	public void printErrors() {
-		if (errorCount() != 0) {
-			if (errorCount() == 1)
-				System.out.println("There was " + errorCount() + " error:");
-			else
-				System.out.println("There were " + errorCount() + " errors:");
-
-			int i = 1;
-			for (Enumeration e = errors(); e.hasMoreElements(); i++) {
-				TestFailure failure = (TestFailure) e.nextElement();
-				System.out.println(i + ") " + failure.failedTest());
-				failure.thrownException().printStackTrace();
-				System.out.println();
-			}
-		}
-	}
-	/**
-	 * Prints failures to the standard output
-	 */
-	public void printFailures() {
-		if (failureCount() != 0) {
-			if (failureCount() == 1)
-				System.out.println("There was " + failureCount() + " failure:");
-			else
-				System.out.println(
-					"There were " + failureCount() + " failures:");
-
-			int i = 1;
-			for (Enumeration e = failures(); e.hasMoreElements(); i++) {
-				TestFailure failure = (TestFailure) e.nextElement();
-				System.out.print(i + ") " + failure.failedTest());
-				Throwable t = failure.thrownException();
-				if (t.getMessage() != null)
-					System.out.println(" \"" + t.getMessage() + "\"");
-				else {
-					System.out.println();
-					failure.thrownException().printStackTrace();
-				}
-			}
-		}
-	}
-	/**
-	 * Prints the header of the report
-	 */
-	public void printHeader() {
-		if (wasSuccessful()) {
-			System.out.println();
-			System.out.print("OK");
-			System.out.println(" (" + runCount() + " tests)");
-
-		} else {
-			System.out.println();
-			System.out.println("!!!FAILURES!!!");
-			System.out.println("Test Results:");
-			System.out.println(
-				"Run: "
-					+ runCount()
-					+ " Failures: "
-					+ failureCount()
-					+ " Errors: "
-					+ errorCount());
-		}
-	}
-	public synchronized void startTest(Test test) {
-		super.startTest(test);
-		System.out.print(".");
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java
deleted file mode 100644
index d8bd971..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadDeathEventTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ObjectCollectedException;
-import com.sun.jdi.event.ThreadDeathEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.ThreadDeathEvent.
- */
-public class ThreadDeathEventTest extends AbstractJDITest {
-
-	private ThreadDeathEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ThreadDeathEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadDeath event)
-		fVM.resume();
-
-		// Trigger a thread end event
-		fEvent =
-			(ThreadDeathEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadDeathRequest(),
-				"ThreadDeathEvent",
-				true);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadDeathEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ThreadDeathEvent";
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		try {
-			assertEquals(
-				"1",
-				"Test Thread Death Event",
-				fEvent.thread().name());
-		} catch (ObjectCollectedException e) {
-			// Workaround known problem in Sun's VM
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java
deleted file mode 100644
index b3dde98..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadGroupReferenceTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
-
-/**
- * Tests for JDI com.sun.jdi.ThreadGroupReference
- * and JDWP ThreadGroup command set.
- */
-public class ThreadGroupReferenceTest extends AbstractJDITest {
-
-	private ThreadGroupReference fThreadGroup;
-	/**
-	 * Creates a new test.
-	 */
-	public ThreadGroupReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get value of "fThread"
-		ThreadReference thread = getThread();
-
-		// Get its threadgroup
-		fThreadGroup = thread.threadGroup();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the thread group, and so the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadGroupReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ThreadGroupReference";
-	}
-	/**
-	 * Test JDI name() and JDWP 'ThreadGroup - Get name'.
-	 */
-	public void testJDIName() {
-		assertEquals("1", "Test ThreadGroup", fThreadGroup.name());
-	}
-	/**
-	 * Test JDI parent() and JDWP 'ThreadGroup - Get parent'.
-	 */
-	public void testJDIParent() {
-		ThreadGroupReference systemThreadGroup = fThreadGroup.parent();
-		assertNotNull("1", systemThreadGroup);
-		assertEquals("2", "main", systemThreadGroup.name());
-		// assertTrue("3", systemThreadGroup.parent() == null);
-	}
-	/**
-	 * Test JDI suspend() and resume().
-	 */
-	public void testJDISuspendResume() {
-		fThreadGroup.suspend();
-		fThreadGroup.resume();
-	}
-	/**
-	 * Test JDI threadGroups().
-	 */
-	public void testJDIThreadGroups() {
-		List threadGroups = fThreadGroup.threadGroups();
-		assertEquals("1", 0, threadGroups.size());
-	}
-	/**
-	 * Test JDI threads() and JDWP 'ThreadGroup - Get children'.
-	 */
-	public void testJDIThreads() {
-		List threads = fThreadGroup.threads();
-		ListIterator iterator = threads.listIterator();
-		boolean isIncluded = false;
-		while (iterator.hasNext()) {
-			ThreadReference thread = (ThreadReference) iterator.next();
-			if (thread.name().equals("Test Thread")) {
-				isIncluded = true;
-				break;
-			}
-		}
-		assertTrue("1", isIncluded);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java
deleted file mode 100644
index cd6531f..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.List;
-
-import com.sun.jdi.ClassNotLoadedException;
-import com.sun.jdi.ClassType;
-import com.sun.jdi.IncompatibleThreadStateException;
-import com.sun.jdi.InvalidTypeException;
-import com.sun.jdi.InvocationException;
-import com.sun.jdi.Method;
-import com.sun.jdi.ObjectReference;
-import com.sun.jdi.StackFrame;
-import com.sun.jdi.ThreadReference;
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.ThreadReference
- * and JDWP Thread command set.
- */
-public class ThreadReferenceTest extends AbstractJDITest {
-
-	private ThreadReference fThread;
-	/**
-	 * Creates a new test .
-	 */
-	public ThreadReferenceTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get thread
-		fThread = getThread();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadReferenceTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.ThreadReference";
-	}
-	/**
-	 * Test JDI currentContendedMonitor().
-	 */
-	public void testJDICurrentContendedMonitor() {
-		if (fVM.canGetCurrentContendedMonitor()) {
-			try {
-				assertTrue("1", fThread.currentContendedMonitor() == null);
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI frame(int).
-	 */
-	public void testJDIFrame() {
-		try {
-			StackFrame frame = fThread.frame(0);
-			assertTrue("1", fThread.frames().contains(frame));
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI frameCount.
-	 */
-	public void testJDIFrameCount() {
-		try {
-			int count = fThread.frameCount();
-			assertTrue("1", count <= 4);
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("2", false);
-		}
-	}
-	/**
-	 * Test JDI frames() and JDWP 'Thread - Get frames'.
-	 */
-	public void testJDIFrames() {
-		List frames = null;
-		try {
-			frames = fThread.frames();
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("1", false);
-		}
-		assertTrue("2", frames.size() > 0);
-	}
-	/**
-	 * Test JDI interrupt()().
-	 */
-	public void testJDIInterrupt() {
-		assertEquals("1", 1, fThread.suspendCount());
-		fThread.interrupt();
-		assertEquals("2", 1, fThread.suspendCount());
-	}
-	/**
-	 * Test JDI isAtBreakpoint().
-	 */
-	public void testJDIIsAtBreakpoint() {
-		assertTrue("1", !fThread.isAtBreakpoint());
-	}
-	/**
-	 * Test JDI isSuspended().
-	 */
-	public void testJDIIsSuspended() {
-		assertTrue("1", fThread.isSuspended());
-	}
-	/**
-	 * Test JDI name() and JDWP 'Thread - Get name'.
-	 */
-	public void testJDIName() {
-		assertEquals("1", "Test Thread", fThread.name());
-	}
-	/**
-	 * Test JDI ownedMonitors().
-	 */
-	public void testJDIOwnedMonitors() {
-		if (fVM.canGetOwnedMonitorInfo()) {
-			waitUntilReady();
-			try {
-				assertEquals("1", 1, fThread.ownedMonitors().size());
-			} catch (IncompatibleThreadStateException e) {
-				assertTrue("2", false);
-			}
-		}
-	}
-	/**
-	 * Test JDI status() and JDWP 'Thread - Get status'.
-	 */
-	public void testJDIStatus() {
-		int status = fThread.status();
-		assertTrue(
-			"1",
-			((status == ThreadReference.THREAD_STATUS_RUNNING)
-				|| (status == ThreadReference.THREAD_STATUS_SLEEPING)
-				|| (status == ThreadReference.THREAD_STATUS_WAIT)));
-	}
-	/**
-	 * Test JDI stop(ObjectReference).
-	 */
-	public void testJDIStop() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		// Trigger a thread start event to get a new thread
-		ThreadStartEvent event =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				false);
-		ThreadReference thread = event.thread();
-
-		// Create a java.lang.Throwable instance in 
-		java.util.List classes = fVM.classesByName("java.lang.Throwable");
-		assertTrue("1", classes.size() != 0);
-		ClassType threadDeathClass = (ClassType) classes.get(0);
-		Method constructor =
-			threadDeathClass.concreteMethodByName("<init>", "()V");
-		ObjectReference threadDeath = null;
-		try {
-			threadDeath =
-				threadDeathClass.newInstance(
-					thread,
-					constructor,
-					new java.util.LinkedList(),
-					ClassType.INVOKE_SINGLE_THREADED);
-			threadDeath.disableCollection();
-			// This object is going to be used for the lifetime of the VM.
-		} catch (ClassNotLoadedException e) {
-			assertTrue("2", false);
-		} catch (InvalidTypeException e) {
-			assertTrue("3", false);
-		} catch (InvocationException e) {
-			assertTrue("4", false);
-		} catch (IncompatibleThreadStateException e) {
-			assertTrue("5", false);
-		}
-
-		// Stop the thread
-		try {
-			thread.stop(threadDeath);
-		} catch (InvalidTypeException e) {
-			assertTrue("6", false);
-		}
-
-		waitUntilReady();
-
-	}
-	/**
-	 * Test JDI suspend() and resume() 
-	 * and JDWP 'Thread - Suspend' and 'Thread - Resume'.
-	 */
-	public void testJDISuspendResume() {
-		assertEquals("1", 1, fThread.suspendCount());
-		fThread.resume();
-		assertTrue("2", !fThread.isSuspended());
-		fThread.suspend();
-		assertTrue("3", fThread.isSuspended());
-
-		waitUntilReady();
-	}
-	/**
-	 * Test JDI threadGroup() and JDWP 'Thread - Get threadGroup'.
-	 */
-	public void testJDIThreadGroup() {
-		assertNotNull("1", fThread.threadGroup());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java
deleted file mode 100644
index a29047e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadStartEventTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.ThreadStartEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.ThreadStartEvent.
- */
-public class ThreadStartEventTest extends AbstractJDITest {
-
-	private ThreadStartEvent fEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public ThreadStartEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Make sure the entire VM is not suspended before we start a new thread
-		// (otherwise this new thread will start suspended and we will never get the
-		// ThreadStart event)
-		fVM.resume();
-
-		// Trigger a thread start event
-		fEvent =
-			(ThreadStartEvent) triggerAndWait(fVM
-				.eventRequestManager()
-				.createThreadStartRequest(),
-				"ThreadStartEvent",
-				true);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// The test has resumed the test thread, so suspend it
-		waitUntilReady();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ThreadStartEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.ThreadStartEvent";
-	}
-	/**
-	 * Test JDI thread().
-	 */
-	public void testJDIThread() {
-		assertEquals("1", "Test Thread Start Event", fEvent.thread().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java
deleted file mode 100644
index 08245cc..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeComponentTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.TypeComponent;
-
-/**
- * Tests for JDI com.sun.jdi.TypeComponent.
- */
-public class TypeComponentTest extends AbstractJDITest {
-
-	private TypeComponent fField, fMethod;
-	/**
-	 * Creates a new test.
-	 */
-	public TypeComponentTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get field fObject in org.eclipse.debug.jdi.tests.program.MainClass
-		fField = getField();
-
-		// Get method print(OutputStream)
-		fMethod = getMethod();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new TypeComponentTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.TypeComponent";
-	}
-	/**
-	 * Test JDI declaringType().
-	 */
-	public void testJDIDeclaringType() {
-		ReferenceType mainClass = getMainClass();
-
-		ReferenceType declaringType = fField.declaringType();
-		assertEquals("1", mainClass, declaringType);
-
-		declaringType = fMethod.declaringType();
-		assertEquals("2", mainClass, declaringType);
-	}
-	/**
-	 * Test JDI isFinal().
-	 */
-	public void testJDIIsFinal() {
-		assertTrue("1", !fField.isFinal());
-		assertTrue("2", !fMethod.isFinal());
-	}
-	/**
-	 * Test JDI isStatic().
-	 */
-	public void testJDIIsStatic() {
-		assertTrue("1", fField.isStatic());
-		assertTrue("2", !fMethod.isStatic());
-	}
-	/**
-	 * Test JDI isSynthetic().
-	 */
-	public void testJDIIsSynthetic() {
-		if (!fVM.canGetSyntheticAttribute()) {
-			return;
-		}
-
-		assertTrue("1", !fField.isSynthetic());
-		assertTrue("2", !fMethod.isSynthetic());
-	}
-	/**
-	 * Test JDI name().
-	 */
-	public void testJDIName() {
-		assertEquals("1", "fObject", fField.name());
-		assertEquals("2", "print", fMethod.name());
-	}
-	/**
-	 * Test JDI signature().
-	 */
-	public void testJDISignature() {
-		assertEquals(
-			"1",
-			"Lorg/eclipse/debug/jdi/tests/program/MainClass;",
-			fField.signature());
-		assertEquals("2", "(Ljava/io/OutputStream;)V", fMethod.signature());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java
deleted file mode 100644
index 796780c..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/TypeTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.BooleanType;
-import com.sun.jdi.ByteType;
-import com.sun.jdi.CharType;
-import com.sun.jdi.DoubleType;
-import com.sun.jdi.FloatType;
-import com.sun.jdi.IntegerType;
-import com.sun.jdi.LongType;
-import com.sun.jdi.ShortType;
-import com.sun.jdi.Type;
-
-/**
- * Tests for JDI com.sun.jdi.Type.
- */
-public class TypeTest extends AbstractJDITest {
-	private Type 		
-		fArrayType,
-		fClassType,
-		fInterfaceType,
-		// primitive types
-		fShortType,
-		fByteType,
-		fIntegerType,
-		fLongType,
-		fFloatType,
-		fDoubleType,
-		fCharType,
-		fBooleanType,
-		// One-dimensional primitive arrays
-		fByteArrayType,
-		fShortArrayType,
-		fIntArrayType,
-		fLongArrayType,
-		fFloatArrayType,
-		fDoubleArrayType,
-		fCharArrayType,
-		fBooleanArrayType,
-		// Two-dimensional primitive arrays
-		fByteDoubleArrayType,
-		fShortDoubleArrayType,
-		fIntDoubleArrayType,
-		fLongDoubleArrayType,
-		fFloatDoubleArrayType,
-		fDoubleDoubleArrayType,
-		fCharDoubleArrayType,
-		fBooleanDoubleArrayType;
-		
-	/**
-	 * Creates a new test.
-	 */
-	public TypeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get reference types
-		fArrayType = getArrayType();
-		fClassType = getMainClass();
-		fInterfaceType = getInterfaceType();
-		// Get primitive types
-		fBooleanType = (BooleanType) (fVM.mirrorOf(true).type());
-		fByteType = (ByteType) (fVM.mirrorOf((byte) 1).type());
-		fCharType = (CharType) (fVM.mirrorOf('a').type());
-		fDoubleType = (DoubleType) (fVM.mirrorOf(12345.6789).type());
-		fFloatType = (FloatType) (fVM.mirrorOf(12345.6789f).type());
-		fIntegerType = (IntegerType) (fVM.mirrorOf(12345).type());
-		fLongType = (LongType) (fVM.mirrorOf(123456789l).type());
-		fShortType = (ShortType) (fVM.mirrorOf((short) 12345).type());
-		// Get one-dimensional primitive arrays
-		fByteArrayType = getByteArrayType();
-		fShortArrayType = getShortArrayType();
-		fIntArrayType = getIntArrayType();
-		fLongArrayType = getLongArrayType();
-		fFloatArrayType = getFloatArrayType();
-		fDoubleArrayType = getDoubleArrayType();
-		fCharArrayType = getCharArrayType();
-		fBooleanArrayType = getBooleanArrayType();
-		//  Get two-dimensional primitive arrays
-		fByteDoubleArrayType = getByteDoubleArrayType();
-		fShortDoubleArrayType = getShortDoubleArrayType();
-		fIntDoubleArrayType = getIntDoubleArrayType();
-		fLongDoubleArrayType = getLongDoubleArrayType();
-		fFloatDoubleArrayType = getFloatDoubleArrayType();
-		fDoubleDoubleArrayType = getDoubleDoubleArrayType();
-		fCharDoubleArrayType = getCharDoubleArrayType();
-		fBooleanDoubleArrayType = getBooleanDoubleArrayType();
-
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new TypeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Type";
-	}
-	/**
-	 * Test JDI signature().
-	 */
-	public void testJDISignature() {
-		assertEquals("1", "[Ljava/lang/String;", fArrayType.signature());
-		assertEquals("2", "Lorg/eclipse/debug/jdi/tests/program/MainClass;", fClassType.signature());
-		assertEquals("3", "Lorg/eclipse/debug/jdi/tests/program/Printable;", fInterfaceType.signature());
-		// Primitive types
-		assertEquals("4", "S", fShortType.signature());
-		assertEquals("5", "B", fByteType.signature());
-		assertEquals("6", "I", fIntegerType.signature());
-		assertEquals("7", "J", fLongType.signature());
-		assertEquals("8", "F", fFloatType.signature());
-		assertEquals("9", "D", fDoubleType.signature());
-		assertEquals("10", "C", fCharType.signature());
-		assertEquals("11", "Z", fBooleanType.signature());
-		// One-dimensional primitive arrays
-		assertEquals("12", "[B", fByteArrayType.signature());
-		assertEquals("13", "[S", fShortArrayType.signature());
-		assertEquals("14", "[I", fIntArrayType.signature());
-		assertEquals("15", "[J", fLongArrayType.signature());
-		assertEquals("16", "[F", fFloatArrayType.signature());
-		assertEquals("17", "[D", fDoubleArrayType.signature());
-		assertEquals("18", "[C", fCharArrayType.signature());
-		assertEquals("19", "[Z", fBooleanArrayType.signature());
-		// Two-dimensional primitive arrays
-		assertEquals("20", "[[B", fByteDoubleArrayType.signature());
-		assertEquals("21", "[[S", fShortDoubleArrayType.signature());
-		assertEquals("22", "[[I", fIntDoubleArrayType.signature());
-		assertEquals("23", "[[J", fLongDoubleArrayType.signature());
-		assertEquals("24", "[[F", fFloatDoubleArrayType.signature());
-		assertEquals("25", "[[D", fDoubleDoubleArrayType.signature());
-		assertEquals("26", "[[C", fCharDoubleArrayType.signature());
-		assertEquals("27", "[[Z", fBooleanDoubleArrayType.signature());
-	}
-	/**
-	 * Test JDI typeName().
-	 */
-	public void testJDITypeName() {
-		assertEquals("1", "java.lang.String[]", fArrayType.name());
-		assertEquals("2", "org.eclipse.debug.jdi.tests.program.MainClass", fClassType.name());
-		assertEquals("3", "org.eclipse.debug.jdi.tests.program.Printable", fInterfaceType.name());
-		// Primitive types
-		assertEquals("4", "byte", fByteType.name());
-		assertEquals("5", "short", fShortType.name());
-		assertEquals("6", "int", fIntegerType.name());
-		assertEquals("7", "long", fLongType.name());
-		assertEquals("8", "float", fFloatType.name());
-		assertEquals("9", "double", fDoubleType.name());
-		assertEquals("10", "char", fCharType.name());
-		assertEquals("11", "boolean", fBooleanType.name());
-		// One-dimensional primitive arrays
-		assertEquals("12", "byte[]", fByteArrayType.name());
-		assertEquals("13", "short[]", fShortArrayType.name());
-		assertEquals("14", "int[]", fIntArrayType.name());
-		assertEquals("15", "long[]", fLongArrayType.name());
-		assertEquals("16", "float[]", fFloatArrayType.name());
-		assertEquals("17", "double[]", fDoubleArrayType.name());
-		assertEquals("18", "char[]", fCharArrayType.name());
-		assertEquals("19", "boolean[]", fBooleanArrayType.name());
-		// Two-dimensional primitive arrays
-		assertEquals("20", "byte[][]", fByteDoubleArrayType.name());
-		assertEquals("21", "short[][]", fShortDoubleArrayType.name());
-		assertEquals("22", "int[][]", fIntDoubleArrayType.name());
-		assertEquals("23", "long[][]", fLongDoubleArrayType.name());
-		assertEquals("24", "float[][]", fFloatDoubleArrayType.name());
-		assertEquals("25", "double[][]", fDoubleDoubleArrayType.name());
-		assertEquals("26", "char[][]", fCharDoubleArrayType.name());
-		assertEquals("27", "boolean[][]", fBooleanDoubleArrayType.name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java
deleted file mode 100644
index f232d38..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.VMDisconnectEvent;
-
-/**
- * Tests for JDI com.sun.jdi.event.VMDisconnectEvent.
- */
-public class VMDisconnectEventTest extends AbstractJDITest {
-
-	private VMDisconnectEvent fVMDisconnectEvent;
-	/**
-	 * Creates a new test.
-	 */
-	public VMDisconnectEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Prepare to receive the event
-		VMDisconnectEventWaiter waiter =
-			new VMDisconnectEventWaiter(null, true);
-		fEventReader.addEventListener(waiter);
-
-		// Trigger a vm death event by shutting down the VM
-		killVM();
-
-		// Wait for the event to come in
-		fVMDisconnectEvent = (VMDisconnectEvent) waitForEvent(waiter, 10000);
-		// Wait 10s max
-		fEventReader.removeEventListener(waiter);
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Finish the shut down
-		shutDownTarget();
-
-		// Start up again
-		launchTargetAndStartProgram();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new VMDisconnectEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.VMDeathEvent";
-	}
-	/**
-	 * Test that we received the event.
-	 */
-	public void testJDIVMDeath() {
-		assertTrue("1", fVMDisconnectEvent != null);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java
deleted file mode 100644
index 160eca6..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisconnectEventWaiter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.event.VMDisconnectEvent;
-/**
- * Listen for VMDisconnectEvent.
- */
-public class VMDisconnectEventWaiter extends EventWaiter {
-	/**
-	 * Creates a VMDisconnectEventWaiter.
-	 */
-	public VMDisconnectEventWaiter(
-		com.sun.jdi.request.EventRequest request,
-		boolean shouldGo) {
-		super(request, shouldGo);
-	}
-	public boolean vmDisconnect(VMDisconnectEvent event) {
-		notifyEvent(event);
-		return fShouldGo;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java
deleted file mode 100644
index 470593e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMDisposeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.VMDisconnectedException;
-
-/**
- * Tests for JDI com.sun.jdi.event.VMDisconnectEvent.
- */
-public class VMDisposeTest extends AbstractJDITest {
-	/**
-	 * Creates a new test.
-	 */
-	public VMDisposeTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new VMDisposeTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine.dispose";
-	}
-	/**
-	 * Test that we received the event.
-	 */
-	public void testJDIVMDispose() {
-		fVM.dispose();
-		try {
-			fVM.allThreads();
-			assertTrue("1", false);
-		} catch (VMDisconnectedException e) {
-		}
-
-		try {
-			// Reconnect to running VM.
-			connectToVM();
-			fVM.allThreads();
-		} catch (VMDisconnectedException e) {
-			assertTrue("3", false);
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java
deleted file mode 100644
index ae8e313..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VMInformation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.VirtualMachine;
-
-/**
- * This class allows to hold on information about the VM
- * that we don't want to loose between 2 tests.
- */
-public class VMInformation {
-	VirtualMachine fVM;
-	Process fLaunchedVM;
-	EventReader fEventReader;
-	AbstractReader fConsoleReader;
-	String fVMType;
-
-	/** 
-	 * Creates a new VMInformation for the given vm, vm type, launched vm, event reader and console reader.
-	 */
-	VMInformation(VirtualMachine vm, String vmType, Process launchedVM, EventReader eventReader, AbstractReader consoleReader) {
-		fVM = vm;
-		fLaunchedVM = launchedVM;
-		fEventReader = eventReader;
-		fConsoleReader = consoleReader;
-		fVMType = vmType;
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java
deleted file mode 100644
index 51c6bfe..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ValueTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.Value;
-
-/**
- * Tests for JDI com.sun.jdi.Value.
- */
-public class ValueTest extends AbstractJDITest {
-	private Value fBoolean,
-		fByte,
-		fChar,
-		fDouble,
-		fFloat,
-		fInteger,
-		fLong,
-		fShort,
-		fArray,
-		fObject;
-	/**
-	 * Creates a new test.
-	 */
-	public ValueTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get primitive values
-		fBoolean = fVM.mirrorOf(true);
-		fByte = fVM.mirrorOf((byte) 1);
-		fChar = fVM.mirrorOf('a');
-		fDouble = fVM.mirrorOf(12345.6789);
-		fFloat = fVM.mirrorOf(12345.6789f);
-		fInteger = fVM.mirrorOf(12345);
-		fLong = fVM.mirrorOf(123456789l);
-		fShort = fVM.mirrorOf((short) 12345);
-
-		// Get object references
-		fArray = getObjectArrayReference();
-		fObject = getObjectReference();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new ValueTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.Value";
-	}
-	/**
-	 * Test JDI type().
-	 */
-	public void testJDIType() {
-		assertEquals("1", "boolean", fBoolean.type().name());
-		assertEquals("2", "byte", fByte.type().name());
-		assertEquals("3", "char", fChar.type().name());
-		assertEquals("4", "double", fDouble.type().name());
-		assertEquals("5", "float", fFloat.type().name());
-		assertEquals("6", "int", fInteger.type().name());
-		assertEquals("7", "long", fLong.type().name());
-		assertEquals("8", "short", fShort.type().name());
-		assertEquals("9", "java.lang.String[]", fArray.type().name());
-		assertEquals(
-			"10",
-			"org.eclipse.debug.jdi.tests.program.MainClass",
-			fObject.type().name());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java
deleted file mode 100644
index 40eb56b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineExitTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.VMDisconnectedException;
-
-/**
- * Tests for JDI com.sun.jdi.VirtualMachine.exit().
- */
-public class VirtualMachineExitTest extends AbstractJDITest {
-	/**
-	 * Creates a new test .
-	 */
-	public VirtualMachineExitTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Finish the shut down
-		shutDownTarget();
-
-		// Start up again
-		launchTargetAndStartProgram();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(String[] args) {
-		new VirtualMachineExitTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine.exit(int)";
-	}
-	/**
-	 * Test JDI exit().
-	 */
-	public void testJDIExit() {
-		try {
-			fVM.exit(0);
-		} catch (VMDisconnectedException e) {
-			assertTrue("1", false);
-		}
-
-		try {
-			Thread.sleep(200);
-			assertTrue("2", !vmIsRunning());
-			fVM.allThreads();
-			assertTrue("3", false);
-		} catch (VMDisconnectedException e) {
-		} catch (InterruptedException e) {
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java
deleted file mode 100644
index 1ce757d..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/VirtualMachineTest.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Vector;
-
-import junit.framework.Test;
-
-import com.sun.jdi.BooleanValue;
-import com.sun.jdi.ByteValue;
-import com.sun.jdi.CharValue;
-import com.sun.jdi.DoubleValue;
-import com.sun.jdi.FloatValue;
-import com.sun.jdi.IntegerValue;
-import com.sun.jdi.LongValue;
-import com.sun.jdi.ReferenceType;
-import com.sun.jdi.ShortValue;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
-
-/**
- * Tests for JDI com.sun.jdi.VirtualMachine
- * and JDWP VM command set.
- * 
- * Example of arguments:
- *   -launcher SunVMLauncher -address c:\jdk1.2.2\ -classpath d:\target
- */
-public class VirtualMachineTest extends AbstractJDITest {
-
-	/**
-	 * Creates a new test .
-	 */
-	public VirtualMachineTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new VirtualMachineTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.VirtualMachine";
-	}
-	/**
-	 * Don't start the program yet, so that the testNotStarted* tests can run before.
-	 */
-	protected void setUp() {
-		launchTargetAndConnectToVM();
-	}
-	/**
-	 * Starts the target program.
-	 * NB: This method is copied in this class only so that it can be invoked
-	 *     dynamically.
-	 */
-	public void startProgram() {
-		super.startProgram();
-	}
-	/**
-	 * Returns all tests 
-	 */
-	protected Test suite() {
-		JDITestSuite suite = new JDITestSuite(this);
-
-		// Tests that run before the program is started
-		Vector testNames = getAllMatchingTests("testNotStarted");
-		Iterator iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-
-		// The method that starts the program
-		suite.addTest(new JDITestCase(this, "startProgram"));
-
-		// Tests that run after the program has started
-		testNames = getAllMatchingTests("testStarted");
-		iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-
-		// All other tests
-		testNames = getAllMatchingTests("testJDI");
-		iterator = testNames.iterator();
-		while (iterator.hasNext()) {
-			String name = (String) iterator.next();
-			suite.addTest(new JDITestCase(this, name));
-		}
-
-		return suite;
-	}
-	/**
-	 * Test JDI canGetBytecodes().
-	 */
-	public void testJDICanGetBytecodes() {
-		fVM.canGetBytecodes();
-	}
-	/**
-	 * Test JDI canGetCurrentContendedMonitor().
-	 */
-	public void testJDICanGetCurrentContendedMonitor() {
-		fVM.canGetCurrentContendedMonitor();
-	}
-	/**
-	 * Test JDI canGetMonitorInfo().
-	 */
-	public void testJDICanGetMonitorInfo() {
-		fVM.canGetMonitorInfo();
-	}
-	/**
-	 * Test JDI canGetOwnedMonitorInfo().
-	 */
-	public void testJDICanGetOwnedMonitorInfo() {
-		fVM.canGetOwnedMonitorInfo();
-	}
-	/**
-	 * Test JDI canGetSyntheticAttribute().
-	 */
-	public void testJDICanGetSyntheticAttribute() {
-		//  This is optional functionality, thus this is not a failure
-		fVM.canGetSyntheticAttribute();
-	}
-	/**
-	 * Test JDI canWatchFieldAccess().
-	 */
-	public void testJDICanWatchFieldAccess() {
-		//  This is optional functionality, thus this is not a failure
-		fVM.canWatchFieldAccess();
-	}
-	/**
-	 * Test JDI canWatchFieldModification().
-	 */
-	public void testJDICanWatchFieldModification() {
-		//  This is optional functionality, thus this is not a failure
-		fVM.canWatchFieldModification();
-	}
-	/**
-	 * Test JDI eventQueue().
-	 */
-	public void testJDIEventQueue() {
-		assertNotNull("1", fVM.eventQueue());
-	}
-	/**
-	 * Test JDI eventRequestManager().
-	 */
-	public void testJDIEventRequestManager() {
-		assertNotNull("1", fVM.eventRequestManager());
-	}
-	/**
-	 * Test JDI mirrorOf(boolean).
-	 */
-	public void testJDIMirrorOfBoolean() {
-		boolean value = true;
-		BooleanValue mirror = fVM.mirrorOf(value);
-		assertTrue("1", value == mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(byte).
-	 */
-	public void testJDIMirrorOfByte() {
-		byte value = 1;
-		ByteValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(char).
-	 */
-	public void testJDIMirrorOfChar() {
-		char value = 'a';
-		CharValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(double).
-	 */
-	public void testJDIMirrorOfDouble() {
-		double value = 12345.6789;
-		DoubleValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value(), 0);
-	}
-	/**
-	 * Test JDI mirrorOf(float).
-	 */
-	public void testJDIMirrorOfFloat() {
-		float value = 12345.6789f;
-		FloatValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value(), 0);
-	}
-	/**
-	 * Test JDI mirrorOf(int).
-	 */
-	public void testJDIMirrorOfInt() {
-		int value = 12345;
-		IntegerValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(long).
-	 */
-	public void testJDIMirrorOfLong() {
-		long value = 1234567890l;
-		LongValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(short).
-	 */
-	public void testJDIMirrorOfShort() {
-		short value = (short) 12345;
-		ShortValue mirror = fVM.mirrorOf(value);
-		assertEquals("1", value, mirror.value());
-	}
-	/**
-	 * Test JDI mirrorOf(String) and JDWP 'VM - Create String'.
-	 */
-	public void testJDIMirrorOfString() {
-		String testString = "Test";
-		StringReference newString = null;
-		newString = fVM.mirrorOf(testString);
-		assertEquals("1", newString.value(), testString);
-	}
-	/**
-	 * Test JDI setDebugTraceMode(int).
-	 */
-	public void testJDISetDebugTraceMode() {
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_ALL);
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_SENDS);
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_RECEIVES);
-		fVM.setDebugTraceMode(com.sun.jdi.VirtualMachine.TRACE_NONE);
-
-		// restore original value
-		fVM.setDebugTraceMode(fVMTraceFlags);
-	}
-	/**
-	 * Test JDI getVersion().
-	 */
-	public void testJDIVersion() {
-		String version = fVM.version();
-		assertTrue("1", version != null);
-	}
-	/**
-	 * Test JDI allClasses() and JDWP 'VM - Get all classes'
-	 * while the test program has not been started.
-	 */
-	public void testNotStartedAllClasses() {
-		List classes = fVM.allClasses();
-		Iterator iterator = classes.listIterator();
-		int i = 0;
-		while (iterator.hasNext())
-			assertTrue(Integer.toString(i++), iterator.next() instanceof ReferenceType);
-	}
-	/**
-	 * Test JDI allThreads() and JDWP 'VM - Get all threads'
-	 * while the test program has not been started.
-	 */
-	public void testNotStartedAllThreads() {
-		List threads = fVM.allThreads();
-		Iterator iterator = threads.listIterator();
-		int i = 0;
-		while (iterator.hasNext())
-			assertTrue(Integer.toString(i++), iterator.next() instanceof ThreadReference);
-	}
-	/**
-	 * Test JDI classesByName() while the test program has not been started.
-	 */
-	public void testNotStartedClassesByName() {
-		List classes = fVM.classesByName("java.lang.Object");
-		assertEquals("1", 1, classes.size());
-	}
-	/**
-	 * Test JDI allClasses() and JDWP 'VM- Get all classes'
-	 * once the test program has been started.
-	 */
-	public void testStartedAllClasses() {
-
-		// The test program has started, the number of classes is != 0
-		List classes = fVM.allClasses();
-		assertTrue("1", classes.size() != 0);
-
-		// Collect names of received classes
-		String[] names = new String[classes.size()];
-		ListIterator iterator = classes.listIterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			names[i++] = type.name();
-		}
-
-		// Check that they are the expected names
-		String[] expected =
-			new String[] {
-				"java.lang.Object",
-				"java.util.Date",
-				"org.eclipse.debug.jdi.tests.program.Printable",
-				"org.eclipse.debug.jdi.tests.program.MainClass" };
-		for (int j = 0; j < expected.length; j++) {
-			boolean isIncluded = false;
-			iteration : for (int k = 0; k < names.length; k++) {
-				if (names[k].equals(expected[j])) {
-					isIncluded = true;
-					break iteration;
-				}
-			}
-			assertTrue("2." + j, isIncluded);
-		}
-	}
-	/**
-	 * Test JDI allThreads() and JDWP 'VM - Get all threads'
-	 * once the test program has been started.
-	 */
-	public void testStartedAllThreads() {
-
-		// The test program has started, the number of threads is != 0
-		List threads = fVM.allThreads();
-		assertTrue("1", threads.size() != 0);
-
-		// Collect names of received threads
-		String[] names = new String[threads.size()];
-		ListIterator iterator = threads.listIterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			ThreadReference thread = (ThreadReference) iterator.next();
-			names[i++] = thread.name();
-		}
-
-		// Check that they contain at least the expected names
-		String[] expected = new String[] { "Test Thread" };
-		boolean isIncluded = false;
-		iteration : for (int j = 0; j < expected.length; j++) {
-			for (int k = 0; k < names.length; k++) {
-				if (expected[j].equals(names[k])) {
-					isIncluded = true;
-					break iteration;
-				}
-			}
-		}
-		assertTrue("2", isIncluded);
-	}
-	/**
-	 * Test JDI classesByName() once the test program has been started.
-	 */
-	public void testStartedClassesByName() {
-
-		// The test program has started, the number of java.lang.Object is 1
-		List classes = fVM.classesByName("java.lang.Object");
-		assertEquals("1", classes.size(), 1);
-
-		// Collect names of received classes
-		String[] names = new String[classes.size()];
-		ListIterator iterator = classes.listIterator();
-		int i = 0;
-		while (iterator.hasNext()) {
-			ReferenceType type = (ReferenceType) iterator.next();
-			names[i++] = type.name();
-		}
-
-		// Check that they are all "java.lang.Object"
-		for (int j = 0; j < names.length; j++) {
-			assertEquals("2." + j, "java.lang.Object", names[j]);
-		}
-	}
-	/**
-	 * Test JDI suspend() and resume() once the test program has been started.
-	 */
-	public void testStartedSuspendResume() {
-		// Suspend
-		fVM.suspend();
-		ListIterator threads = fVM.allThreads().listIterator();
-		while (threads.hasNext()) {
-			ThreadReference thread = (ThreadReference) threads.next();
-			assertTrue("1." + thread.name(), thread.isSuspended());
-		}
-
-		// Resume
-		fVM.resume();
-		// Cannot assertTrue that all threads are not suspended because they might have been suspended
-		// by the program itself
-
-		// Suspend VM and suspend one thread
-		fVM.suspend();
-		threads = fVM.allThreads().listIterator();
-		ThreadReference suspended = getThread();
-		suspended.suspend();
-		while (threads.hasNext()) {
-			ThreadReference thread = (ThreadReference) threads.next();
-			assertTrue("2." + thread.name(), thread.isSuspended());
-		}
-
-		// Resume VM and ensure that the one thread that was suspended is still suspended
-		fVM.resume();
-		assertTrue("3", suspended.isSuspended());
-	}
-	/**
-	 * Test JDI topLevelThreadGroups().
-	 */
-	public void testStartedTopLevelThreadGroups() {
-		List topLevelThreadGroups = fVM.topLevelThreadGroups();
-		assertEquals("1", 1, topLevelThreadGroups.size());
-		assertTrue("2", topLevelThreadGroups.get(0) instanceof ThreadGroupReference);
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java
deleted file mode 100644
index 3916821..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import java.util.ArrayList;
-
-import com.sun.jdi.BooleanValue;
-import com.sun.jdi.StringReference;
-import com.sun.jdi.event.AccessWatchpointEvent;
-import com.sun.jdi.event.ModificationWatchpointEvent;
-import com.sun.jdi.event.WatchpointEvent;
-import com.sun.jdi.request.EventRequestManager;
-
-/**
- * Tests for JDI com.sun.jdi.event.WatchpointEvent.
- */
-public class WatchpointEventTest extends AbstractJDITest {
-
-	private WatchpointEvent fAccessWatchpointEvent,
-		fStaticAccessWatchpointEvent,
-		fModificationWatchpointEvent;
-	// NB: Static modification watchpoint event is tested in ModificationWatchpointTest
-	/**
-	 * Creates a new test.
-	 */
-	public WatchpointEventTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Trigger an access watchpoint event
-		fAccessWatchpointEvent =
-			(AccessWatchpointEvent) triggerAndWait(getAccessWatchpointRequest(),
-				"AccessWatchpointEvent",
-				true);
-		assertTrue("Got access watchpoint event", fAccessWatchpointEvent != null);
-
-		// Trigger a static access watchpoint event
-		fStaticAccessWatchpointEvent =
-			(AccessWatchpointEvent) triggerAndWait(
-				getStaticAccessWatchpointRequest(),
-				"StaticAccessWatchpointEvent",
-				true);
-		assertTrue(
-			"Got static access watchpoint event",
-			fStaticAccessWatchpointEvent != null);
-
-		// Trigger a modification watchpoint event
-		fModificationWatchpointEvent =
-			(ModificationWatchpointEvent) triggerAndWait(
-				getModificationWatchpointRequest(),
-				"ModificationWatchpointEvent",
-				false);
-		// Interrupt the VM so that we can test valueCurrent()
-		assertTrue(
-			"Got modification watchpoint event",
-			fModificationWatchpointEvent != null);
-
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Ensure that the modification of the "fBool" field has completed
-		fVM.resume();
-		waitUntilReady();
-
-		// Delete the event requests we created in this test
-		EventRequestManager requestManager = fVM.eventRequestManager();
-		requestManager.deleteEventRequests(
-			new ArrayList(requestManager.accessWatchpointRequests()));
-		requestManager.deleteEventRequests(
-			new ArrayList(requestManager.modificationWatchpointRequests()));
-
-		// Set the value of the "fBool" field back to its original value
-		resetField();
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new WatchpointEventTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.event.WatchpointEvent";
-	}
-	/**
-	 * Test JDI field().
-	 */
-	public void testJDIField() {
-		assertEquals("1", getField("fBool"), fAccessWatchpointEvent.field());
-		assertEquals(
-			"2",
-			getField("fString"),
-			fStaticAccessWatchpointEvent.field());
-		assertEquals(
-			"3",
-			getField("fBool"),
-			fModificationWatchpointEvent.field());
-	}
-	/**
-	 * Test JDI object().
-	 */
-	public void testJDIObject() {
-		assertEquals(
-			"1",
-			getObjectReference(),
-			fAccessWatchpointEvent.object());
-		assertTrue("2", fStaticAccessWatchpointEvent.object() == null);
-		assertEquals(
-			"3",
-			getObjectReference(),
-			fModificationWatchpointEvent.object());
-	}
-	/**
-	 * Test JDI valueCurrent().
-	 */
-	public void testJDIValueCurrent() {
-		assertTrue(
-			"1",
-			false
-				== ((BooleanValue) fAccessWatchpointEvent.valueCurrent()).value());
-
-		assertEquals(
-			"2",
-			"Hello World",
-			((StringReference) fStaticAccessWatchpointEvent.valueCurrent())
-				.value());
-
-		assertTrue(
-			"3",
-			false
-				== ((BooleanValue) fModificationWatchpointEvent.valueCurrent())
-					.value());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java
deleted file mode 100644
index 2b2bbe6..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointRequestTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests;
-
-import com.sun.jdi.request.WatchpointRequest;
-
-/**
- * Tests for JDI com.sun.jdi.request.WatchpointRequest.
- */
-public class WatchpointRequestTest extends AbstractJDITest {
-
-	private WatchpointRequest fAccessWatchpointRequest,
-		fModificationWatchpointRequest;
-	/**
-	 * Creates a new test .
-	 */
-	public WatchpointRequestTest() {
-		super();
-	}
-	/**
-	 * Init the fields that are used by this test only.
-	 */
-	public void localSetUp() {
-		// Get an acces watchpoint request
-		fAccessWatchpointRequest = getAccessWatchpointRequest();
-
-		// Get a modification watchpoint request
-		fModificationWatchpointRequest = getModificationWatchpointRequest();
-	}
-	/**
-	 * Make sure the test leaves the VM in the same state it found it.
-	 */
-	public void localTearDown() {
-		// Delete the watchpoint requests we created in this test
-		fVM.eventRequestManager().deleteEventRequest(fAccessWatchpointRequest);
-		fVM.eventRequestManager().deleteEventRequest(
-			fModificationWatchpointRequest);
-	}
-	/**
-	 * Run all tests and output to standard output.
-	 */
-	public static void main(java.lang.String[] args) {
-		new WatchpointRequestTest().runSuite(args);
-	}
-	/**
-	 * Gets the name of the test case.
-	 */
-	public String getName() {
-		return "com.sun.jdi.request.WatchpointRequest";
-	}
-	/**
-	 * Test JDI field().
-	 */
-	public void testJDIField() {
-		assertEquals("1", getField("fBool"), fAccessWatchpointRequest.field());
-		assertEquals(
-			"2",
-			getField("fBool"),
-			fModificationWatchpointRequest.field());
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
deleted file mode 100644
index e4780fd..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/MainClass.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
- 
-/**
- * Main class for target VM tests.
- * This class is intended to be run by the target VM. 
- * It will use other classes in this package, and it will create and terminate
- * threads as a regular program would do.
- *
- * WARNING, WARNING:
- * Tests in org.eclipse.debug.jdi.tests assume the content of this class, 
- * as well as its behavior. So if this class or one of the types in this
- * package is changed, the corresponding tests must also be changed.
- */
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Date;
-
-public class MainClass extends Date implements Runnable, Printable {
-
-	private static byte[] byteArray = new byte[0];
-	private static byte[][] byteDoubleArray = new byte[0][0];
-	private static short[] shortArray = new short[0];
-	private static short[][] shortDoubleArray = new short[0][0];
-	private static int[] intArray = new int[0];
-	private static int[][] intDoubleArray = new int[0][0];
-	private static long[] longArray = new long[0];
-	private static long[][] longDoubleArray = new long[0][0];
-	private static double[] doubleArray = new double[0];
-	private static double[][] doubleDoubleArray = new double[0][0];
-	private static float[] floatArray = new float[0];
-	private static float[][] floatDoubleArray = new float[0][0];
-	private static char[] charArray = new char[0];
-	private static char[][] charDoubleArray = new char[0][0];
-	private static boolean[] booleanArray = new boolean[0];
-	private static boolean[][] booleanDoubleArray = new boolean[0][0];
-
-	private String string = "";
-	private String[] stringArray = new String[0];
-	private String[][] stringDoubleArray = new String[0][0];
-
-	public static int fInt = 0;
-
-	public static MainClass fObject = new MainClass();
-
-	public static String fString = "Hello World";
-
-	public static Thread fThread;
-
-	public static Thread fMainThread;
-
-	public static String[] fArray = new String[] { "foo", "bar", "hop" };
-
-	public static double[] fDoubleArray = new double[] { 1, 2.2, 3.33 };
-
-	public static String fEventType = "";
-
-	public boolean fBool = false;
-
-	private char fChar = 'a';
-
-	private String fString2 = "Hello";
-
-	protected final String fString3 = "HEY";
-
-	public MainClass() {
-	}
-
-	/* Used to test ClassType.newInstance */
-	public MainClass(int i, Object o1, Object o2) {
-	}
-
-	/* For invocation tests */
-	private static String invoke1(int x, Object o) {
-		if (o == null)
-			return (new Integer(x)).toString();
-		else
-			return "";
-	}
-	/* For invocation tests */
-	private static void invoke2() {
-		throw new IndexOutOfBoundsException();
-	}
-	/* For invocation tests */
-	private int invoke3(String str, Object o) {
-		return Integer.parseInt(str);
-	}
-	/* For invocation tests */
-	private long invoke4() throws java.io.EOFException {
-		throw new java.io.EOFException();
-	}
-	/* For variables test */
-	private void variablesTest(long l) {
-	}
-	public static void main(java.lang.String[] args) {
-		// Start the test program
-		ThreadGroup group = new ThreadGroup("Test ThreadGroup");
-		fThread = new Thread(group, fObject, "Test Thread");
-		fThread.start();
-
-		fMainThread = Thread.currentThread();
-
-		// Prevent this thread from dying
-		while (true)
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-	}
-	public void print(OutputStream out) {
-		String string = fInt++ +". " + fString;
-		PrintWriter writer = new PrintWriter(out);
-		writer.println(string);
-		writer.flush();
-	}
-	synchronized public void printAndSignal() {
-		print(System.out);
-
-		// Signal readiness by throwing an exception
-		try {
-			throw new NegativeArraySizeException();
-		} catch (NegativeArraySizeException exc) {
-		}
-	}
-	public void run() {
-		try {
-			Thread t = Thread.currentThread();
-			MainClass o = new OtherClass();
-			// The front-end tests use the class load event to determine that the program has started
-
-			if (CONSTANT == 2)
-				System.out.println("CONSTANT=2");
-
-			while (true) {
-				printAndSignal();
-				triggerEvent();
-				useLocalVars(t, o);
-				try {
-					Thread.sleep(1000);
-				} catch (InterruptedException e) {
-				}
-			}
-		} finally {
-			System.out.println("Running finally block in MainClass.run()");
-		}
-	}
-	/**
-	 *	Trigger an access watchpoint event for the front-end.
-	 */
-	private void triggerAccessWatchpointEvent() {
-		if (fBool)
-			System.out.println("fBool is true");
-	}
-	/**
-	 *	Trigger a breakpoint event for the front-end.
-	 */
-	private void triggerBreakpointEvent() {
-		System.out.println("Breakpoint");
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent() {
-		new TestClass();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent1() {
-		new TestClass1();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent2() {
-		new TestClass2();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent3() {
-		new TestClass3();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent4() {
-		new TestClass4();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent5() {
-		new TestClass5();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent6() {
-		new TestClass6();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent7() {
-		new TestClass7();
-		new TestClazz8();
-	}
-	/**
-	 *	Trigger a class prepare event for the front-end.
-	 */
-	private void triggerClassPrepareEvent8() {
-		new TestClazz9();
-		new TestClazz10();
-	}
-	/**
-	 *	Trigger an event for the front-end.
-	 */
-	private void triggerEvent() {
-		/* Ensure we do it only once */
-		String eventType = fEventType;
-		fEventType = "";
-
-		/* Trigger event according to the field fEventType */
-		if (eventType.equals(""))
-			return;
-		else if (eventType.equals("AccessWatchpointEvent"))
-			triggerAccessWatchpointEvent();
-		else if (eventType.equals("StaticAccessWatchpointEvent"))
-			triggerStaticAccessWatchpointEvent();
-		else if (eventType.equals("BreakpointEvent"))
-			triggerBreakpointEvent();
-		else if (eventType.equals("ClassPrepareEvent"))
-			triggerClassPrepareEvent();
-		else if (eventType.equals("ClassPrepareEvent1"))
-			triggerClassPrepareEvent1();
-		else if (eventType.equals("ClassPrepareEvent2"))
-			triggerClassPrepareEvent2();
-		else if (eventType.equals("ClassPrepareEvent3"))
-			triggerClassPrepareEvent3();
-		else if (eventType.equals("ClassPrepareEvent4"))
-			triggerClassPrepareEvent4();
-		else if (eventType.equals("ClassPrepareEvent5"))
-			triggerClassPrepareEvent5();
-		else if (eventType.equals("ClassPrepareEvent6"))
-			triggerClassPrepareEvent6();
-		else if (eventType.equals("ClassPrepareEvent7"))
-			triggerClassPrepareEvent7();
-		else if (eventType.equals("ClassPrepareEvent8"))
-			triggerClassPrepareEvent8();
-		else if (eventType.equals("ExceptionEvent"))
-			triggerExceptionEvent();
-		else if (eventType.equals("ModificationWatchpointEvent"))
-			triggerModificationWatchpointEvent();
-		else if (eventType.equals("StaticModificationWatchpointEvent"))
-			triggerStaticModificationWatchpointEvent();
-		else if (eventType.equals("ThreadStartEvent"))
-			triggerThreadStartEvent();
-		else if (eventType.equals("ThreadDeathEvent"))
-			triggerThreadDeathEvent();
-		else
-			System.out.println("Unknown event type: " + eventType);
-	}
-	/**
-	 *	Trigger an exception event for the front-end.
-	 */
-	private void triggerExceptionEvent() {
-		Thread t = new Thread(new Runnable() {
-			public void run() {
-				throw new Error();
-			}
-		}, "Test Exception Event");
-		t.start();
-	}
-	/**
-	 *	Trigger a modification watchpoint event for the front-end.
-	 */
-	private void triggerModificationWatchpointEvent() {
-		fBool = true;
-	}
-	/**
-	 * Trigger an access watchpoint event to a static field
-	 * for the front-end.
-	 */
-	private void triggerStaticAccessWatchpointEvent() {
-		if (fObject == null)
-			System.out.println("fObject is null");
-	}
-	/**
-	 * Trigger a modification watchpoint event of a static field
-	 * for the front-end.
-	 */
-	private void triggerStaticModificationWatchpointEvent() {
-		fString = "Hello Universe";
-	}
-	/**
-	 *	Trigger a thread end event for the front-end.
-	 */
-	private void triggerThreadDeathEvent() {
-		new Thread("Test Thread Death Event").start();
-	}
-	/**
-	 *	Trigger a thread start event for the front-end.
-	 */
-	private void triggerThreadStartEvent() {
-		new Thread("Test Thread Start Event").start();
-	}
-	private void useLocalVars(Thread t, MainClass o) {
-		if (t == null)
-			System.out.println("t is null");
-		if (o == null)
-			System.out.println("o is null");
-
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java
deleted file mode 100644
index f89442b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/OtherClass.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class OtherClass extends MainClass {
-	class InnerClass {
-	}
-	InnerClass fInner = new InnerClass();
-	/**
-	 * OtherClass constructor comment.
-	 */
-	public OtherClass() {
-		super();
-	}
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java
deleted file mode 100644
index 1c6d0cf..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Printable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-/**
- * Interface type for target VM tests.
- * This interface is intended to be loaded by the target VM. 
- *
- * WARNING, WARNING:
- * Tests in org.eclipse.debug.jdi.tests assume the content of this interface.
- * So if this interface or one of the types in this
- * package is changed, the corresponding tests must also be changed.
- */
-
-import java.io.OutputStream;
-
-public interface Printable extends Cloneable {
-	int CONSTANT = 1;
-public void print(OutputStream out);
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Test shared config.launch b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Test shared config.launch
deleted file mode 100644
index 642c831..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/Test shared config.launch
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/bin/ls"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-</launchConfiguration>
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java
deleted file mode 100644
index 0cdadb6..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java
deleted file mode 100644
index ec98b92..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass1.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass1 {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java
deleted file mode 100644
index 0127789..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass2.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass2 {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java
deleted file mode 100644
index 30af518..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass3.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass3 {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java
deleted file mode 100644
index bb19227..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass4.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass4 {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java
deleted file mode 100644
index dd57273..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass5.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass5 {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java
deleted file mode 100644
index 034986e..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass6.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass6 {
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java
deleted file mode 100644
index 18ac2d7..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClass7.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClass7 {
-
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java
deleted file mode 100644
index d80358b..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz10.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClazz10 {
-
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java
deleted file mode 100644
index 0042f76..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz8.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClazz8 {
-
-}
diff --git a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java b/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java
deleted file mode 100644
index bcb9391..0000000
--- a/org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/program/TestClazz9.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.jdi.tests.program;
-
-public class TestClazz9 {
-
-}
diff --git a/org.eclipse.jdt.debug.tests/.classpath b/org.eclipse.jdt.debug.tests/.classpath
deleted file mode 100644
index 9bb3fff..0000000
--- a/org.eclipse.jdt.debug.tests/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="test plugin"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="src" path="console tests"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.debug.tests/.cvsignore b/org.eclipse.jdt.debug.tests/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.jdt.debug.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/.plugins-path b/org.eclipse.jdt.debug.tests/.plugins-path
deleted file mode 100644
index 36f1716..0000000
--- a/org.eclipse.jdt.debug.tests/.plugins-path
+++ /dev/null
@@ -1 +0,0 @@
-platformPath = file:/d:/workspaces/eclipse-sh1/plugins/
diff --git a/org.eclipse.jdt.debug.tests/.project b/org.eclipse.jdt.debug.tests/.project
deleted file mode 100644
index 9c6af7d..0000000
--- a/org.eclipse.jdt.debug.tests/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.debug.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 470ea86..0000000
--- a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-#Wed Jul 27 15:11:36 CDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
diff --git a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.pde.prefs b/org.eclipse.jdt.debug.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 2f5eef9..0000000
--- a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Wed Nov 24 22:36:10 GMT-08:00 2004

-compilers.p.unused-element-or-attribute=1

-compilers.p.unresolved-ex-points=0

-compilers.p.deprecated=1

-compilers.p.unknown-element=0

-compilers.p.unknown-resource=1

-compilers.p.unknown-class=1

-compilers.p.unknown-attribute=0

-compilers.p.no-required-att=0

-eclipse.preferences.version=1

-compilers.p.unresolved-import=0

-compilers.p.not-externalized-att=1

-compilers.p.illegal-att-value=0

-compilers.use-project=true

diff --git a/org.eclipse.jdt.debug.tests/about.html b/org.eclipse.jdt.debug.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/org.eclipse.jdt.debug.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/build.properties b/org.eclipse.jdt.debug.tests/build.properties
deleted file mode 100644
index 7ca46d5..0000000
--- a/org.eclipse.jdt.debug.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               testresources/,\
-               testjars/,\
-               testprograms/,\
-               *.jar
-source.javadebugtests.jar = test plugin/,\
-                            tests/,\
-                            console tests/
-output.javadebugtests.jar = bin/
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java
deleted file mode 100644
index 1fc1e54..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleEchoActionDelegate.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IOConsole;
-import org.eclipse.ui.console.IOConsoleInputStream;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-
-public class IOConsoleEchoActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate {
-
-    public void init(IAction action) {
-    }
-
-    public void dispose() {
-    }
-
-    public void runWithEvent(IAction action, Event event) {
-        run(action);
-    }
-
-    public void run(IAction action) {
-        final IOConsole console = new IOConsole("IO Test Console", null, DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
-        new Thread(new Runnable() {
-            public void run() {
-                runTest(console);
-            }
-        }, "IOConsole Test Thread").start(); //$NON-NLS-1$
-    }
-    
-    public void runTest(IOConsole console) {
-        final Display display = Display.getDefault();
-        
-        final IOConsoleInputStream in = console.getInputStream();
-        display.asyncExec(new Runnable() {
-            public void run() {        
-                in.setColor(display.getSystemColor(SWT.COLOR_BLUE));
-            }
-        });
-        IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
-        manager.addConsoles(new IConsole[] { console });
-        
-        final IOConsoleOutputStream out = console.newOutputStream(); //$NON-NLS-1$
-        Display.getDefault().asyncExec(new Runnable() {
-            public void run() {
-                out.setColor(Display.getDefault().getSystemColor(SWT.COLOR_GREEN));     
-                out.setFontStyle(SWT.ITALIC);
-            }
-        });
-        
-        PrintStream ps = new PrintStream(out);
-        ps.println("Any text entered should be echoed back"); //$NON-NLS-1$
-        for(;;) {
-            byte[] b = new byte[1024];
-            int bRead = 0;
-            try {
-                bRead = in.read(b);
-            } catch (IOException io) {
-                io.printStackTrace();
-            }
-            
-            try {
-                out.write(b, 0, bRead);
-                ps.println();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public void selectionChanged(IAction action, ISelection selection) {
-    }
-
-    public void init(IWorkbenchWindow window) {
-    }
-
-}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java
deleted file mode 100644
index 492d452..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleHyperlinkActionDelegate.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import java.io.PrintStream;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IHyperlink;
-import org.eclipse.ui.console.IOConsole;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-import org.eclipse.ui.console.IPatternMatchListener;
-import org.eclipse.ui.console.PatternMatchEvent;
-import org.eclipse.ui.console.TextConsole;
-
-public class IOConsoleHyperlinkActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate {
- 
-    public void run(IAction action) {
-        final IOConsole console = new IOConsole("IO Test Console", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
-        console.setConsoleWidth(17);
-        IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
-        manager.addConsoles(new IConsole[] { console });
-
-        IPatternMatchListener listener = new IPatternMatchListener() {
-            public String getPattern() {
-                return "1234567890"; //$NON-NLS-1$
-            }
-            
-            public String getLineQualifier() {
-            	return "1234567890"; //$NON-NLS-1$
-            }
-
-            public void matchFound(PatternMatchEvent event) {
-                try {
-                    console.addHyperlink(new MyHyperlink(), event.getOffset(), event.getLength());
-                } catch (BadLocationException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            public int getCompilerFlags() {
-                return 0;
-            }
-
-            public void connect(TextConsole console) {
-            }
-
-            public void disconnect() {
-            }
-        };
-        
-        console.addPatternMatchListener(listener);
-        IOConsoleOutputStream stream = console.newOutputStream();
-        stream.setFontStyle(SWT.ITALIC | SWT.BOLD);
-        final PrintStream out = new PrintStream(stream);
-        new Thread(new Runnable() {
-            public void run() {
-                out.println("Hyperlink -12345678901234567890-");
-            }
-        }).start();
-    }
-    
-    private class MyHyperlink implements IHyperlink {
-        public void linkEntered() {
-            System.out.println("link entered");
-        }
-
-        public void linkExited() {
-            System.out.println("link exited");
-        }
-
-        public void linkActivated() {
-            System.out.println("link activated");
-        }
-    }
-    
-    
-    
-    public void init(IAction action) {        
-    }
-
-    public void dispose() {        
-    }
-
-    public void runWithEvent(IAction action, Event event) {
-        run(action);
-    }
-
-    
-    public void selectionChanged(IAction action, ISelection selection) {
-    }
-
-    public void init(IWorkbenchWindow window) {       
-    }
-
-}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java
deleted file mode 100644
index 68fac3b..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleMultipleStreamActionDelegate.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IOConsole;
-import org.eclipse.ui.console.IOConsoleInputStream;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-
-public class IOConsoleMultipleStreamActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate{
-
-    private boolean ended = false;
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-     */
-    public void init(IAction action) {
-        
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate2#dispose()
-     */
-    public void dispose() {
-    
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-     */
-    public void runWithEvent(IAction action, Event event) {
-     run(action);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) {
-        runTest();
-    }
-    
-    public void runTest() {
-        ended = false;
-        
-        final IOConsole console = new IOConsole("IO Test Console", null, DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
-
-//        console.setWaterMarks(5, 10);
-
-        IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
-        manager.addConsoles(new IConsole[] { console });
-        
-        final Display display = Display.getDefault();
-        final IOConsoleInputStream in = console.getInputStream();
-        final IOConsoleOutputStream echo = console.newOutputStream(); //$NON-NLS-1$
-        display.asyncExec(new Runnable() {
-            public void run() {
-                in.setColor(display.getSystemColor(SWT.COLOR_BLUE));
-                echo.setColor(display.getSystemColor(SWT.COLOR_RED));
-            }
-        });
-        startInputReadThread(in, echo);
-        
-        IOConsoleOutputStream out = console.newOutputStream(); //$NON-NLS-1$
-        startOutputThread(out);
-    }
-        
-    private void startOutputThread(final IOConsoleOutputStream out) {   
-        new Thread(new Runnable() {
-            public void run() {
-                int i = 1;
-                PrintStream ps = new PrintStream(out);
-                ps.println("Enter 'XXX' to stop"); //$NON-NLS-1$
-                while(!ended){
-                    try {
-                        ps.println("TESTING("+i+")"); //$NON-NLS-1$//$NON-NLS-2$
-                        Thread.sleep(1000);
-                        i++;
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }                
-            }
-        }, "OUTPUT").start(); //$NON-NLS-1$
-    }
-    
-    private void startInputReadThread(final InputStream in, final OutputStream out) {
-       new Thread(new Runnable() {
-           public void run() {
-	           try {
-		           byte b[] = new byte[1024];
-		           while(!ended) {
-			           int read = in.read(b);
-			           String string = new String(b, 0, read);
-			           ended = string.startsWith("XXX") ? true : false; //$NON-NLS-1$
-			           if (ended) {
-			               out.write("Threads stopped".getBytes()); //$NON-NLS-1$
-			               continue;
-			           }
-			           out.write("ECHO:".getBytes()); //$NON-NLS-1$
-			           out.write(b, 0, read);
-		           }
-	           } catch (Exception e) {
-	           }
-           }
-       }, "INPUT").start();  //$NON-NLS-1$
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) {
-      
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-     */
-    public void init(IWorkbenchWindow window) {
-    }
-
-}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java
deleted file mode 100644
index 830ae0d..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleOutputActionDelegate.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IOConsole;
-
-public class IOConsoleOutputActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate{
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-     */
-    public void init(IAction action) {
-       
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate2#dispose()
-     */
-    public void dispose() {
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-     */
-    public void runWithEvent(IAction action, Event event) {
-        run(action);
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) {
-        IOConsole console = new IOConsole("Test IOConsole", null, DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
-		IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
-		manager.addConsoles(new IConsole[]{console});
-		OutputStream out = console.newOutputStream(); //$NON-NLS-1$
-		final PrintStream stream = new PrintStream(out);
-		Runnable r = new Runnable() {
-			public void run() {
-			    long start = System.currentTimeMillis();
-				for (int i = 0; i < 1000; i++) {
-					stream.print(Integer.toString(i));
-					stream.print(": Testing..."); //$NON-NLS-1$
-					stream.print("one..."); //$NON-NLS-1$
-					stream.println("two.... three...."); //$NON-NLS-1$
-				}
-				stream.println("Total time: " + (System.currentTimeMillis()-start)); //$NON-NLS-1$
-			}
-		};
-		new Thread(r).start();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) {
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-     */
-    public void init(IWorkbenchWindow window) {
-    }
-
-}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java
deleted file mode 100644
index 7c99016..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/IOConsoleTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IPatternMatchListener;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-import org.eclipse.ui.console.PatternMatchEvent;
-import org.eclipse.ui.console.TextConsole;
-
-/**
- * IOConsoleTests for the Automated suite
- */
-public class IOConsoleTests extends AbstractDebugTest implements IPatternMatchListener {
-    
-    private int fMatchCount;
-
-    public IOConsoleTests(String name) {
-        super(name);
-    }
-    
-    public void testPatternMatchListener() throws Exception {
-        MessageConsole console = new MessageConsole("Test console", null);
-        fMatchCount = 0;
-        console.addPatternMatchListener(this);
-        IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-        consoleManager.addConsoles(new IConsole[]{console});
-        try {
-            MessageConsoleStream stream = console.newMessageStream();
-            stream.print("one foo bar");
-            stream.println();
-            stream.print("two foo bar");
-            Thread.sleep(1500); // ensure the console doc gets updated
-            assertEquals("Should be two foo's", 2, fMatchCount);
-        } finally {
-            consoleManager.removeConsoles(new IConsole[]{console});
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#getPattern()
-     */
-    public String getPattern() {
-        return "foo";
-    }
-    
-    /*
-     *  (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#getQuickPattern()
-     */
-    public String getLineQualifier() {
-    	return "foo";
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#matchFound(org.eclipse.ui.console.PatternMatchEvent)
-     */
-    public void matchFound(PatternMatchEvent event) {
-        fMatchCount++;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.console.IPatternMatchListener#getModifiers()
-	 */
-	public int getCompilerFlags() {
-		return 0;
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.TextConsole)
-     */
-    public void connect(TextConsole console) {
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#disconnect()
-     */
-    public void disconnect() {
-    }
-
-}
-    
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java
deleted file mode 100644
index 16322a6..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestBufferredOutputActionDelegate.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 11, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jdt.debug.tests.console;
-
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-/**
- * @author DWright
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class TestBufferredOutputActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().showView(IConsoleConstants.ID_CONSOLE_VIEW);
-		} catch (PartInitException e) {
-			e.printStackTrace();
-		}
-		MessageConsole console = new MessageConsole("Test Console", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN));
-		IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
-		manager.addConsoles(new IConsole[]{console});
-		final MessageConsoleStream stream = console.newMessageStream();
-		Runnable r = new Runnable() {
-			public void run() {
-			    long start = System.currentTimeMillis();
-				for (int i = 0; i < 1000; i++) {
-					stream.print(Integer.toString(i));
-					stream.print(": Testing..."); //$NON-NLS-1$
-					stream.print("one..."); //$NON-NLS-1$
-					stream.println("two.... three...."); //$NON-NLS-1$
-				}
-				stream.println("Total time: " + (System.currentTimeMillis()-start)); //$NON-NLS-1$
-			}
-		};
-		new Thread(r).start();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java
deleted file mode 100644
index 44702bb..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestMessageConsoleActionDelegate.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-public class TestMessageConsoleActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			DebugUIPlugin.getActiveWorkbenchWindow().getActivePage().showView(IConsoleConstants.ID_CONSOLE_VIEW);
-		} catch (PartInitException e) {
-			e.printStackTrace();
-		}
-		MessageConsole console = new MessageConsole("Test Console", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN));
-		IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager();
-		manager.addConsoles(new IConsole[]{console});
-		MessageConsoleStream stream = console.newMessageStream();
-		stream.println("Testing...");
-		stream.print("one...");
-		stream.println("two.... three....");
-		ColorDialog dialog = new ColorDialog(DebugUIPlugin.getShell());
-		dialog.open();
-		Color color = new Color(Display.getCurrent(), dialog.getRGB());
-		stream.setColor(color);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java b/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java
deleted file mode 100644
index 6d22378..0000000
--- a/org.eclipse.jdt.debug.tests/console tests/org/eclipse/jdt/debug/tests/console/TestShowConsoleActionDelegate.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.console;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-
-public class TestShowConsoleActionDelegate implements IActionDelegate2, IWorkbenchWindowActionDelegate {
-	
-	MessageConsole console1;
-	MessageConsole console2;
-	IConsoleManager consoleManager;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-		console1 = new MessageConsole("Test Console #1", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
-		console2 = new MessageConsole("Test Console #2", DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN)); //$NON-NLS-1$
-		consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-		consoleManager.addConsoles(new IConsole[]{console1, console2});
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		final MessageConsoleStream stream1 = console1.newMessageStream();
-		final MessageConsoleStream stream2 = console2.newMessageStream();
-		
-		stream2.setColor(Display.getDefault().getSystemColor(SWT.COLOR_RED));
-		
-		new Thread(new Runnable() {
-			public void run() {
-				
-				//write to console #1, show it, write again
-				stream1.print("Testing... Testing... Testing... "); //$NON-NLS-1$
-				consoleManager.showConsoleView(console1);
-				stream1.print("More Testing"); //$NON-NLS-1$
-				
-				//write to console #2, show it, write again		
-				stream2.print("Testing... Testing... Testing... "); //$NON-NLS-1$
-				consoleManager.showConsoleView(console2);
-				stream2.print("More Testing"); //$NON-NLS-1$
-				
-				try {
-					for (int i=0; i<4; i++) {
-						consoleManager.showConsoleView(console1);
-						Thread.sleep(1000);
-						consoleManager.showConsoleView(console2);
-						Thread.sleep(1000);
-					}
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-				
-				writeToStream(stream1, "\n\nDone"); //$NON-NLS-1$
-				writeToStream(stream2, "\n\nDone"); //$NON-NLS-1$
-			}
-			
-		}).start();
-	}
-	
-	private void writeToStream(final MessageConsoleStream stream, final String str) {
-		stream.print(str); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/plugin.properties b/org.eclipse.jdt.debug.tests/plugin.properties
deleted file mode 100644
index 1251bda..0000000
--- a/org.eclipse.jdt.debug.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial implementation
-###############################################################################
-
-pluginName=Java Debug Test Plugin
-providerName=Eclipse.org
diff --git a/org.eclipse.jdt.debug.tests/plugin.xml b/org.eclipse.jdt.debug.tests/plugin.xml
deleted file mode 100644
index 3731558..0000000
--- a/org.eclipse.jdt.debug.tests/plugin.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jdt.debug.tests"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.debug.testplugin.JavaTestPlugin">
-
-   <runtime>
-      <library name="javadebugtests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide" optional="true"/>
-      <import plugin="org.eclipse.ui.views" optional="true"/>
-      <import plugin="org.eclipse.jface.text" optional="true"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
-      <import plugin="org.eclipse.ui.editors" optional="true"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.debug"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.update.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.test.performance"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.jdt.launching.classpathProviders">
-      <classpathProvider
-            class="org.eclipse.jdt.debug.testplugin.EmptyClasspathProvider"
-            id="org.eclipse.jdt.debug.tests.EmptyClasspathProvider">
-      </classpathProvider>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.consoleLineTrackers">
-      <consoleLineTracker
-            class="org.eclipse.jdt.debug.testplugin.ConsoleLineTracker"
-            processType="java"
-            id="org.eclipse.jdt.debug.tests.ConsoleLineTracker">
-      </consoleLineTracker>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.core.classpathVariableInitializer">
-      <classpathVariableInitializer
-            variable="NULL_VARIABLE"
-            class="org.eclipse.jdt.debug.testplugin.NullVariableInitializer">
-      </classpathVariableInitializer>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchModes">
-      <launchMode
-            label="TEST_MODE"
-            mode="TEST_MODE">
-      </launchMode>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchDelegates">
-      <launchDelegate
-            delegate="org.eclipse.jdt.debug.testplugin.TestModeLaunchDelegate"
-            type="org.eclipse.jdt.launching.localJavaApplication"
-            modes="TEST_MODE"
-            id="org.eclipse.jdt.debug.tests.testModeLaunchDelegate">
-      </launchDelegate>
-      <launchDelegate
-            sourceLocatorId="org.eclipse.jdt.debug.tests.testSourceLocator"
-            delegate="org.eclipse.jdt.debug.testplugin.TestLaunchDelegate"
-            type="org.eclipse.jdt.debug.tests.testConfigType"
-            sourcePathComputerId="org.eclipse.jdt.debug.tests.testSourcePathComputer"
-            modes="debug"
-            id="org.eclipse.jdt.debug.tests.testSourceDelegate"/>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.jdt.launching.localJavaApplication"
-            class="org.eclipse.jdt.debug.testplugin.TestJavaApplicationTabGroup"
-            id="org.eclipse.jdt.debug.tests.launchConfigurationTabGroup.testJavaApplication">
-         <launchMode
-               perspective="org.eclipse.jdt.ui.JavaPerspective"
-               mode="TEST_MODE">
-         </launchMode>
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.core.variables.valueVariables">
-      <variable
-            initializerClass="org.eclipse.jdt.debug.testplugin.ValueVariableInitializer"
-            name="VALUE_VAR_WITH_INITIALIZER"
-            description="sample variable with initializer">
-      </variable>
-      <variable
-            initialValue="initial-value"
-            name="VALUE_VAR_WITH_VALUE"
-            description="sample variable with value">
-      </variable>
-   </extension>
-   <extension
-         point="org.eclipse.core.variables.dynamicVariables">
-      <variable
-            name="SAMPLE_DYNAMIC_VAR"
-            description="sample dynamic variable"
-            resolver="org.eclipse.jdt.debug.testplugin.SampleDynamicVariableResolver">
-      </variable>
-   </extension>
-   <extension
-         id="messageConsoleActionSet"
-         name="Message Console Test"
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Message Console Test"
-            description="Tests the message (generic) console"
-            id="org.eclipse.jdt.debug.tests.messageConsoleActionSet">
-         <menu
-               label="Run"
-               path="additions"
-               id="org.eclipse.ui.run">
-            <separator
-                  name="TestGroup">
-            </separator>
-         </menu>
-         <action
-               label="Test Bufferred Output"
-               class="org.eclipse.jdt.debug.tests.console.TestBufferredOutputActionDelegate"
-               menubarPath="org.eclipse.ui.run/TestGroup"
-               id="org.eclipse.jdt.debug.tests.testBufferredOutputAction">
-         </action>
-         <action
-               label="Test Message Console"
-               class="org.eclipse.jdt.debug.tests.console.TestMessageConsoleActionDelegate"
-               menubarPath="org.eclipse.ui.run/TestGroup"
-               id="org.eclipse.jdt.debug.tests.testMessageConsoleAction">
-         </action>
-         <action
-               label="Test Show Console"
-               class="org.eclipse.jdt.debug.tests.console.TestShowConsoleActionDelegate"
-               menubarPath="org.eclipse.ui.run/TestGroup"
-               id="org.eclipse.jdt.debug.tests.testShowConsoleAction">
-         </action>         
-      </actionSet>
-      <actionSet
-            label="IO Console Tests"
-            description="Test the generic IOConsole"
-            id="org.eclipse.jdt.debug.tests.ioConsoleTest">
-         <menu
-               label="Run"
-               path="additions"
-               id="org.eclipse.ui.run"/>
-         <action
-               label="IOConsole Echo Test"
-               class="org.eclipse.jdt.debug.tests.console.IOConsoleEchoActionDelegate"
-               menubarPath="org.eclipse.ui.run/IOConsoleTestGroup"
-               id="org.eclipse.jdt.debug.tests.echoTest"/>
-         <action
-               label="IOConsole Multiple Stream Test"
-               class="org.eclipse.jdt.debug.tests.console.IOConsoleMultipleStreamActionDelegate"
-               menubarPath="org.eclipse.ui.run/IOConsoleTestGroup"
-               id="org.eclipse.jdt.debug.tests.outputTest"/>
-         <action
-               label="IOConsole Output Test"
-               class="org.eclipse.jdt.debug.tests.console.IOConsoleOutputActionDelegate"
-               menubarPath="org.eclipse.ui.run/IOConsoleTestGroup"
-               id="org.eclipse.jdt.debug.tests.outputTest"/>
-         <action
-               label="IOConsole Hyperlink Test"
-               class="org.eclipse.jdt.debug.tests.console.IOConsoleHyperlinkActionDelegate"
-               menubarPath="org.eclipse.ui.run/IOConsoleTestGroup"
-               id="org.eclipse.jdt.debug.tests.hyperlinkTest"/>
-
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="Test Config Type"
-            delegate="org.eclipse.jdt.debug.testplugin.TestLaunchDelegate"
-            modes="run"
-            id="org.eclipse.jdt.debug.tests.testConfigType">
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.statusHandlers">
-      <statusHandler
-            code="1000"
-            plugin="org.eclipse.jdt.debug.tests"
-            class="org.eclipse.jdt.debug.tests.ui.performance.JavaApplicationStatusHandler"
-            id="org.eclipse.jdt.debug.tests.performance.statusHandler.JavaApplication">
-      </statusHandler>
-   </extension>
-
-   <extension point="org.eclipse.debug.ui.memoryRenderings">
-      <renderingType
-            id="rendering_type_1"
-            name="Rendering One"
-            class="org.eclipse.jdt.debug.testplugin.RenderingTypeDelegate">
-      </renderingType>
-      <renderingType
-            id="rendering_type_2"
-            name="Rendering Two"
-            class="org.eclipse.jdt.debug.testplugin.RenderingTypeDelegate">
-      </renderingType>
-      <renderingType
-            id="rendering_type_3"
-            name="Rendering Default"
-            class="org.eclipse.jdt.debug.testplugin.RenderingTypeDelegate">
-      </renderingType>      
-      <renderingBindings
-      		primaryId="rendering_type_1">
-      		<enablement>
-      			<instanceof value="org.eclipse.jdt.debug.testplugin.MemoryBlockOne"/>
-      		</enablement>
-      </renderingBindings>
-      <renderingBindings
-      		renderingIds="rendering_type_1, rendering_type_2">
-      		<enablement>
-      			<instanceof value="org.eclipse.jdt.debug.testplugin.MemoryBlockTwo"/>
-      		</enablement>
-      </renderingBindings>
-      <renderingBindings
-      		defaultIds="rendering_type_3">
-      		<enablement>
-      			<instanceof value="org.eclipse.jdt.debug.testplugin.MemoryBlockThree"/>
-      		</enablement>
-      </renderingBindings>  
-      <renderingBindings
-      		class="org.eclipse.jdt.debug.testplugin.DynamicRenderingBindings">
-      		<enablement>
-      			<instanceof value="org.eclipse.jdt.debug.testplugin.MemoryBlockDynamic"/>
-      		</enablement>
-      </renderingBindings>                  
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.sourceLocators">
-      <sourceLocator
-            class="org.eclipse.jdt.debug.testplugin.TestSourceLocator"
-            name="Test Source Locator"
-            id="org.eclipse.jdt.debug.tests.testSourceLocator"/>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.sourcePathComputers">
-      <sourcePathComputer
-            class="org.eclipse.jdt.debug.tests.SourcePathComputerDelegate1"
-            id="org.eclipse.jdt.debug.tests.testSourcePathComputer"/>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.core.classpathContainerInitializer">
-      <classpathContainerInitializer
-            class="org.eclipse.jdt.debug.testplugin.TestClasspathContainerInitializer"
-            id="org.eclipse.jdt.debug.tests.TestClasspathContainer"/>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.debug.tests/scripts/buildTestSourceAttachmentJar.xml b/org.eclipse.jdt.debug.tests/scripts/buildTestSourceAttachmentJar.xml
deleted file mode 100644
index 7813ada..0000000
--- a/org.eclipse.jdt.debug.tests/scripts/buildTestSourceAttachmentJar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<project name="Build test source attachment jars" default="export" basedir="..">
-	<target name="export">
-		<jar 
-			jarfile="./testresources/testJarWithOutRoot.jar"
-			basedir="testprograms"
-			includes="**"
-		/>
-	</target>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/scripts/generateTests.xml b/org.eclipse.jdt.debug.tests/scripts/generateTests.xml
deleted file mode 100644
index 85c534c..0000000
--- a/org.eclipse.jdt.debug.tests/scripts/generateTests.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project name="Generate Evaluation Tests" default="generateTests" basedir="..">
-	<target name="generateTests">
-		<java
-			classname="org.eclipse.jdt.debug.tests.eval.generator.TestGenerator"
-			fork="true"
-			failonerror="true"
-			dir="${basedir}/tests/org/eclipse/jdt/debug/tests/eval">
-			<classpath>
-				<pathelement path="${basedir}/bin"/>
-			</classpath>
-		</java>
-	</target>
-</project>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java
deleted file mode 100644
index a4fdb4c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ConsoleLineTracker.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Simple console line tracker extension point that delegates messages 
- */
-public class ConsoleLineTracker implements IConsoleLineTrackerExtension {
-	
-	/**
-	 * Forwards messages to the delegate when not <code>null</code> 
-	 */
-	private static IConsoleLineTrackerExtension fDelegate;
-	private static IConsole fConsole;
-	
-	/**
-	 * Sets the delegate, possilby <code>null</code>
-	 *  
-	 * @param tracker
-	 */
-	public static void setDelegate(IConsoleLineTrackerExtension tracker) {
-		fDelegate = tracker;
-		fConsole = null;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-		if (fDelegate != null) {
-			fDelegate.dispose();
-		}
-		fConsole = null;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public synchronized void init(IConsole console) {
-		fConsole= console;
-		if (fDelegate != null) {
-			fDelegate.init(console);
-		}
-	}
-	
-	public static IDocument getDocument() {
-		return fConsole.getDocument();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		if (fDelegate != null) {
-			fDelegate.lineAppended(line);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#streamClosed()
-	 */
-	public void consoleClosed() {
-		if (fDelegate != null && fConsole != null) {
-			fDelegate.consoleClosed();
-		}		
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
deleted file mode 100644
index 2b6d7a1..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Waits for an event on a specific element
- */
-
-public class DebugElementEventWaiter extends DebugEventWaiter {
-	
-	protected Object fElement;
-	
-	public DebugElementEventWaiter(int kind, Object element) {
-		super(kind);
-		fElement = element;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		return super.accept(event) && fElement == event.getSource();
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
deleted file mode 100644
index 7b1bc1a..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Wait for the specified event with the specified from the specified element.
- */
-public class DebugElementKindEventDetailWaiter extends DebugElementKindEventWaiter {
-
-	protected int fDetail;
-
-	public DebugElementKindEventDetailWaiter(int eventKind, Class elementClass, int detail) {
-		super(eventKind, elementClass);
-		fDetail = detail;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		return super.accept(event) && fDetail == event.getDetail();
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
deleted file mode 100644
index f31008b..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-
-/**
- * Waits for a type of event on a kind of element.  Compare this to SpecificDebugElementEventWaiter which is
- * used to wait for a type of event on a specific debug element object.
- */
-
-public class DebugElementKindEventWaiter extends DebugEventWaiter {
-	
-	protected Class fElementClass;
-	
-	public DebugElementKindEventWaiter(int eventKind, Class elementClass) {
-		super(eventKind);
-		fElementClass = elementClass;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		Object o = event.getSource();
-		return super.accept(event) && fElementClass.isInstance(o);
-	}
-
-}
-
-
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
deleted file mode 100644
index 052e220..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-
-/**
- * The <code>DebugEventWaiter</code> is
- * to wait for a specific kind of debug event.
- * <p>
- * When a <code>DebugEventWaiter</code> is created, it
- * registers itself with the <code>DebugPlugin</code> as
- * a <code>IDebugEventSetListener</code>.
- * <p>
- * NOTE: <code>DebugEventWaiter</code> objects are intended for
- * one time use only!
- */
-public class DebugEventWaiter implements IDebugEventSetListener {
-	/**
-	 * The kind of event the waiter is waiting for
-	 */
-	protected int fEventType;
-
-	/**
-	 * The number of milliseconds the waiter will wait before timing out.
-	 */
-	protected long fTimeout;
-
-	/**
-	 * The <code>IDebugModelManager</code> this waiter is listening to.
-	 */
-	protected DebugPlugin fDebugPlugin;
-
-	/**
-	 * The <code>DebugEvent</code> received.
-	 */
-	protected DebugEvent fEvent;
-	
-	/**
-	 * The event set that was accepted
-	 */
-	protected DebugEvent[] fEventSet;
-
-	/**
-	 * The default timeout value if none is given (20000).
-	 */
-	public static final long DEFAULT_TIMEOUT= 15000;
-
-	/**
-	 * Creates a new <code>DebugEventWaiter</code> which
-	 * waits for events of a kind <code>eventType</code>.
-	 * The wait method will wait the default timeout value.
-	 */
-	public DebugEventWaiter(int eventType) {
-		fDebugPlugin= DebugPlugin.getDefault();
-		fEventType= eventType;
-		fTimeout= DEFAULT_TIMEOUT;
-
-		fDebugPlugin.addDebugEventListener(this);
-	}
-
-	/**
-	 * Answers true if the <code>DebugEvent</code> is acceptable.
-	 */
-	public boolean accept(DebugEvent event) {
-		return event.getKind() == fEventType && event.getDetail() != DebugEvent.EVALUATION_IMPLICIT;
-	}
-	/**
-	 * Answers the event name associated with the given flag.
-	 */
-	public String getEventKindName() {
-		switch (fEventType) {
-			case DebugEvent.CREATE :
-				return "Create";
-			case DebugEvent.TERMINATE :
-				return "Terminate";
-			case DebugEvent.RESUME :
-				return "Resume";
-			case DebugEvent.SUSPEND :
-				return "Suspend";
-			default :
-				return "UNKNOWN";
-		}
-	}
-
-	/**
-	 * Handles debug events.
-	 *
-	 * @see IDebugEventListener
-	 * @see #accept(DebugEvent)
-	 */
-	public synchronized void handleDebugEvents(DebugEvent[] events) {
-		//printReceived(events);
-		for (int i = 0; i < events.length; i++) {
-			if (accept(events[i])) {
-				fEvent= events[i];
-				fEventSet = events;
-				unregister();
-				notifyAll();
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Prints a message indicating which event was received.
-	 */
-	protected void printReceived(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			System.out.println(this +" got " + events[i]);
-		}
-	}
-
-	/**
-	 * Sets the number of milliseconds to wait for this callback
-	 */
-	public void setTimeout(long milliseconds) {
-		fTimeout= milliseconds;
-	}
-
-	/**
-	 * Unregisters this waiter as a listener
-	 */
-	public void unregister() {
-		fDebugPlugin.removeDebugEventListener(this);
-	}
-
-	/**
-	 * Returns the source of the accepted event, or <code>null</code>
-	 * if no event was accepted.
-	 */
-	public synchronized Object waitForEvent() {
-		if (fEvent == null) {
-			try {
-				wait(fTimeout);
-			} catch (InterruptedException ie) {
-				System.err.println("Interrupted waiting for event");
-			}
-		}
-		unregister();
-		if (fEvent == null)
-			return null;
-		return fEvent.getSource();
-	}
-
-	/**
-	 * Returns the accepted event, if any.
-	 */
-	public DebugEvent getEvent() {
-		return fEvent;
-	}
-	
-	/**
-	 * Returns the accepted event set, if any.
-	 */
-	public DebugEvent[] getEventSet() {
-		return fEventSet;
-	}	
-}
-
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DynamicRenderingBindings.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DynamicRenderingBindings.java
deleted file mode 100644
index f8c92b7..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DynamicRenderingBindings.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.memory.AbstractMemoryRenderingBindingsProvider;
-import org.eclipse.debug.ui.memory.IMemoryRenderingType;
-
-/**
- * Contributed dynamic rendernig bindings.
- * @since 3.1
- */
-public class DynamicRenderingBindings extends AbstractMemoryRenderingBindingsProvider {
-	
-	//
-	private static DynamicRenderingBindings fgSingleton = null;
-	
-	// id of rendering type bound by this provider
-	private String fId = "rendering_type_1";
-
-	public DynamicRenderingBindings() {
-		fgSingleton = this;
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock)
-     */
-    public IMemoryRenderingType[] getRenderingTypes(IMemoryBlock block) {
-        return new IMemoryRenderingType[]{getPrimaryRenderingType(block)};
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getDefaultRenderingTypes(org.eclipse.debug.core.model.IMemoryBlock)
-     */
-    public IMemoryRenderingType[] getDefaultRenderingTypes(IMemoryBlock block) {
-        return new IMemoryRenderingType[]{getPrimaryRenderingType(block)};
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#getPrimaryRenderingType(org.eclipse.debug.core.model.IMemoryBlock)
-     */
-    public IMemoryRenderingType getPrimaryRenderingType(IMemoryBlock block) {
-        return DebugUITools.getMemoryRenderingManager().getRenderingType(fId);
-    }
-	
-	/**
-	 * Sets the current rendering bound to this provider, and notifies
-	 * listeners of the change.
-	 * 
-	 * @param id rendering id
-	 */
-	public static void setBinding(String id) {
-		fgSingleton.fId = id;
-		fgSingleton.fireBindingsChanged();
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
deleted file mode 100644
index 8fdeb11..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
- 
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathProvider;
-
-/**
- * Extension to test classpath providers extension point
- */
-public class EmptyClasspathProvider implements IRuntimeClasspathProvider {
-
-	/**
-	 * @see IRuntimeClasspathProvider#computeUnresolvedClasspath(ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ExpressionWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ExpressionWaiter.java
deleted file mode 100644
index 843820b..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ExpressionWaiter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IExpression;
-import org.eclipse.debug.core.model.IWatchExpression;
-
-/**
- * ExpressionWaiter
- */
-public class ExpressionWaiter extends DebugElementEventWaiter {
-
-	public ExpressionWaiter(int kind, Object element) {
-		super(kind, element);
-	}
-	
-	public boolean accept(DebugEvent event) {
-		IExpression expression = (IExpression)fElement;
-		boolean pending = false;
-		if (expression instanceof IWatchExpression) {
-		    pending = ((IWatchExpression)expression).isPending();
-		}
-        return super.accept(event) && !pending && expression.getValue() != null;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
deleted file mode 100644
index 6aaeb87..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-/**
- * Helper methods to set up a IJavaProject.
- */
-public class JavaProjectHelper {
-	
-	public static final IPath TEST_SRC_DIR= new Path("testprograms");
-	public static final IPath TEST_COMPILE_ERROR = new Path("testresources/CompilationError.java");	
-
-	/**
-	 * Creates a IJavaProject.
-	 */	
-	public static IJavaProject createJavaProject(String projectName, String binFolderName) throws CoreException {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject project= root.getProject(projectName);
-		if (!project.exists()) {
-			project.create(null);
-		} else {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		
-		if (!project.isOpen()) {
-			project.open(null);
-		}
-		
-		IPath outputLocation;
-		if (binFolderName != null && binFolderName.length() > 0) {
-			IFolder binFolder= project.getFolder(binFolderName);
-			if (!binFolder.exists()) {
-				binFolder.create(false, true, null);
-			}
-			outputLocation= binFolder.getFullPath();
-		} else {
-			outputLocation= project.getFullPath();
-		}
-		
-		if (!project.hasNature(JavaCore.NATURE_ID)) {
-			addNatureToProject(project, JavaCore.NATURE_ID, null);
-		}
-		
-		IJavaProject jproject= JavaCore.create(project);
-		
-		jproject.setOutputLocation(outputLocation, null);
-		jproject.setRawClasspath(new IClasspathEntry[0], null);
-		
-		return jproject;	
-	}
-	
-	/**
-	 * Creates a IJavaProject.
-	 */	
-	public static IJavaProject createJavaProject(String projectName) throws CoreException {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject project= root.getProject(projectName);
-		if (!project.exists()) {
-			project.create(null);
-		} else {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		
-		if (!project.isOpen()) {
-			project.open(null);
-		}
-				
-		if (!project.hasNature(JavaCore.NATURE_ID)) {
-			addNatureToProject(project, JavaCore.NATURE_ID, null);
-		}
-		
-		IJavaProject jproject= JavaCore.create(project);
-		
-		jproject.setRawClasspath(new IClasspathEntry[0], null);
-		
-		return jproject;	
-	}	
-	
-	/**
-	 * Removes a IJavaProject.
-	 */		
-	public static void delete(IJavaProject jproject) throws CoreException {
-		jproject.setRawClasspath(new ClasspathEntry[0], jproject.getProject().getFullPath(), null);
-		jproject.getProject().delete(true, true, null);
-	}
-
-
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	public static IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String containerName) throws CoreException {
-		IProject project= jproject.getProject();
-		IContainer container= null;
-		if (containerName == null || containerName.length() == 0) {
-			container= project;
-		} else {
-			IFolder folder= project.getFolder(containerName);
-			if (!folder.exists()) {
-				folder.create(false, true, null);
-			}
-			container= folder;
-		}
-		IPackageFragmentRoot root= jproject.getPackageFragmentRoot(container);
-		
-		IClasspathEntry cpe= JavaCore.newSourceEntry(root.getPath());
-		addToClasspath(jproject, cpe);		
-		return root;
-	}
-	
-	/**
-	 * Adds a source container to a IJavaProject.
-	 */		
-	public static IPackageFragmentRoot addSourceContainer(IJavaProject jproject, String containerName, String outputName) throws CoreException {
-		IProject project= jproject.getProject();
-		IContainer container= null;
-		if (containerName == null || containerName.length() == 0) {
-			container= project;
-		} else {
-			IFolder folder= project.getFolder(containerName);
-			if (!folder.exists()) {
-				folder.create(false, true, null);
-			}
-			container= folder;
-		}
-		IPackageFragmentRoot root= jproject.getPackageFragmentRoot(container);
-
-		IFolder output = null;
-		if (outputName!= null) {
-			output = project.getFolder(outputName);
-			if (!output.exists()) {
-				output.create(false, true, null);
-			}
-		}
-				
-		IClasspathEntry cpe= JavaCore.newSourceEntry(root.getPath(), new IPath[0], output.getFullPath());
-		
-		addToClasspath(jproject, cpe);		
-		return root;
-	}	
-
-	/**
-	 * Adds a source container to a IJavaProject and imports all files contained
-	 * in the given Zip file.
-	 */	
-	public static IPackageFragmentRoot addSourceContainerWithImport(IJavaProject jproject, String containerName, ZipFile zipFile) throws InvocationTargetException, CoreException {
-		IPackageFragmentRoot root= addSourceContainer(jproject, containerName);
-		importFilesFromZip(zipFile, root.getPath(), null);
-		return root;
-	}
-
-	/**
-	 * Removes a source folder from a IJavaProject.
-	 */		
-	public static void removeSourceContainer(IJavaProject jproject, String containerName) throws CoreException {
-		IFolder folder= jproject.getProject().getFolder(containerName);
-		removeFromClasspath(jproject, folder.getFullPath());
-		folder.delete(true, null);
-	}
-
-	/**
-	 * Adds a library entry to a IJavaProject.
-	 */	
-	public static IPackageFragmentRoot addLibrary(IJavaProject jproject, IPath path) throws JavaModelException {
-		return addLibrary(jproject, path, null, null);
-	}
-
-	/**
-	 * Adds a library entry with source attchment to a IJavaProject.
-	 */			
-	public static IPackageFragmentRoot addLibrary(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newLibraryEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		return jproject.getPackageFragmentRoot(path.toString());
-	}
-
-	/**
-	 * Copies the library into the project and adds it as library entry.
-	 */			
-	public static IPackageFragmentRoot addLibraryWithImport(IJavaProject jproject, IPath jarPath, IPath sourceAttachPath, IPath sourceAttachRoot) throws IOException, CoreException {
-		IProject project= jproject.getProject();
-		IFile newFile= project.getFile(jarPath.lastSegment());
-		InputStream inputStream= null;
-		try {
-			inputStream= new FileInputStream(jarPath.toFile()); 
-			newFile.create(inputStream, true, null);
-		} finally {
-			if (inputStream != null) {
-				try { inputStream.close(); } catch (IOException e) { }
-			}
-		}				
-		return addLibrary(jproject, newFile.getFullPath(), sourceAttachPath, sourceAttachRoot);
-	}	
-
-		
-	/**
-	 * Adds a variable entry with source attchment to a IJavaProject.
-	 * Can return null if variable can not be resolved.
-	 */			
-	public static IPackageFragmentRoot addVariableEntry(IJavaProject jproject, IPath path, IPath sourceAttachPath, IPath sourceAttachRoot) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newVariableEntry(path, sourceAttachPath, sourceAttachRoot);
-		addToClasspath(jproject, cpe);
-		IPath resolvedPath= JavaCore.getResolvedVariablePath(path);
-		if (resolvedPath != null) {
-			return jproject.getPackageFragmentRoot(resolvedPath.toString());
-		}
-		return null;
-	}
-	
-	
-	/**
-	 * Adds a required project entry.
-	 */		
-	public static void addRequiredProject(IJavaProject jproject, IJavaProject required) throws JavaModelException {
-		IClasspathEntry cpe= JavaCore.newProjectEntry(required.getProject().getFullPath());
-		addToClasspath(jproject, cpe);
-	}	
-	
-	public static void removeFromClasspath(IJavaProject jproject, IPath path) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		int nEntries= oldEntries.length;
-		ArrayList list= new ArrayList(nEntries);
-		for (int i= 0 ; i < nEntries ; i++) {
-			IClasspathEntry curr= oldEntries[i];
-			if (!path.equals(curr.getPath())) {
-				list.add(curr);			
-			}
-		}
-		IClasspathEntry[] newEntries= (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);
-		jproject.setRawClasspath(newEntries, null);
-	}	
-
-	private static void addToClasspath(IJavaProject jproject, IClasspathEntry cpe) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		for (int i= 0; i < oldEntries.length; i++) {
-			if (oldEntries[i].equals(cpe)) {
-				return;
-			}
-		}
-		int nEntries= oldEntries.length;
-		IClasspathEntry[] newEntries= new IClasspathEntry[nEntries + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, nEntries);
-		newEntries[nEntries]= cpe;
-		jproject.setRawClasspath(newEntries, null);
-	}
-	
-			
-	private static void addNatureToProject(IProject proj, String natureId, IProgressMonitor monitor) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures= description.getNatureIds();
-		String[] newNatures= new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length]= natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, monitor);
-	}
-	
-	private static void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
-		ZipFileStructureProvider structureProvider=	new ZipFileStructureProvider(srcZipFile);
-		try {
-			ImportOperation op= new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, new ImportOverwriteQuery());
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}
-	
-	public static void importFilesFromDirectory(File rootDir, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException, IOException {		
-		IImportStructureProvider structureProvider = FileSystemStructureProvider.INSTANCE;
-		List files = new ArrayList(100);
-		addJavaFiles(rootDir, files);
-		try {
-			ImportOperation op= new ImportOperation(destPath, rootDir, structureProvider, new ImportOverwriteQuery(), files);
-			op.setCreateContainerStructure(false);
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}	
-	
-	public static void importFile(File file, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException {		
-		IImportStructureProvider structureProvider = FileSystemStructureProvider.INSTANCE;
-		List files = new ArrayList(1);
-		files.add(file);
-		try {
-			ImportOperation op= new ImportOperation(destPath, file.getParentFile(), structureProvider, new ImportOverwriteQuery(), files);
-			op.setCreateContainerStructure(false);
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}
-	
-	private static void addJavaFiles(File dir, List collection) throws IOException {
-		File[] files = dir.listFiles();
-		List subDirs = new ArrayList(2);
-		for (int i = 0; i < files.length; i++) {
-			if (files[i].isFile()) {
-				collection.add(files[i]);
-			} else if (files[i].isDirectory()) {
-				subDirs.add(files[i]);
-			}
-		}
-		Iterator iter = subDirs.iterator();
-		while (iter.hasNext()) {
-			File subDir = (File)iter.next();
-			addJavaFiles(subDir, collection);
-		}
-	}
-	
-	private static class ImportOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String file) {
-			return ALL;
-		}	
-	}		
-	
-	
-}
-
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
deleted file mode 100644
index 312be8e..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-
-
-public class JavaTestPlugin extends AbstractUIPlugin {
-	
-	private static JavaTestPlugin fgDefault;
-	
-	public JavaTestPlugin() {
-		super();
-		fgDefault= this;
-	}
-	
-	public static JavaTestPlugin getDefault() {
-		return fgDefault;
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	public static void enableAutobuild(boolean enable) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= JavaTestPlugin.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			Bundle bundle = getDefault().getBundle();
-			URL installURL= new URL(bundle.getEntry("/"), path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlock.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlock.java
deleted file mode 100644
index ea17812..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlock.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-
-/**
- * Dummy memory block implementation.
- * 
- * @since 3.1
- */
-public class MemoryBlock implements IMemoryBlock {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#getStartAddress()
-	 */
-	public long getStartAddress() {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#getLength()
-	 */
-	public long getLength() {
-		return 100;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#getBytes()
-	 */
-	public byte[] getBytes() throws DebugException {
-		byte[] bytes = new byte[(int)getLength()];
-		for (int i = 0; i < bytes.length; i++) {
-			bytes[i] = (byte)i;
-		}
-		return bytes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#supportsValueModification()
-	 */
-	public boolean supportsValueModification() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#setValue(long, byte[])
-	 */
-	public void setValue(long offset, byte[] bytes) throws DebugException {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
-	 */
-	public String getModelIdentifier() {
-		return JDIDebugModel.getPluginIdentifier();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
-	 */
-	public IDebugTarget getDebugTarget() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
-	 */
-	public ILaunch getLaunch() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockDynamic.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockDynamic.java
deleted file mode 100644
index de673b4..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockDynamic.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-
-/**
- * Dummy memory block
- * 
- * @since 3.1
- */
-public class MemoryBlockDynamic extends MemoryBlock {
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockOne.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockOne.java
deleted file mode 100644
index e3f2c14..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockOne.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-
-/**
- * Dummy memory block
- * 
- * @since 3.1
- */
-public class MemoryBlockOne extends MemoryBlock {
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockThree.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockThree.java
deleted file mode 100644
index 0c4c88d..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockThree.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-
-/**
- * Dummy memory block
- * 
- * @since 3.1
- */
-public class MemoryBlockThree extends MemoryBlock {
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockTwo.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockTwo.java
deleted file mode 100644
index e55e2b3..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/MemoryBlockTwo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-
-/**
- * Dummy memory block
- * 
- * @since 3.1
- */
-public class MemoryBlockTwo extends MemoryBlock {
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NullVariableInitializer.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NullVariableInitializer.java
deleted file mode 100644
index 07f581a..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NullVariableInitializer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.jdt.core.ClasspathVariableInitializer;
-
-/**
- * A classpath variable initializer for "NULL_VARIABLE", that initializes to null.
- */
-public class NullVariableInitializer extends ClasspathVariableInitializer {
-
-	public NullVariableInitializer() {
-		super();
-	}
-
-	/**
-	 * Performs no initialization.
-	 * 
-	 * @see org.eclipse.jdt.core.ClasspathVariableInitializer#initialize(java.lang.String)
-	 */
-	public void initialize(String variable) {
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/RenderingTypeDelegate.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/RenderingTypeDelegate.java
deleted file mode 100644
index 5078748..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/RenderingTypeDelegate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.ui.memory.IMemoryRendering;
-import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
-
-/**
- * Test memory rendering type delegate.
- * 
- * @since 3.1
- */
-public class RenderingTypeDelegate implements IMemoryRenderingTypeDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String)
-	 */
-	public IMemoryRendering createRendering(String id) throws CoreException {
-		return null;
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java
deleted file mode 100644
index 516fcfb..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SampleDynamicVariableResolver.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.variables.IDynamicVariable;
-import org.eclipse.core.variables.IDynamicVariableResolver;
-
-/**
- * SampleContextVariableResolver
- */
-public class SampleDynamicVariableResolver implements IDynamicVariableResolver {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.stringsubstitution.IContextVariableResolver#resolveValue(org.eclipse.debug.internal.core.stringsubstitution.IContextVariable, java.lang.String)
-	 */
-	public String resolveValue(IDynamicVariable variable, String argument) {
-		if (argument == null) {
-			return "no arg";
-		} 
-		return "the arg is " + argument;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
deleted file mode 100644
index ae35287..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IDebugElement;
-
-/**
- * This event waiter is used to wait for a certain type of event (create, terminate, suspend, etc.) 
- * on a *specific* debug element.  Contrast this with DebugElementKindEventWaiter which is similar, 
- * but is used to wait for a certain type of event on a *kind* of debug element (thread, debug target, etc.)
- */
-public class SpecificDebugElementEventWaiter extends DebugEventWaiter {
-
-	protected IDebugElement fDebugElement;
-	
-	public SpecificDebugElementEventWaiter(int eventKind, IDebugElement element) {
-		super(eventKind);
-		fDebugElement = element;
-	}
-	
-	public boolean accept(DebugEvent event) {
-		Object o = event.getSource();
-		if (o instanceof IDebugElement) {
-			return super.accept(event) && ((IDebugElement)o).equals(fDebugElement);
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestClasspathContainerInitializer.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestClasspathContainerInitializer.java
deleted file mode 100644
index 6b2de80..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestClasspathContainerInitializer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IJavaProject;
-
-/** 
- * A classpath initializer that performs equality based on the project, not the container id
- */
-public class TestClasspathContainerInitializer extends ClasspathContainerInitializer {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.ClasspathContainerInitializer#initialize(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
-	 */
-	public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
-		// never called
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.ClasspathContainerInitializer#getComparisonID(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
-	 */
-	public Object getComparisonID(IPath containerPath, IJavaProject project) {
-		return project;
-	}
-	
-	
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestJavaApplicationTabGroup.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestJavaApplicationTabGroup.java
deleted file mode 100644
index cf31bfe..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestJavaApplicationTabGroup.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
- 
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaMainTab;
-
-/**
- * A tab group for out test mode - to test mode specific tab groups.
- */
-public class TestJavaApplicationTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/**
-	 * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-			new JavaMainTab(),
-			new JavaArgumentsTab(),
-			new JavaJRETab(),
-			new JavaClasspathTab()
-		};
-		setTabs(tabs);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestLaunchDelegate.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestLaunchDelegate.java
deleted file mode 100644
index c0cac8e..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestLaunchDelegate.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate2;
-
-/**
- * Tests delegation to create a launch object.
- * 
- * @since 3.0
- */
-public class TestLaunchDelegate implements ILaunchConfigurationDelegate2 {
-	
-	private ILaunch fLaunch = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#getLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	public ILaunch getLaunch(ILaunchConfiguration configuration, String mode) {
-		fLaunch = new Launch(configuration, mode, null);
-		return fLaunch;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		if (!launch.equals(fLaunch)) {
-			throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "Received wrong launch object", null));
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#buildForLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#finalLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) {
-		return true;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestModeLaunchDelegate.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestModeLaunchDelegate.java
deleted file mode 100644
index 8330cfc..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestModeLaunchDelegate.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
-import org.eclipse.jdt.debug.tests.core.LaunchModeTests;
-
-/**
- * Test launch delegate contributed for a contributed launch mode = "TEST_MODE".
- * Contributed for local java application launch configs.
- */
-public class TestModeLaunchDelegate implements ILaunchConfigurationDelegate {
-	
-	// the test case to call back when launch is invoked
-	private static LaunchModeTests fgTestCase;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(
-		ILaunchConfiguration configuration,
-		String mode,
-		ILaunch launch,
-		IProgressMonitor monitor)
-		throws CoreException {
-			if (fgTestCase == null) {
-				throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests",
-				 0, "No test case registered.", null));
-			} 
-			fgTestCase.launch(configuration, mode);
-	}
-	
-	public static void setTestCase(LaunchModeTests testCase) {
-		fgTestCase = testCase;
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java
deleted file mode 100644
index 5df25bb..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourceLocator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
-
-/**
- * A sample source locator extension.
- */
-public class TestSourceLocator extends AbstractSourceLookupDirector {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceLookupDirector#initializeParticipants()
-	 */
-	public void initializeParticipants() {
-
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java
deleted file mode 100644
index eb6210e..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestSourcePathComputer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
-
-/**
- * Sample source path computer extension.
- */
-public class TestSourcePathComputer implements ISourcePathComputerDelegate {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-		return new ISourceContainer[0];
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java
deleted file mode 100644
index 2a034c2..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/ValueVariableInitializer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.testplugin;
-
-import org.eclipse.core.variables.IValueVariable;
-import org.eclipse.core.variables.IValueVariableInitializer;
-
-/**
- * ValueVariableInitializer
- */
-public class ValueVariableInitializer implements IValueVariableInitializer {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableInitializer#initialize(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable)
-	 */
-	public void initialize(IValueVariable variable) {
-		variable.setValue("initialized-value");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/test.xml b/org.eclipse.jdt.debug.tests/test.xml
deleted file mode 100644
index a8eff76..0000000
--- a/org.eclipse.jdt.debug.tests/test.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jdt.debug.tests"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the regression tests that need to be run. -->
-  <target name="suite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.debug.tests.AutomatedSuite"/>
-    </ant>
-  </target>
-  
-  <!-- This target defines the performance tests that need to be run. -->
-  <target name="perfsuite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.jdt.debug.tests.PerformanceSuite"/>
-    </ant>
-  </target>  
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-  
-  <target name="performance" depends="init,perfsuite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>  
-
-</project>
diff --git a/org.eclipse.jdt.debug.tests/testjars/A.jar b/org.eclipse.jdt.debug.tests/testjars/A.jar
deleted file mode 100644
index 74d8b44..0000000
--- a/org.eclipse.jdt.debug.tests/testjars/A.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ArgumentCounter.java b/org.eclipse.jdt.debug.tests/testprograms/ArgumentCounter.java
deleted file mode 100644
index 7813a55..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ArgumentCounter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ArgumentCounter {
-	
-	public static void main(String[] args) {
-		System.out.print(args.length);
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ArgumentPrinter.java b/org.eclipse.jdt.debug.tests/testprograms/ArgumentPrinter.java
deleted file mode 100644
index d7a6ba7..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ArgumentPrinter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ArgumentPrinter {
-	
-	public static void main(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			System.out.print(args[i]);
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java b/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
deleted file mode 100644
index f279569..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ArgumentsTests {
-	public static void nop() {
-		// used to allow breakpoint on otherwise empty lines
-	}
-	
-	public static void simpleTest(Object obj) {
-		nop();	// should see obj
-	}
-	
-	// Tests recursion (multiple stack frames for the same method with different variable values)
-	public static int fact(int n) {
-		if (n == 0 || n == 1)
-			return 1;
-		else
-			return n*fact(n-1);
-	}
-	
-	public static void main(String[] args) {
-		simpleTest(null);
-		fact(2);
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ArrayTests.java b/org.eclipse.jdt.debug.tests/testprograms/ArrayTests.java
deleted file mode 100644
index 17c59ab..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ArrayTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ArrayTests {
-	
-	public static void main(String[] args) {
-		int[] array = new int[100];
-		for (int i = 0; i < array.length; i++) {
-			array[i] = i;
-		}
-		System.out.println("Done");
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java b/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
deleted file mode 100644
index 23bc50b..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.*;
-
-
-public class Breakpoints implements IBreakpoints {
-	static {
-	 	new Vector(1);
-	 	System.out.println("Initializer");
-    }
-
-    public class InnerBreakpoints {
-    	public void innerInstanceMethod() {
-    		System.out.println("inner instance");
-    	}
-    }
-
-        Enumeration myNamedEnumerate(final Object array[]) {
-        	final int count[] = {0}; // final reference to mutable array
-        	class E implements Enumeration {
-           	 public boolean hasMoreElements(){
-           	 	 return count[0] < array.length;
-           	 }
-           	 public Object nextElement(){
-           	 	 return array[count[0]++];
-           	 }
-        	}
-        	return new E();
-        }
-
-	    Enumeration myAnonymousEnumerate(final Object array[]) {
-    	    return new Enumeration() {
-        	    int count = 0;
-           		 public boolean hasMoreElements(){
-           	 		 return count < array.length;
-           	 	}
-           	 	public Object nextElement(){
-           	 		 return array[count++];
-           	 	}
-        	};
-    	}
-
- public static void main (String[] args) {
- 	threading();
-	Breakpoints bp= new Breakpoints();
-	bp.instanceMethod();
-	bp.instanceMethod2();
-
- }
-
-public class InnerRunnable implements Runnable {
-  	public void run() {
-  		System.out.println("Threading");
-  	}
- }
- public static boolean threading() {
- 	try {
- 		Thread runner = new Thread(new Breakpoints().new InnerRunnable(), "BreakpointsThread");
-		runner.setPriority(Thread.MIN_PRIORITY);
-		runner.start();
-		runner.join();
-	} catch (InterruptedException ie) {
-	}
-	return false;
- }
-
- public Breakpoints() {
- 	super();
- 	System.out.println("Constructor");
- }
- public void instanceMethod() {
- 	if (true) {
- 		System.out.println("If");
- 	} else {
- 		System.out.println("Can't get here");
- 	}
- 	if (false) {
- 		System.out.println("Can't get here");
- 	} else {
- 		System.out.println("Else");
- 	}
-
- 	int i;
- 	for (i= 0; i < 3; i++) {
- 		System.out.println("for");
- 	}
-
- 	while (i < 6) {
- 		System.out.println("while");
- 		i++;
- 	}
-
- 	{
- 		System.out.println("block");
- 	}
- }
-
-  public void instanceMethod2() {
-  	int count= 0;
-  	do {
-		System.out.println("dowhile");
-		count++;
-	} while (count < 5);
-
-
-	try {
-			Vector v= new Vector(1);
-			v.firstElement();
-		} catch (NoSuchElementException nsee) {
-			System.out.println("catch block");
-		} finally {
-			System.out.println("finally after catch");
-
-	}
-	try {
-			new Vector(1);
-			System.out.println("try");
-		} catch (NoSuchElementException nsee) {
-		} finally {
-			System.out.println("finally after try");
-
-	}
-	switch (count) {
-		case 5:
-		System.out.println("switch");
-		break;
-	}
-		switch (count) {
-		case 3:
-		break;
-		default:
-		System.out.println("switch default");
-	}
-
-
-  	Object lock= new Object();
-  	synchronized (lock) {
-  		System.out.println("synchronized");
-  	}
-
-	InnerBreakpoints ibp= new InnerBreakpoints();
-	ibp.innerInstanceMethod();
-
-	String[] array= {"1", "2", "3"};
-	Enumeration myNamed= myNamedEnumerate(array);
-	myNamed.hasMoreElements();
-
-	Enumeration myAnonymous= myAnonymousEnumerate(array);
-	myAnonymous.hasMoreElements();
-
-	ibp.innerInstanceMethod();
-  }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/BreakpointsLocation.java b/org.eclipse.jdt.debug.tests/testprograms/BreakpointsLocation.java
deleted file mode 100644
index afcd4ad..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/BreakpointsLocation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.List;
-import java.util.ArrayList;
-
-public class BreakpointsLocation {
-	
-	public void test1() {
-		System.out.println("test");
-		System.out.println("test");
-	}
-	
-	public class InnerClass {
-		
-		public int foo() {
-			return 1;
-		}
-		
-	}
-
-	private List fList= new ArrayList();
-	
-	public void test2(List list) {
-		System.out.println(list);
-	}
-	
-	public void randomCode() {
-		new Runnable() {
-			public void run() {
-				System.out.println("test");
-			}
-		};
-		
-		int
-			s
-			=
-			3
-			;
-		
-	}
-	
-	private
-		int
-		i
-		=
-		3
-		;
-	
-	public void code() {
-		boolean
-			i
-			=
-			1
-			>
-			2
-			;
-		
-		int 
-			s
-			=
-			i
-			-
-			12
-			;
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/CompileError.java b/org.eclipse.jdt.debug.tests/testprograms/CompileError.java
deleted file mode 100644
index 12d8143..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/CompileError.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class CompileError {
-
-	// This is a place-holder file.  The tests will programmatically change the 
-	// content of this file to contain a compilation error
-	public static void main(String[] args) {
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ConditionalStepReturn.java b/org.eclipse.jdt.debug.tests/testprograms/ConditionalStepReturn.java
deleted file mode 100644
index a5e78d0..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ConditionalStepReturn.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ConditionalStepReturn {
-  public static void main(String[] args) {
-    new ConditionalStepReturn().foo();
-  }
-  public void foo() {
-    boolean bool= true; // BREAKPOINT HERE
-    System.out.println("grah"); // CONDITIONAL BREAKPOINT HERE
-  }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/Console80Chars.java b/org.eclipse.jdt.debug.tests/testprograms/Console80Chars.java
deleted file mode 100644
index 293a83d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/Console80Chars.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * Print variable number of 80char (+2) lines of output
- */
-public class Console80Chars {
-
-	public static void main(String[] args) {
-	    int lines = Integer.parseInt(args[0]);
-	    System.err.println(" - THE BEGINING - ");
-		for (int i = 0; i < lines; i++) {
-			System.out.println("0---------1--------2--------3-------4--------5--------6--------7--------8");
-		}
-		System.err.println(" - THE END - ");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ConsoleInput.java b/org.eclipse.jdt.debug.tests/testprograms/ConsoleInput.java
deleted file mode 100644
index 4d237f7..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ConsoleInput.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * Reads and echos input from standard in
- */
-public class ConsoleInput {
-	
-	public static void main(String[] args) {
-		InputStreamReader reader = new InputStreamReader(System.in);
-		boolean done = false;
-		while (!done) {
-			char[] buffer = new char[100];
-			try {
-				int length = reader.read(buffer);
-				if (length > 0) {
-					String input = new String(buffer, 0, length);
-					System.out.print(input);
-					if (input.startsWith("exit")) {
-						done = true;
-					}
-				} else {
-					done = true;
-					System.out.println("EOF");
-				}
-			} catch (IOException e) {
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ConsoleStackTrace.java b/org.eclipse.jdt.debug.tests/testprograms/ConsoleStackTrace.java
deleted file mode 100644
index 9648855..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ConsoleStackTrace.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.Vector;
-
-public class ConsoleStackTrace {
-	
-	public static void main(String[] args) {
-		Vector v = null;
-		int repeat = Integer.parseInt(args[0]);
-		try {
-		    v.toString();
-		} catch (NullPointerException e) {
-		    System.out.println("---- BEGIN ----");
-		    for (int i = 0; i < repeat; i++) {
-		        e.printStackTrace();
-		    }
-		    System.out.println("---- END ----");
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ConsoleVariableLineLength.java b/org.eclipse.jdt.debug.tests/testprograms/ConsoleVariableLineLength.java
deleted file mode 100644
index 4c2e0e0..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ConsoleVariableLineLength.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ConsoleVariableLineLength {
-	
-	public static void main(String[] args) {
-		int repeat = Integer.parseInt(args[0]);
-		System.out.println("---- START ----");
-	    for (int i = 0; i < repeat; i++) {
-	        System.out.println("---------1---------2---------3---------4---------5---------6");
-	        System.out.println("---------1---------2---------3---------4---------5---------6---------7---------8");
-	        System.out.println("---------1---------2---------3---------4---------5---------6---------7---------8-");
-	        System.out.println("---------1---------2---------3---------4---------5---------6---------7---------8---------9");
-	    }
-	    System.out.println("---- END ----");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/DefPkgReturnType.java b/org.eclipse.jdt.debug.tests/testprograms/DefPkgReturnType.java
deleted file mode 100644
index ceef94f..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/DefPkgReturnType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class DefPkgReturnType {
-
-		public static void main(String[] args) {
-			new DefPkgReturnType().test();
-		}
-
-		private void test() {
-			DefPkgReturnType object = new DefPkgReturnType();
-			System.out.println(object.self());
-		}
-		
-		protected DefPkgReturnType self() {
-			return this;
-		}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/DropTests.java b/org.eclipse.jdt.debug.tests/testprograms/DropTests.java
deleted file mode 100644
index f1e2267..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/DropTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class DropTests {
- 
- 	public static void main(String[] args) {
- 		DropTests dt = new DropTests();
- 		dt.method1();
- 	}
- 
- 	public void method1() {
- 		method2();
- 	}
- 	
- 	public void method2() {
- 		method3();
- 	}
- 	
- 	public void method3() {
- 		method4();
- 	}
- 	
- 	public void method4() {
- 		System.out.println("Finally, I got to method 4");
- 	}
- 
- }
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
deleted file mode 100644
index a626e95..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class EvalArrayTests {
-	
-	public static void main(String[] args) {
-		byte[] xArrayByte = new byte[]{1, 2, 3};
-		char[] xArrayChar = new char[]{1, 2, 3};
-		short[] xArrayShort = new short[]{1, 2, 3};
-		int[] xArrayInt = new int[]{1, 2, 3};
-		long[] xArrayLong = new long[]{1, 2, 3};
-		float[] xArrayFloat = new float[]{(float)1.2, (float)2.3, (float)3.4};
-		double[] xArrayDouble = new double[]{1.2, 2.3, 3.4};
-		String[] xArrayString = new String[]{"one", "two", "three"};
-		boolean[] xArrayBoolean = new boolean[]{true, false, true};
-
-		byte[] yArrayByte = new byte[]{7, 8, 9};
-		char[] yArrayChar = new char[]{7, 8, 9};
-		short[] yArrayShort = new short[]{7, 8, 9};
-		int[] yArrayInt = new int[]{7, 8, 9};
-		long[] yArrayLong = new long[]{7, 8, 9};
-		float[] yArrayFloat = new float[]{(float)7.6, (float)8.7, (float)9.8};
-		double[] yArrayDouble = new double[]{7.6, 8.7, 9.8};
-		String[] yArrayString = new String[]{"seven", "eight", "nine"};
-		boolean[] yArrayBoolean = new boolean[]{false, true, false};
-		
-		int[][] intArray = new int[][] {{1,2,3},{4,5,6},{7,8,9}};
-		
-		System.out.println("tests ...");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
deleted file mode 100644
index 6c70a93..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class EvalNestedTypeTests {
-	
-	int a= 1;
-	String aa= "one";
-	
-	static int b= 2;
-	static String bb= "two";
-	
-	int c= 3;
-	String cc= "three";
-	
-	static int d= 4;
-	static String dd= "four";
-	
-	int e= 5;
-	String ee= "five";
-	
-	static int f= 6;
-	static String ff= "six";
-
-	static class A {
-		int g= 7;
-		String gg= "seven";
-		
-		static int h= 8;
-		static String hh= "eight";
-		
-		int c= 37;
-		String cc= "three seven";
-		
-		static int d= 48;
-		static String dd= "four eight";
-		
-		static class AA {
-			int i= 9;
-			String ii= "nine";
-			
-			static int j= 0;
-			static String jj= "zero";
-			
-			int c= 379;
-			String cc= "three seven nine";
-			
-			static int d= 480;
-			static String dd= "four eight zero";
-			
-			int e= 59;
-			String ee= "five nine";
-			
-			static int f= 60;
-			static String ff= "six zero";
-			
-			void aa() {
-				System.out.println("Tests ...");
-			}
-				
-			static void aaStatic() {
-				System.out.println("Tests ...");
-			}
-				
-		}
-		
-		class AB {
-			int i= 9;
-			String ii= "nine";
-			
-			final static int j= 0;
-			final static String jj= "zero";
-			
-			int c= 379;
-			String cc= "three seven nine";
-			
-			final static int d= 480;
-			final static String dd= "four eight zero";
-			
-			int e= 59;
-			String ee= "five nine";
-			
-			final static int f= 60;
-			final static String ff= "six zero";
-			
-			void ab() {
-				System.out.println("Tests ...");
-			}
-
-		}
-		
-		void a() {
-			class AC {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void ac() {
-					System.out.println("Tests ...");
-					
-				}
-			}
-			
-			Runnable i_ad= new Runnable() {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				public void run() {
-					System.out.println("Tests ...");
-					
-				}
-			};
-			AB i_ab= new AB();
-			i_ab.ab();
-			AC i_ac= new AC();
-			i_ac.ac();
-			i_ad.run();
-			
-			System.out.println("Tests ...");
-		}
-		
-		static void aStatic() {
-			class AE {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void ae() {
-					System.out.println("Tests ...");
-				}
-			}
-			
-			Runnable i_af= new Runnable() {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				public void run() {
-					System.out.println("Tests ...");
-				}
-			};
-			
-			AA i_aa= new AA();
-			i_aa.aa();
-			AA.aaStatic();
-			AE i_ae= new AE();
-			i_ae.ae();
-			i_af.run();
-			
-			System.out.println("Tests ...");
-		}
-			
-	}
-
-	class B {
-		int g= 7;
-		String gg= "seven";
-		
-		final static int h= 8;
-		final static String hh= "eight";
-		
-		int c= 37;
-		String cc= "three seven";
-		
-		final static int d= 48;
-		final static String dd= "four eight";
-		
-		class BB {
-			int i= 9;
-			String ii= "nine";
-			
-			final static int j= 0;
-			final static String jj= "zero";
-			
-			int c= 379;
-			String cc= "three seven nine";
-			
-			final static int d= 480;
-			final static String dd= "four eight zero";
-			
-			int e= 59;
-			String ee= "five nine";
-			
-			final static int f= 60;
-			final static String ff= "six zero";
-			
-			void bb() {
-				System.out.println("Tests ...");
-				
-			}
-			
-		}
-		
-		void b() {
-			class BC {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void bc() {
-					System.out.println("Tests ...");
-					
-				}
-			}
-			
-			Runnable i_bd= new Runnable() {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				public void run() {
-					System.out.println("Tests ...");
-
-				}
-			};
-			
-			BB i_bb= new BB();
-			i_bb.bb();
-			BC i_bc= new BC();
-			i_bc.bc();
-			i_bd.run();
-
-			System.out.println("Tests ...");
-			
-		}
-	}
-	
-	void evalNestedTypeTest() {
-		class C {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class CB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void cb() {
-					System.out.println("Tests ...");
-					
-				}
-	
-			}
-			
-			void c() {
-				class CC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void cc() {
-						System.out.println("Tests ...");
-						
-					}
-				}
-				
-				Runnable i_cd= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-						
-					}
-				};
-				
-				CB i_cb= new CB();
-				i_cb.cb();
-				CC i_cc= new CC();
-				i_cc.cc();
-				i_cd.run();
-
-				System.out.println("Tests ...");
-			}
-							
-		}
-	
-		Runnable i_d= new Runnable() {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class DB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void db() {
-					System.out.println("Tests ...");
-					
-				}
-			}
-			
-			public void run() {
-				class DC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void dc() {
-						System.out.println("Tests ...");
-						
-					}
-				}
-				
-				Runnable i_dd= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-						
-					}
-				};
-				
-				DB i_db= new DB();
-				i_db.db();
-				DC i_dc= new DC();
-				i_dc.dc();
-				i_dd.run();
-
-				System.out.println("Tests ...");
-			}
-		};
-		
-		B i_b= new B();
-		B.BB i_bb= i_b.new BB();
-		i_b.b();
-		C i_c= new C();
-		C.CB i_cb= i_c.new CB();
-		i_c.c();
-		i_d.run();
-		
-		System.out.println("Tests ...");
-	}
-
-	static void evalNestedTypeTestStatic() {
-		class E {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class EB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void eb() {
-					System.out.println("Tests ...");
-				}
-	
-			}
-			
-			void e() {
-				class EC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void ec() {
-						System.out.println("Tests ...");
-					}
-				}
-				
-				Runnable i_ed= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-					}
-				};
-				
-				EB i_eb= new EB();
-				i_eb.eb();
-				EC i_ec= new EC();
-				i_ec.ec();
-				i_ed.run();
-
-				System.out.println("Tests ...");
-			}
-							
-		}
-	
-		Runnable i_f= new Runnable() {
-			int g= 7;
-			String gg= "seven";
-			
-			final static int h= 8;
-			final static String hh= "eight";
-			
-			int c= 37;
-			String cc= "three seven";
-			
-			final static int d= 48;
-			final static String dd= "four eight";
-			
-			class FB {
-				int i= 9;
-				String ii= "nine";
-				
-				final static int j= 0;
-				final static String jj= "zero";
-				
-				int c= 379;
-				String cc= "three seven nine";
-				
-				final static int d= 480;
-				final static String dd= "four eight zero";
-				
-				int e= 59;
-				String ee= "five nine";
-				
-				final static int f= 60;
-				final static String ff= "six zero";
-				
-				void fb() {
-					System.out.println("Tests ...");
-				}
-	
-			}
-			
-			public void run() {
-				class FC {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					void fc() {
-						System.out.println("Tests ...");
-					}
-				}
-				
-				Runnable i_fd= new Runnable() {
-					int i= 9;
-					String ii= "nine";
-					
-					final static int j= 0;
-					final static String jj= "zero";
-					
-					int c= 379;
-					String cc= "three seven nine";
-					
-					final static int d= 480;
-					final static String dd= "four eight zero";
-					
-					int e= 59;
-					String ee= "five nine";
-					
-					final static int f= 60;
-					final static String ff= "six zero";
-					
-					public void run() {
-						System.out.println("Tests ...");
-					}
-				};
-				
-				FB i_fb= new FB();
-				i_fb.fb();
-				FC i_fc= new FC();
-				i_fc.fc();
-				i_fd.run();
-
-				System.out.println("Tests ...");
-			}
-		};
-		
-		A i_a= new A();
-		i_a.a();
-		A.aStatic();
-		A.AA i_aa= new A.AA();
-		A.AB i_ab= i_a.new AB();
-		
-		E i_e= new E();
-		E.EB i_eb= i_e.new EB();
-		i_e.e();
-		i_f.run();
-		
-		System.out.println("Tests ...");
-	}
-
-	public static void main(String[] args) {
-		new EvalNestedTypeTests().evalNestedTypeTest();
-		EvalNestedTypeTests.evalNestedTypeTestStatic();
-		System.out.println("Tests ...");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
deleted file mode 100644
index 53e66fe..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class EvalSimpleTests {
-	
-	public static void main(String[] args) {
-		byte xVarByte = -5;
-		char xVarChar = (char)-5;
-		short xVarShort = -5;
-		int xVarInt = -5;
-		long xVarLong = -5;
-		float xVarFloat = (float)-5.3;
-		double xVarDouble = -5.3;
-		String xVarString = "minus five";
-		boolean xVarBoolean = true;
-//		Object xVarNull = null;
-
-		byte yVarByte = 7;
-		char yVarChar = 7;
-		short yVarShort = 7;
-		int yVarInt = 7;
-		long yVarLong = 7;
-		float yVarFloat = (float)6.9;
-		double yVarDouble = 6.9;
-		String yVarString = "seven";
-		boolean yVarBoolean = false;
-//		Object yVarNull = null;
-		
-		System.out.println("tests ...");
-	}//3+3
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
deleted file mode 100644
index c889f3c..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class EvalTypeHierarchyTests {
-	
-	interface I_A {
-		int m1();
-	}
-	
-	static class A implements I_A {
-		public int m1() {
-			return 1;
-		}
-		
-		public int m2() {
-			return 2;
-		}
-		
-		public static int s2() {
-			return 9;
-		}
-		
-		public void testA() {
-			System.out.println("test");
-		}
-	}
-	
-	interface I_B extends I_A {
-		int m1();
-		
-		int m3();
-	}
-	
-	static class B extends A implements I_B {
-		public int m1() {
-			return 11;
-		}
-		
-		public int m2() {
-			return 22;
-		}
-
-		public static int s2() {
-			return 99;
-		}
-		
-		public int m3() {
-			return 33;
-		}
-		
-		public int m4() {
-			return 44;
-		}
-
-		public static int s4() {
-			return 88;
-		}
-		
-		public void testB() {
-			System.out.println("test");
-		}
-	}
-	
-	interface I_C extends I_B {
-		int m1();
-		
-		int m3();
-		
-		int m5();
-	}
-	
-	static class C extends B implements I_C {
-		
-		public int m1() {
-			return 111;
-		}
-		
-		public int m2() {
-			return 222;
-		}
-
-		public static int s2() {
-			return 999;
-		}
-		
-		public int m3() {
-			return 333;
-		}
-		
-		public int m4() {
-			return 444;
-		}
-
-		public static int s4() {
-			return 888;
-		}
-		
-		public int m5() {
-			return 555;
-		}
-		
-		public int m6() {
-			return 666;
-		}
-		
-		public static int s6() {
-			return 777;
-		}
-		
-		public void testC() {
-			System.out.println("test");
-		}
-	}
-	
-	public static void main(String[] args) {
-		I_A iaa= new A();
-		I_A iab= new B();
-		I_A iac= new C();
-		A aa= new A();
-		A ab= new B();
-		A ac= new C();
-		I_B ibb= new B();
-		I_B ibc= new C();
-		B bb= new B();
-		B bc= new C();
-		I_C icc= new C();
-		C cc= new C();
-		aa.testA();
-		ab.testA();
-		ac.testA();
-		bb.testA();
-		bb.testB();
-		bc.testA();
-		bc.testB();
-		cc.testA();
-		cc.testB();
-		cc.testC();
-		System.out.println("test");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
deleted file mode 100644
index 4e6a357..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class EvalTypeTests {
-	
-	byte xFieldByte = -2;
-	char xFieldChar = (char)-2;
-	short xFieldShort = -2;
-	int xFieldInt = -2;
-	long xFieldLong = -2;
-	float xFieldFloat = (float)-2.1;
-	double xFieldDouble = -2.1;
-	String xFieldString = "minus two";
-	boolean xFieldBoolean = true;
-
-	byte yFieldByte = 9;
-	char yFieldChar = 9;
-	short yFieldShort = 9;
-	int yFieldInt = 9;
-	long yFieldLong = 9;
-	float yFieldFloat = (float)8.6;
-	double yFieldDouble = 8.6;
-	String yFieldString = "nine";
-	boolean yFieldBoolean = false;
-
-	static byte xStaticFieldByte = -1;
-	static char xStaticFieldChar = (char)-1;
-	static short xStaticFieldShort = -1;
-	static int xStaticFieldInt = -1;
-	static long xStaticFieldLong = -1;
-	static float xStaticFieldFloat = (float)-1.5;
-	static double xStaticFieldDouble = -1.5;
-	static String xStaticFieldString = "minus one";
-	static boolean xStaticFieldBoolean = true;
-
-	static byte yStaticFieldByte = 6;
-	static char yStaticFieldChar = 6;
-	static short yStaticFieldShort = 6;
-	static int yStaticFieldInt = 6;
-	static long yStaticFieldLong = 6;
-	static float yStaticFieldFloat = (float)6.5;
-	static double yStaticFieldDouble = 6.5;
-	static String yStaticFieldString = "six";
-	static boolean yStaticFieldBoolean = false;
-
-	void test1() {
-		System.out.println("Test1 ...");
-	}
-
-	static void test2() {
-		System.out.println("Test2 ...");
-	}
-	
-	void bar() {
-		System.out.println("Tests ...");
-	}
-
-	static void foo() {
-		System.out.println("Tests ...");
-	}
-	
-	public static void main(String[] args) {
-		EvalTypeTests foo = new EvalTypeTests();
-		
-		System.out.println("Tests ...");
-		
-		foo.bar();
-		
-		foo();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java b/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
deleted file mode 100644
index b7acd06..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.Date;
-import java.util.Vector;
-
-
-public class EvaluationTests {
-
-	protected int fInt= 5;
-	protected String fString= "testing";
-	protected static final String CONSTANT= "constant";
-	private Date fADate= new Date();
-
-	public static void main(java.lang.String[] args) {
-		EvaluationTests tests= new EvaluationTests(); //line 12
-		tests.method();
-	}
-
-	public void method() {
-		System.out.println(returnInt());
-		System.out.println(returnDate());
-		int x= 5; //line 19
-		System.out.println(x);
-		Vector v= new Vector();
-		v.isEmpty();
-	}
-
-	public int returnInt() {
-		return 7;
-	}
-
-	public Date returnDate() {
-		return new Date();
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/FloodConsole.java b/org.eclipse.jdt.debug.tests/testprograms/FloodConsole.java
deleted file mode 100644
index dee7782..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/FloodConsole.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * Print 10,000 lines of output
- */
-public class FloodConsole {
-
-	public static void main(String[] args) {
-		for (int i = 0; i < 9999; i++) {
-			System.out.println("0---------1--------2--------3-------4--------5--------6--------7--------8");
-		}
-		System.err.print(" - THE END - ");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/FooPropertyPrinter.java b/org.eclipse.jdt.debug.tests/testprograms/FooPropertyPrinter.java
deleted file mode 100644
index d66ecbf..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/FooPropertyPrinter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-public class FooPropertyPrinter {
-
-	public static void main(String[] args) {
-		System.out.print(System.getProperty("foo"));
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java b/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
deleted file mode 100644
index 316494a..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class GotNewName {
-
-	public static void main(String[] args) {
-		GotNewName anObject = new GotNewName();
-
-		try {
-			anObject.throwBaby();
-		} catch(NullPointerException ne) {
-			// do nothing
-		}
-
-		anObject.killTime();
-
-		try {
-			anObject.throwBaby();
-		} catch(NullPointerException ne) {
-			// do nothing
-		}
-
-		try {
-			anObject.throwAnotherBaby();
-		} catch(IllegalArgumentException ie) {
-			// do nothing
-		}
-	}
-
-	public void throwBaby() {
-		throw new NullPointerException();
-	}
-
-	public void throwAnotherBaby() {
-		throw new IllegalArgumentException();
-	}
-
-	public void killTime() {
-		int j = 0;
-		while(j < 1000) {
-			j++;
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java b/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
deleted file mode 100644
index bc16690..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.Vector;
-
-
-public class HitCountException {
-
-	public static void main(String[] args) {
-		HitCountException mte = new HitCountException();
-		mte.go();
-	}
-	
-	private void go() {
-		try {
-			generateNPE();
-		} catch (NullPointerException npe) {
-		}
-		
-		generateNPE();
-	}
-	
-	void generateNPE() {
-		Vector vector = null;
-		if (1 > 2) {
-			vector = new Vector();
-		}
-		vector.add("item");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java b/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
deleted file mode 100644
index fad36db..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class HitCountLooper {
-	public static void main(String[] args) {
-		int i = 0;
-		while (i < 20) {
-			System.out.println("Main Looping " + i);
-			i++;
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java b/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
deleted file mode 100644
index dabea40..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public interface IBreakpoints {
-	 public abstract void instanceMethod();
- }
diff --git a/org.eclipse.jdt.debug.tests/testprograms/InstanceFilterObject.java b/org.eclipse.jdt.debug.tests/testprograms/InstanceFilterObject.java
deleted file mode 100644
index bd55abb..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/InstanceFilterObject.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class InstanceFilterObject {
-	
-	public int field = 0;
-
-	public boolean executedSimpleMethod = false;
-
-	public void simpleMethod() {
-		System.out.println("simpleMethod");
-		executedSimpleMethod = true;
-	}
-	
-	public int accessField() {
-		int y = field;
-		return field;
-	}
-	
-	public void modifyField(int value) {
-		field = value;
-	}
-	
-	public void throwException() {
-		throw new NullPointerException();
-	}
-	
-	public static void main(String[] args) {
-		InstanceFilterObject object1 = new InstanceFilterObject();
-		InstanceFilterObject object2 = new InstanceFilterObject();
-		object2.simpleMethod();
-		object1.simpleMethod();
-		object2.accessField();
-		object1.accessField();
-		object1.modifyField(23);
-		object2.modifyField(45);
-		try {
-			object2.throwException();
-		} catch (NullPointerException e) {
-		}
-		try {
-			object1.throwException();
-		} catch (NullPointerException e) {
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
deleted file mode 100644
index 0ffe003..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.Date;
-
-
-public class InstanceVariablesTests {
-	public void nop() {
-	}
-	
-	public InstanceVariablesTests() {
-		nop(); // should see this.*Str with correct values
-	}
-
-	public static void main(String[] args) {
-		InstanceVariablesTests ivt = new InstanceVariablesTests();
-		ivt.run();
-	}
-	
-	public void run() {
-		nop(); // should see this
-		InstanceVariablesTests ivt = new IVTSubclass();
-		ivt.run();
-	}
-	
-	public String pubStr = "public";
-	protected String protStr = "protected";
-	/* default */ String defStr = "default";
-	private String privStr = "private";
-	protected String nullStr= null;
-	protected Date date= new Date();
-	protected Date nullDate= null;
-}
-
-class IVTSubclass extends InstanceVariablesTests {
-	public void run() {
-		nop();
-	}
-	
-	public String pubStr = "redefined public";
-	protected String protStr = "redefined protected";
-	/* default */ String defStr = "redefined default";
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/LabelTest.java b/org.eclipse.jdt.debug.tests/testprograms/LabelTest.java
deleted file mode 100644
index 75f8a8c..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/LabelTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class LabelTest {
-
-    public static void main(String[] args) {
-        label1: {
-            System.out.println("Label 1");
-        }
-
-        label2: {
-            label3:
-            lable4: System.out.println("Label 2");
-        }
-    }
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/LargeSourceFile.java b/org.eclipse.jdt.debug.tests/testprograms/LargeSourceFile.java
deleted file mode 100644
index b5fc026..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/LargeSourceFile.java
+++ /dev/null
@@ -1,2516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class LargeSourceFile {
-    public static void main(String args[]) {
-        LargeSourceFile me = new LargeSourceFile();
-        me.method1();
-        me.method2();
-        me.method3();
-        me.method4();
-        me.method5();
-        me.method6();
-        me.method7();
-        me.method8();
-        me.method9();
-        me.method10();
-        me.method11();
-        me.method12();
-        me.method13();
-        me.method14();
-        me.method15();
-        me.method16();
-        me.method17();
-        me.method18();
-        me.method19();
-        me.method20();
-        me.method21();
-        me.method22();
-        me.method23();
-        me.method24();
-        me.method25();
-        me.method26();
-        me.method27();
-        me.method28();
-        me.method29();
-        me.method30();
-        me.method31();
-        me.method32();
-        me.method33();
-        me.method34();
-        me.method35();
-        me.method36();
-        me.method37();
-        me.method38();
-        me.method39();
-        me.method40();
-        me.method41();
-        me.method42();
-        me.method43();
-        me.method44();
-        me.method45();
-        me.method46();
-        me.method47();
-        me.method48();
-        me.method49();
-        me.method50();
-        me.method51();
-        me.method52();
-        me.method53();
-        me.method54();
-        me.method55();
-        me.method56();
-        me.method57();
-        me.method58();
-        me.method59();
-        me.method60();
-        me.method61();
-        me.method62();
-        me.method63();
-        me.method64();
-        me.method65();
-        me.method66();
-        me.method67();
-        me.method68();
-        me.method69();
-        me.method70();
-        me.method71();
-        me.method72();
-        me.method73();
-        me.method74();
-        me.method75();
-        me.method76();
-        me.method77();
-        me.method78();
-        me.method79();
-        me.method80();
-        me.method81();
-        me.method82();
-        me.method83();
-        me.method84();
-        me.method85();
-        me.method86();
-        me.method87();
-        me.method88();
-        me.method89();
-        me.method90();
-        me.method91();
-        me.method92();
-        me.method93();
-        me.method94();
-        me.method95();
-        me.method96();
-        me.method97();
-        me.method98();
-        me.method99();
-        me.method100();
-        me.method101();
-        me.method102();
-        me.method103();
-        me.method104();
-        me.method105();
-        me.method106();
-        me.method107();
-        me.method108();
-        me.method109();
-        me.method110();
-        me.method111();
-        me.method112();
-        me.method113();
-        me.method114();
-        me.method115();
-        me.method116();
-        me.method117();
-        me.method118();
-        me.method119();
-        me.method120();
-        me.method121();
-        me.method122();
-        me.method123();
-        me.method124();
-        me.method125();
-        me.method126();
-        me.method127();
-        me.method128();
-        me.method129();
-        me.method130();
-        me.method131();
-        me.method132();
-        me.method133();
-        me.method134();
-        me.method135();
-        me.method136();
-        me.method137();
-        me.method138();
-        me.method139();
-        me.method140();
-        me.method141();
-        me.method142();
-        me.method143();
-        me.method144();
-        me.method145();
-        me.method146();
-        me.method147();
-        me.method148();
-        me.method149();
-        me.method150();
-        me.method151();
-        me.method152();
-        me.method153();
-        me.method154();
-        me.method155();
-        me.method156();
-        me.method157();
-        me.method158();
-        me.method159();
-        me.method160();
-        me.method161();
-        me.method162();
-        me.method163();
-        me.method164();
-        me.method165();
-        me.method166();
-        me.method167();
-        me.method168();
-        me.method169();
-        me.method170();
-        me.method171();
-        me.method172();
-        me.method173();
-        me.method174();
-        me.method175();
-        me.method176();
-        me.method177();
-        me.method178();
-        me.method179();
-        me.method180();
-        me.method181();
-        me.method182();
-        me.method183();
-        me.method184();
-        me.method185();
-        me.method186();
-        me.method187();
-        me.method188();
-        me.method189();
-        me.method190();
-        me.method191();
-        me.method192();
-        me.method193();
-        me.method194();
-        me.method195();
-        me.method196();
-        me.method197();
-        me.method198();
-        me.method199();
-        me.method200();
-        me.method201();
-        me.method202();
-        me.method203();
-        me.method204();
-        me.method205();
-        me.method206();
-        me.method207();
-        me.method208();
-        me.method209();
-        me.method210();
-        me.method211();
-        me.method212();
-        me.method213();
-        me.method214();
-        me.method215();
-        me.method216();
-        me.method217();
-        me.method218();
-        me.method219();
-        me.method220();
-        me.method221();
-        me.method222();
-        me.method223();
-        me.method224();
-        me.method225();
-        me.method226();
-        me.method227();
-        me.method228();
-        me.method229();
-        me.method230();
-        me.method231();
-        me.method232();
-        me.method233();
-        me.method234();
-        me.method235();
-        me.method236();
-        me.method237();
-        me.method238();
-        me.method239();
-        me.method240();
-        me.method241();
-        me.method242();
-        me.method243();
-        me.method244();
-        me.method245();
-        me.method246();
-        me.method247();
-        me.method248();
-        me.method249();
-        me.method250();
-        me.method251();
-        me.method252();
-        me.method253();
-        me.method254();
-        me.method255();
-        me.method256();
-        me.method257();
-        me.method258();
-        me.method259();
-        me.method260();
-        me.method261();
-        me.method262();
-        me.method263();
-        me.method264();
-        me.method265();
-        me.method266();
-        me.method267();
-        me.method268();
-        me.method269();
-        me.method270();
-        me.method271();
-        me.method272();
-        me.method273();
-        me.method274();
-        me.method275();
-        me.method276();
-        me.method277();
-        me.method278();
-        me.method279();
-        me.method280();
-        me.method281();
-        me.method282();
-        me.method283();
-        me.method284();
-        me.method285();
-        me.method286();
-        me.method287();
-        me.method288();
-        me.method289();
-        me.method290();
-        me.method291();
-        me.method292();
-        me.method293();
-        me.method294();
-        me.method295();
-        me.method296();
-        me.method297();
-        me.method298();
-        me.method299();
-        me.method300();
-        me.method301();
-        me.method302();
-        me.method303();
-        me.method304();
-        me.method305();
-        me.method306();
-        me.method307();
-        me.method308();
-        me.method309();
-        me.method310();
-        me.method311();
-        me.method312();
-        me.method313();
-        me.method314();
-        me.method315();
-        me.method316();
-        me.method317();
-        me.method318();
-        me.method319();
-        me.method320();
-        me.method321();
-        me.method322();
-        me.method323();
-        me.method324();
-        me.method325();
-        me.method326();
-        me.method327();
-        me.method328();
-        me.method329();
-        me.method330();
-        me.method331();
-        me.method332();
-        me.method333();
-        me.method334();
-        me.method335();
-        me.method336();
-        me.method337();
-        me.method338();
-        me.method339();
-        me.method340();
-        me.method341();
-        me.method342();
-        me.method343();
-        me.method344();
-        me.method345();
-        me.method346();
-        me.method347();
-        me.method348();
-        me.method349();
-        me.method350();
-        me.method351();
-        me.method352();
-        me.method353();
-        me.method354();
-        me.method355();
-        me.method356();
-        me.method357();
-        me.method358();
-        me.method359();
-        me.method360();
-        me.method361();
-        me.method362();
-        me.method363();
-        me.method364();
-        me.method365();
-        me.method366();
-        me.method367();
-        me.method368();
-        me.method369();
-        me.method370();
-        me.method371();
-        me.method372();
-        me.method373();
-        me.method374();
-        me.method375();
-        me.method376();
-        me.method377();
-        me.method378();
-        me.method379();
-        me.method380();
-        me.method381();
-        me.method382();
-        me.method383();
-        me.method384();
-        me.method385();
-        me.method386();
-        me.method387();
-        me.method388();
-        me.method389();
-        me.method390();
-        me.method391();
-        me.method392();
-        me.method393();
-        me.method394();
-        me.method395();
-        me.method396();
-        me.method397();
-        me.method398();
-        me.method399();
-        me.method400();
-        me.method401();
-        me.method402();
-        me.method403();
-        me.method404();
-        me.method405();
-        me.method406();
-        me.method407();
-        me.method408();
-        me.method409();
-        me.method410();
-        me.method411();
-        me.method412();
-        me.method413();
-        me.method414();
-        me.method415();
-        me.method416();
-        me.method417();
-        me.method418();
-        me.method419();
-        me.method420();
-        me.method421();
-        me.method422();
-        me.method423();
-        me.method424();
-        me.method425();
-        me.method426();
-        me.method427();
-        me.method428();
-        me.method429();
-        me.method430();
-        me.method431();
-        me.method432();
-        me.method433();
-        me.method434();
-        me.method435();
-        me.method436();
-        me.method437();
-        me.method438();
-        me.method439();
-        me.method440();
-        me.method441();
-        me.method442();
-        me.method443();
-        me.method444();
-        me.method445();
-        me.method446();
-        me.method447();
-        me.method448();
-        me.method449();
-        me.method450();
-        me.method451();
-        me.method452();
-        me.method453();
-        me.method454();
-        me.method455();
-        me.method456();
-        me.method457();
-        me.method458();
-        me.method459();
-        me.method460();
-        me.method461();
-        me.method462();
-        me.method463();
-        me.method464();
-        me.method465();
-        me.method466();
-        me.method467();
-        me.method468();
-        me.method469();
-        me.method470();
-        me.method471();
-        me.method472();
-        me.method473();
-        me.method474();
-        me.method475();
-        me.method476();
-        me.method477();
-        me.method478();
-        me.method479();
-        me.method480();
-        me.method481();
-        me.method482();
-        me.method483();
-        me.method484();
-        me.method485();
-        me.method486();
-        me.method487();
-        me.method488();
-        me.method489();
-        me.method490();
-        me.method491();
-        me.method492();
-        me.method493();
-        me.method494();
-        me.method495();
-        me.method496();
-        me.method497();
-        me.method498();
-        me.method499();
-        me.method500();
-    }
-
-    private void method1() {
-        System.out.println("I am method 1");
-    }
-
-    private void method2() {
-        System.out.println("I am method 2");
-    }
-
-    private void method3() {
-        System.out.println("I am method 3");
-    }
-
-    private void method4() {
-        System.out.println("I am method 4");
-    }
-
-    private void method5() {
-        System.out.println("I am method 5");
-    }
-
-    private void method6() {
-        System.out.println("I am method 6");
-    }
-
-    private void method7() {
-        System.out.println("I am method 7");
-    }
-
-    private void method8() {
-        System.out.println("I am method 8");
-    }
-
-    private void method9() {
-        System.out.println("I am method 9");
-    }
-
-    private void method10() {
-        System.out.println("I am method 10");
-    }
-
-    private void method11() {
-        System.out.println("I am method 11");
-    }
-
-    private void method12() {
-        System.out.println("I am method 12");
-    }
-
-    private void method13() {
-        System.out.println("I am method 13");
-    }
-
-    private void method14() {
-        System.out.println("I am method 14");
-    }
-
-    private void method15() {
-        System.out.println("I am method 15");
-    }
-
-    private void method16() {
-        System.out.println("I am method 16");
-    }
-
-    private void method17() {
-        System.out.println("I am method 17");
-    }
-
-    private void method18() {
-        System.out.println("I am method 18");
-    }
-
-    private void method19() {
-        System.out.println("I am method 19");
-    }
-
-    private void method20() {
-        System.out.println("I am method 20");
-    }
-
-    private void method21() {
-        System.out.println("I am method 21");
-    }
-
-    private void method22() {
-        System.out.println("I am method 22");
-    }
-
-    private void method23() {
-        System.out.println("I am method 23");
-    }
-
-    private void method24() {
-        System.out.println("I am method 24");
-    }
-
-    private void method25() {
-        System.out.println("I am method 25");
-    }
-
-    private void method26() {
-        System.out.println("I am method 26");
-    }
-
-    private void method27() {
-        System.out.println("I am method 27");
-    }
-
-    private void method28() {
-        System.out.println("I am method 28");
-    }
-
-    private void method29() {
-        System.out.println("I am method 29");
-    }
-
-    private void method30() {
-        System.out.println("I am method 30");
-    }
-
-    private void method31() {
-        System.out.println("I am method 31");
-    }
-
-    private void method32() {
-        System.out.println("I am method 32");
-    }
-
-    private void method33() {
-        System.out.println("I am method 33");
-    }
-
-    private void method34() {
-        System.out.println("I am method 34");
-    }
-
-    private void method35() {
-        System.out.println("I am method 35");
-    }
-
-    private void method36() {
-        System.out.println("I am method 36");
-    }
-
-    private void method37() {
-        System.out.println("I am method 37");
-    }
-
-    private void method38() {
-        System.out.println("I am method 38");
-    }
-
-    private void method39() {
-        System.out.println("I am method 39");
-    }
-
-    private void method40() {
-        System.out.println("I am method 40");
-    }
-
-    private void method41() {
-        System.out.println("I am method 41");
-    }
-
-    private void method42() {
-        System.out.println("I am method 42");
-    }
-
-    private void method43() {
-        System.out.println("I am method 43");
-    }
-
-    private void method44() {
-        System.out.println("I am method 44");
-    }
-
-    private void method45() {
-        System.out.println("I am method 45");
-    }
-
-    private void method46() {
-        System.out.println("I am method 46");
-    }
-
-    private void method47() {
-        System.out.println("I am method 47");
-    }
-
-    private void method48() {
-        System.out.println("I am method 48");
-    }
-
-    private void method49() {
-        System.out.println("I am method 49");
-    }
-
-    private void method50() {
-        System.out.println("I am method 50");
-    }
-
-    private void method51() {
-        System.out.println("I am method 51");
-    }
-
-    private void method52() {
-        System.out.println("I am method 52");
-    }
-
-    private void method53() {
-        System.out.println("I am method 53");
-    }
-
-    private void method54() {
-        System.out.println("I am method 54");
-    }
-
-    private void method55() {
-        System.out.println("I am method 55");
-    }
-
-    private void method56() {
-        System.out.println("I am method 56");
-    }
-
-    private void method57() {
-        System.out.println("I am method 57");
-    }
-
-    private void method58() {
-        System.out.println("I am method 58");
-    }
-
-    private void method59() {
-        System.out.println("I am method 59");
-    }
-
-    private void method60() {
-        System.out.println("I am method 60");
-    }
-
-    private void method61() {
-        System.out.println("I am method 61");
-    }
-
-    private void method62() {
-        System.out.println("I am method 62");
-    }
-
-    private void method63() {
-        System.out.println("I am method 63");
-    }
-
-    private void method64() {
-        System.out.println("I am method 64");
-    }
-
-    private void method65() {
-        System.out.println("I am method 65");
-    }
-
-    private void method66() {
-        System.out.println("I am method 66");
-    }
-
-    private void method67() {
-        System.out.println("I am method 67");
-    }
-
-    private void method68() {
-        System.out.println("I am method 68");
-    }
-
-    private void method69() {
-        System.out.println("I am method 69");
-    }
-
-    private void method70() {
-        System.out.println("I am method 70");
-    }
-
-    private void method71() {
-        System.out.println("I am method 71");
-    }
-
-    private void method72() {
-        System.out.println("I am method 72");
-    }
-
-    private void method73() {
-        System.out.println("I am method 73");
-    }
-
-    private void method74() {
-        System.out.println("I am method 74");
-    }
-
-    private void method75() {
-        System.out.println("I am method 75");
-    }
-
-    private void method76() {
-        System.out.println("I am method 76");
-    }
-
-    private void method77() {
-        System.out.println("I am method 77");
-    }
-
-    private void method78() {
-        System.out.println("I am method 78");
-    }
-
-    private void method79() {
-        System.out.println("I am method 79");
-    }
-
-    private void method80() {
-        System.out.println("I am method 80");
-    }
-
-    private void method81() {
-        System.out.println("I am method 81");
-    }
-
-    private void method82() {
-        System.out.println("I am method 82");
-    }
-
-    private void method83() {
-        System.out.println("I am method 83");
-    }
-
-    private void method84() {
-        System.out.println("I am method 84");
-    }
-
-    private void method85() {
-        System.out.println("I am method 85");
-    }
-
-    private void method86() {
-        System.out.println("I am method 86");
-    }
-
-    private void method87() {
-        System.out.println("I am method 87");
-    }
-
-    private void method88() {
-        System.out.println("I am method 88");
-    }
-
-    private void method89() {
-        System.out.println("I am method 89");
-    }
-
-    private void method90() {
-        System.out.println("I am method 90");
-    }
-
-    private void method91() {
-        System.out.println("I am method 91");
-    }
-
-    private void method92() {
-        System.out.println("I am method 92");
-    }
-
-    private void method93() {
-        System.out.println("I am method 93");
-    }
-
-    private void method94() {
-        System.out.println("I am method 94");
-    }
-
-    private void method95() {
-        System.out.println("I am method 95");
-    }
-
-    private void method96() {
-        System.out.println("I am method 96");
-    }
-
-    private void method97() {
-        System.out.println("I am method 97");
-    }
-
-    private void method98() {
-        System.out.println("I am method 98");
-    }
-
-    private void method99() {
-        System.out.println("I am method 99");
-    }
-
-    private void method100() {
-        System.out.println("I am method 100");
-    }
-
-    private void method101() {
-        System.out.println("I am method 101");
-    }
-
-    private void method102() {
-        System.out.println("I am method 102");
-    }
-
-    private void method103() {
-        System.out.println("I am method 103");
-    }
-
-    private void method104() {
-        System.out.println("I am method 104");
-    }
-
-    private void method105() {
-        System.out.println("I am method 105");
-    }
-
-    private void method106() {
-        System.out.println("I am method 106");
-    }
-
-    private void method107() {
-        System.out.println("I am method 107");
-    }
-
-    private void method108() {
-        System.out.println("I am method 108");
-    }
-
-    private void method109() {
-        System.out.println("I am method 109");
-    }
-
-    private void method110() {
-        System.out.println("I am method 110");
-    }
-
-    private void method111() {
-        System.out.println("I am method 111");
-    }
-
-    private void method112() {
-        System.out.println("I am method 112");
-    }
-
-    private void method113() {
-        System.out.println("I am method 113");
-    }
-
-    private void method114() {
-        System.out.println("I am method 114");
-    }
-
-    private void method115() {
-        System.out.println("I am method 115");
-    }
-
-    private void method116() {
-        System.out.println("I am method 116");
-    }
-
-    private void method117() {
-        System.out.println("I am method 117");
-    }
-
-    private void method118() {
-        System.out.println("I am method 118");
-    }
-
-    private void method119() {
-        System.out.println("I am method 119");
-    }
-
-    private void method120() {
-        System.out.println("I am method 120");
-    }
-
-    private void method121() {
-        System.out.println("I am method 121");
-    }
-
-    private void method122() {
-        System.out.println("I am method 122");
-    }
-
-    private void method123() {
-        System.out.println("I am method 123");
-    }
-
-    private void method124() {
-        System.out.println("I am method 124");
-    }
-
-    private void method125() {
-        System.out.println("I am method 125");
-    }
-
-    private void method126() {
-        System.out.println("I am method 126");
-    }
-
-    private void method127() {
-        System.out.println("I am method 127");
-    }
-
-    private void method128() {
-        System.out.println("I am method 128");
-    }
-
-    private void method129() {
-        System.out.println("I am method 129");
-    }
-
-    private void method130() {
-        System.out.println("I am method 130");
-    }
-
-    private void method131() {
-        System.out.println("I am method 131");
-    }
-
-    private void method132() {
-        System.out.println("I am method 132");
-    }
-
-    private void method133() {
-        System.out.println("I am method 133");
-    }
-
-    private void method134() {
-        System.out.println("I am method 134");
-    }
-
-    private void method135() {
-        System.out.println("I am method 135");
-    }
-
-    private void method136() {
-        System.out.println("I am method 136");
-    }
-
-    private void method137() {
-        System.out.println("I am method 137");
-    }
-
-    private void method138() {
-        System.out.println("I am method 138");
-    }
-
-    private void method139() {
-        System.out.println("I am method 139");
-    }
-
-    private void method140() {
-        System.out.println("I am method 140");
-    }
-
-    private void method141() {
-        System.out.println("I am method 141");
-    }
-
-    private void method142() {
-        System.out.println("I am method 142");
-    }
-
-    private void method143() {
-        System.out.println("I am method 143");
-    }
-
-    private void method144() {
-        System.out.println("I am method 144");
-    }
-
-    private void method145() {
-        System.out.println("I am method 145");
-    }
-
-    private void method146() {
-        System.out.println("I am method 146");
-    }
-
-    private void method147() {
-        System.out.println("I am method 147");
-    }
-
-    private void method148() {
-        System.out.println("I am method 148");
-    }
-
-    private void method149() {
-        System.out.println("I am method 149");
-    }
-
-    private void method150() {
-        System.out.println("I am method 150");
-    }
-
-    private void method151() {
-        System.out.println("I am method 151");
-    }
-
-    private void method152() {
-        System.out.println("I am method 152");
-    }
-
-    private void method153() {
-        System.out.println("I am method 153");
-    }
-
-    private void method154() {
-        System.out.println("I am method 154");
-    }
-
-    private void method155() {
-        System.out.println("I am method 155");
-    }
-
-    private void method156() {
-        System.out.println("I am method 156");
-    }
-
-    private void method157() {
-        System.out.println("I am method 157");
-    }
-
-    private void method158() {
-        System.out.println("I am method 158");
-    }
-
-    private void method159() {
-        System.out.println("I am method 159");
-    }
-
-    private void method160() {
-        System.out.println("I am method 160");
-    }
-
-    private void method161() {
-        System.out.println("I am method 161");
-    }
-
-    private void method162() {
-        System.out.println("I am method 162");
-    }
-
-    private void method163() {
-        System.out.println("I am method 163");
-    }
-
-    private void method164() {
-        System.out.println("I am method 164");
-    }
-
-    private void method165() {
-        System.out.println("I am method 165");
-    }
-
-    private void method166() {
-        System.out.println("I am method 166");
-    }
-
-    private void method167() {
-        System.out.println("I am method 167");
-    }
-
-    private void method168() {
-        System.out.println("I am method 168");
-    }
-
-    private void method169() {
-        System.out.println("I am method 169");
-    }
-
-    private void method170() {
-        System.out.println("I am method 170");
-    }
-
-    private void method171() {
-        System.out.println("I am method 171");
-    }
-
-    private void method172() {
-        System.out.println("I am method 172");
-    }
-
-    private void method173() {
-        System.out.println("I am method 173");
-    }
-
-    private void method174() {
-        System.out.println("I am method 174");
-    }
-
-    private void method175() {
-        System.out.println("I am method 175");
-    }
-
-    private void method176() {
-        System.out.println("I am method 176");
-    }
-
-    private void method177() {
-        System.out.println("I am method 177");
-    }
-
-    private void method178() {
-        System.out.println("I am method 178");
-    }
-
-    private void method179() {
-        System.out.println("I am method 179");
-    }
-
-    private void method180() {
-        System.out.println("I am method 180");
-    }
-
-    private void method181() {
-        System.out.println("I am method 181");
-    }
-
-    private void method182() {
-        System.out.println("I am method 182");
-    }
-
-    private void method183() {
-        System.out.println("I am method 183");
-    }
-
-    private void method184() {
-        System.out.println("I am method 184");
-    }
-
-    private void method185() {
-        System.out.println("I am method 185");
-    }
-
-    private void method186() {
-        System.out.println("I am method 186");
-    }
-
-    private void method187() {
-        System.out.println("I am method 187");
-    }
-
-    private void method188() {
-        System.out.println("I am method 188");
-    }
-
-    private void method189() {
-        System.out.println("I am method 189");
-    }
-
-    private void method190() {
-        System.out.println("I am method 190");
-    }
-
-    private void method191() {
-        System.out.println("I am method 191");
-    }
-
-    private void method192() {
-        System.out.println("I am method 192");
-    }
-
-    private void method193() {
-        System.out.println("I am method 193");
-    }
-
-    private void method194() {
-        System.out.println("I am method 194");
-    }
-
-    private void method195() {
-        System.out.println("I am method 195");
-    }
-
-    private void method196() {
-        System.out.println("I am method 196");
-    }
-
-    private void method197() {
-        System.out.println("I am method 197");
-    }
-
-    private void method198() {
-        System.out.println("I am method 198");
-    }
-
-    private void method199() {
-        System.out.println("I am method 199");
-    }
-
-    private void method200() {
-        System.out.println("I am method 200");
-    }
-
-    private void method201() {
-        System.out.println("I am method 201");
-    }
-
-    private void method202() {
-        System.out.println("I am method 202");
-    }
-
-    private void method203() {
-        System.out.println("I am method 203");
-    }
-
-    private void method204() {
-        System.out.println("I am method 204");
-    }
-
-    private void method205() {
-        System.out.println("I am method 205");
-    }
-
-    private void method206() {
-        System.out.println("I am method 206");
-    }
-
-    private void method207() {
-        System.out.println("I am method 207");
-    }
-
-    private void method208() {
-        System.out.println("I am method 208");
-    }
-
-    private void method209() {
-        System.out.println("I am method 209");
-    }
-
-    private void method210() {
-        System.out.println("I am method 210");
-    }
-
-    private void method211() {
-        System.out.println("I am method 211");
-    }
-
-    private void method212() {
-        System.out.println("I am method 212");
-    }
-
-    private void method213() {
-        System.out.println("I am method 213");
-    }
-
-    private void method214() {
-        System.out.println("I am method 214");
-    }
-
-    private void method215() {
-        System.out.println("I am method 215");
-    }
-
-    private void method216() {
-        System.out.println("I am method 216");
-    }
-
-    private void method217() {
-        System.out.println("I am method 217");
-    }
-
-    private void method218() {
-        System.out.println("I am method 218");
-    }
-
-    private void method219() {
-        System.out.println("I am method 219");
-    }
-
-    private void method220() {
-        System.out.println("I am method 220");
-    }
-
-    private void method221() {
-        System.out.println("I am method 221");
-    }
-
-    private void method222() {
-        System.out.println("I am method 222");
-    }
-
-    private void method223() {
-        System.out.println("I am method 223");
-    }
-
-    private void method224() {
-        System.out.println("I am method 224");
-    }
-
-    private void method225() {
-        System.out.println("I am method 225");
-    }
-
-    private void method226() {
-        System.out.println("I am method 226");
-    }
-
-    private void method227() {
-        System.out.println("I am method 227");
-    }
-
-    private void method228() {
-        System.out.println("I am method 228");
-    }
-
-    private void method229() {
-        System.out.println("I am method 229");
-    }
-
-    private void method230() {
-        System.out.println("I am method 230");
-    }
-
-    private void method231() {
-        System.out.println("I am method 231");
-    }
-
-    private void method232() {
-        System.out.println("I am method 232");
-    }
-
-    private void method233() {
-        System.out.println("I am method 233");
-    }
-
-    private void method234() {
-        System.out.println("I am method 234");
-    }
-
-    private void method235() {
-        System.out.println("I am method 235");
-    }
-
-    private void method236() {
-        System.out.println("I am method 236");
-    }
-
-    private void method237() {
-        System.out.println("I am method 237");
-    }
-
-    private void method238() {
-        System.out.println("I am method 238");
-    }
-
-    private void method239() {
-        System.out.println("I am method 239");
-    }
-
-    private void method240() {
-        System.out.println("I am method 240");
-    }
-
-    private void method241() {
-        System.out.println("I am method 241");
-    }
-
-    private void method242() {
-        System.out.println("I am method 242");
-    }
-
-    private void method243() {
-        System.out.println("I am method 243");
-    }
-
-    private void method244() {
-        System.out.println("I am method 244");
-    }
-
-    private void method245() {
-        System.out.println("I am method 245");
-    }
-
-    private void method246() {
-        System.out.println("I am method 246");
-    }
-
-    private void method247() {
-        System.out.println("I am method 247");
-    }
-
-    private void method248() {
-        System.out.println("I am method 248");
-    }
-
-    private void method249() {
-        System.out.println("I am method 249");
-    }
-
-    private void method250() {
-        System.out.println("I am method 250");
-    }
-
-    private void method251() {
-        System.out.println("I am method 251");
-    }
-
-    private void method252() {
-        System.out.println("I am method 252");
-    }
-
-    private void method253() {
-        System.out.println("I am method 253");
-    }
-
-    private void method254() {
-        System.out.println("I am method 254");
-    }
-
-    private void method255() {
-        System.out.println("I am method 255");
-    }
-
-    private void method256() {
-        System.out.println("I am method 256");
-    }
-
-    private void method257() {
-        System.out.println("I am method 257");
-    }
-
-    private void method258() {
-        System.out.println("I am method 258");
-    }
-
-    private void method259() {
-        System.out.println("I am method 259");
-    }
-
-    private void method260() {
-        System.out.println("I am method 260");
-    }
-
-    private void method261() {
-        System.out.println("I am method 261");
-    }
-
-    private void method262() {
-        System.out.println("I am method 262");
-    }
-
-    private void method263() {
-        System.out.println("I am method 263");
-    }
-
-    private void method264() {
-        System.out.println("I am method 264");
-    }
-
-    private void method265() {
-        System.out.println("I am method 265");
-    }
-
-    private void method266() {
-        System.out.println("I am method 266");
-    }
-
-    private void method267() {
-        System.out.println("I am method 267");
-    }
-
-    private void method268() {
-        System.out.println("I am method 268");
-    }
-
-    private void method269() {
-        System.out.println("I am method 269");
-    }
-
-    private void method270() {
-        System.out.println("I am method 270");
-    }
-
-    private void method271() {
-        System.out.println("I am method 271");
-    }
-
-    private void method272() {
-        System.out.println("I am method 272");
-    }
-
-    private void method273() {
-        System.out.println("I am method 273");
-    }
-
-    private void method274() {
-        System.out.println("I am method 274");
-    }
-
-    private void method275() {
-        System.out.println("I am method 275");
-    }
-
-    private void method276() {
-        System.out.println("I am method 276");
-    }
-
-    private void method277() {
-        System.out.println("I am method 277");
-    }
-
-    private void method278() {
-        System.out.println("I am method 278");
-    }
-
-    private void method279() {
-        System.out.println("I am method 279");
-    }
-
-    private void method280() {
-        System.out.println("I am method 280");
-    }
-
-    private void method281() {
-        System.out.println("I am method 281");
-    }
-
-    private void method282() {
-        System.out.println("I am method 282");
-    }
-
-    private void method283() {
-        System.out.println("I am method 283");
-    }
-
-    private void method284() {
-        System.out.println("I am method 284");
-    }
-
-    private void method285() {
-        System.out.println("I am method 285");
-    }
-
-    private void method286() {
-        System.out.println("I am method 286");
-    }
-
-    private void method287() {
-        System.out.println("I am method 287");
-    }
-
-    private void method288() {
-        System.out.println("I am method 288");
-    }
-
-    private void method289() {
-        System.out.println("I am method 289");
-    }
-
-    private void method290() {
-        System.out.println("I am method 290");
-    }
-
-    private void method291() {
-        System.out.println("I am method 291");
-    }
-
-    private void method292() {
-        System.out.println("I am method 292");
-    }
-
-    private void method293() {
-        System.out.println("I am method 293");
-    }
-
-    private void method294() {
-        System.out.println("I am method 294");
-    }
-
-    private void method295() {
-        System.out.println("I am method 295");
-    }
-
-    private void method296() {
-        System.out.println("I am method 296");
-    }
-
-    private void method297() {
-        System.out.println("I am method 297");
-    }
-
-    private void method298() {
-        System.out.println("I am method 298");
-    }
-
-    private void method299() {
-        System.out.println("I am method 299");
-    }
-
-    private void method300() {
-        System.out.println("I am method 300");
-    }
-
-    private void method301() {
-        System.out.println("I am method 301");
-    }
-
-    private void method302() {
-        System.out.println("I am method 302");
-    }
-
-    private void method303() {
-        System.out.println("I am method 303");
-    }
-
-    private void method304() {
-        System.out.println("I am method 304");
-    }
-
-    private void method305() {
-        System.out.println("I am method 305");
-    }
-
-    private void method306() {
-        System.out.println("I am method 306");
-    }
-
-    private void method307() {
-        System.out.println("I am method 307");
-    }
-
-    private void method308() {
-        System.out.println("I am method 308");
-    }
-
-    private void method309() {
-        System.out.println("I am method 309");
-    }
-
-    private void method310() {
-        System.out.println("I am method 310");
-    }
-
-    private void method311() {
-        System.out.println("I am method 311");
-    }
-
-    private void method312() {
-        System.out.println("I am method 312");
-    }
-
-    private void method313() {
-        System.out.println("I am method 313");
-    }
-
-    private void method314() {
-        System.out.println("I am method 314");
-    }
-
-    private void method315() {
-        System.out.println("I am method 315");
-    }
-
-    private void method316() {
-        System.out.println("I am method 316");
-    }
-
-    private void method317() {
-        System.out.println("I am method 317");
-    }
-
-    private void method318() {
-        System.out.println("I am method 318");
-    }
-
-    private void method319() {
-        System.out.println("I am method 319");
-    }
-
-    private void method320() {
-        System.out.println("I am method 320");
-    }
-
-    private void method321() {
-        System.out.println("I am method 321");
-    }
-
-    private void method322() {
-        System.out.println("I am method 322");
-    }
-
-    private void method323() {
-        System.out.println("I am method 323");
-    }
-
-    private void method324() {
-        System.out.println("I am method 324");
-    }
-
-    private void method325() {
-        System.out.println("I am method 325");
-    }
-
-    private void method326() {
-        System.out.println("I am method 326");
-    }
-
-    private void method327() {
-        System.out.println("I am method 327");
-    }
-
-    private void method328() {
-        System.out.println("I am method 328");
-    }
-
-    private void method329() {
-        System.out.println("I am method 329");
-    }
-
-    private void method330() {
-        System.out.println("I am method 330");
-    }
-
-    private void method331() {
-        System.out.println("I am method 331");
-    }
-
-    private void method332() {
-        System.out.println("I am method 332");
-    }
-
-    private void method333() {
-        System.out.println("I am method 333");
-    }
-
-    private void method334() {
-        System.out.println("I am method 334");
-    }
-
-    private void method335() {
-        System.out.println("I am method 335");
-    }
-
-    private void method336() {
-        System.out.println("I am method 336");
-    }
-
-    private void method337() {
-        System.out.println("I am method 337");
-    }
-
-    private void method338() {
-        System.out.println("I am method 338");
-    }
-
-    private void method339() {
-        System.out.println("I am method 339");
-    }
-
-    private void method340() {
-        System.out.println("I am method 340");
-    }
-
-    private void method341() {
-        System.out.println("I am method 341");
-    }
-
-    private void method342() {
-        System.out.println("I am method 342");
-    }
-
-    private void method343() {
-        System.out.println("I am method 343");
-    }
-
-    private void method344() {
-        System.out.println("I am method 344");
-    }
-
-    private void method345() {
-        System.out.println("I am method 345");
-    }
-
-    private void method346() {
-        System.out.println("I am method 346");
-    }
-
-    private void method347() {
-        System.out.println("I am method 347");
-    }
-
-    private void method348() {
-        System.out.println("I am method 348");
-    }
-
-    private void method349() {
-        System.out.println("I am method 349");
-    }
-
-    private void method350() {
-        System.out.println("I am method 350");
-    }
-
-    private void method351() {
-        System.out.println("I am method 351");
-    }
-
-    private void method352() {
-        System.out.println("I am method 352");
-    }
-
-    private void method353() {
-        System.out.println("I am method 353");
-    }
-
-    private void method354() {
-        System.out.println("I am method 354");
-    }
-
-    private void method355() {
-        System.out.println("I am method 355");
-    }
-
-    private void method356() {
-        System.out.println("I am method 356");
-    }
-
-    private void method357() {
-        System.out.println("I am method 357");
-    }
-
-    private void method358() {
-        System.out.println("I am method 358");
-    }
-
-    private void method359() {
-        System.out.println("I am method 359");
-    }
-
-    private void method360() {
-        System.out.println("I am method 360");
-    }
-
-    private void method361() {
-        System.out.println("I am method 361");
-    }
-
-    private void method362() {
-        System.out.println("I am method 362");
-    }
-
-    private void method363() {
-        System.out.println("I am method 363");
-    }
-
-    private void method364() {
-        System.out.println("I am method 364");
-    }
-
-    private void method365() {
-        System.out.println("I am method 365");
-    }
-
-    private void method366() {
-        System.out.println("I am method 366");
-    }
-
-    private void method367() {
-        System.out.println("I am method 367");
-    }
-
-    private void method368() {
-        System.out.println("I am method 368");
-    }
-
-    private void method369() {
-        System.out.println("I am method 369");
-    }
-
-    private void method370() {
-        System.out.println("I am method 370");
-    }
-
-    private void method371() {
-        System.out.println("I am method 371");
-    }
-
-    private void method372() {
-        System.out.println("I am method 372");
-    }
-
-    private void method373() {
-        System.out.println("I am method 373");
-    }
-
-    private void method374() {
-        System.out.println("I am method 374");
-    }
-
-    private void method375() {
-        System.out.println("I am method 375");
-    }
-
-    private void method376() {
-        System.out.println("I am method 376");
-    }
-
-    private void method377() {
-        System.out.println("I am method 377");
-    }
-
-    private void method378() {
-        System.out.println("I am method 378");
-    }
-
-    private void method379() {
-        System.out.println("I am method 379");
-    }
-
-    private void method380() {
-        System.out.println("I am method 380");
-    }
-
-    private void method381() {
-        System.out.println("I am method 381");
-    }
-
-    private void method382() {
-        System.out.println("I am method 382");
-    }
-
-    private void method383() {
-        System.out.println("I am method 383");
-    }
-
-    private void method384() {
-        System.out.println("I am method 384");
-    }
-
-    private void method385() {
-        System.out.println("I am method 385");
-    }
-
-    private void method386() {
-        System.out.println("I am method 386");
-    }
-
-    private void method387() {
-        System.out.println("I am method 387");
-    }
-
-    private void method388() {
-        System.out.println("I am method 388");
-    }
-
-    private void method389() {
-        System.out.println("I am method 389");
-    }
-
-    private void method390() {
-        System.out.println("I am method 390");
-    }
-
-    private void method391() {
-        System.out.println("I am method 391");
-    }
-
-    private void method392() {
-        System.out.println("I am method 392");
-    }
-
-    private void method393() {
-        System.out.println("I am method 393");
-    }
-
-    private void method394() {
-        System.out.println("I am method 394");
-    }
-
-    private void method395() {
-        System.out.println("I am method 395");
-    }
-
-    private void method396() {
-        System.out.println("I am method 396");
-    }
-
-    private void method397() {
-        System.out.println("I am method 397");
-    }
-
-    private void method398() {
-        System.out.println("I am method 398");
-    }
-
-    private void method399() {
-        System.out.println("I am method 399");
-    }
-
-    private void method400() {
-        System.out.println("I am method 400");
-    }
-
-    private void method401() {
-        System.out.println("I am method 401");
-    }
-
-    private void method402() {
-        System.out.println("I am method 402");
-    }
-
-    private void method403() {
-        System.out.println("I am method 403");
-    }
-
-    private void method404() {
-        System.out.println("I am method 404");
-    }
-
-    private void method405() {
-        System.out.println("I am method 405");
-    }
-
-    private void method406() {
-        System.out.println("I am method 406");
-    }
-
-    private void method407() {
-        System.out.println("I am method 407");
-    }
-
-    private void method408() {
-        System.out.println("I am method 408");
-    }
-
-    private void method409() {
-        System.out.println("I am method 409");
-    }
-
-    private void method410() {
-        System.out.println("I am method 410");
-    }
-
-    private void method411() {
-        System.out.println("I am method 411");
-    }
-
-    private void method412() {
-        System.out.println("I am method 412");
-    }
-
-    private void method413() {
-        System.out.println("I am method 413");
-    }
-
-    private void method414() {
-        System.out.println("I am method 414");
-    }
-
-    private void method415() {
-        System.out.println("I am method 415");
-    }
-
-    private void method416() {
-        System.out.println("I am method 416");
-    }
-
-    private void method417() {
-        System.out.println("I am method 417");
-    }
-
-    private void method418() {
-        System.out.println("I am method 418");
-    }
-
-    private void method419() {
-        System.out.println("I am method 419");
-    }
-
-    private void method420() {
-        System.out.println("I am method 420");
-    }
-
-    private void method421() {
-        System.out.println("I am method 421");
-    }
-
-    private void method422() {
-        System.out.println("I am method 422");
-    }
-
-    private void method423() {
-        System.out.println("I am method 423");
-    }
-
-    private void method424() {
-        System.out.println("I am method 424");
-    }
-
-    private void method425() {
-        System.out.println("I am method 425");
-    }
-
-    private void method426() {
-        System.out.println("I am method 426");
-    }
-
-    private void method427() {
-        System.out.println("I am method 427");
-    }
-
-    private void method428() {
-        System.out.println("I am method 428");
-    }
-
-    private void method429() {
-        System.out.println("I am method 429");
-    }
-
-    private void method430() {
-        System.out.println("I am method 430");
-    }
-
-    private void method431() {
-        System.out.println("I am method 431");
-    }
-
-    private void method432() {
-        System.out.println("I am method 432");
-    }
-
-    private void method433() {
-        System.out.println("I am method 433");
-    }
-
-    private void method434() {
-        System.out.println("I am method 434");
-    }
-
-    private void method435() {
-        System.out.println("I am method 435");
-    }
-
-    private void method436() {
-        System.out.println("I am method 436");
-    }
-
-    private void method437() {
-        System.out.println("I am method 437");
-    }
-
-    private void method438() {
-        System.out.println("I am method 438");
-    }
-
-    private void method439() {
-        System.out.println("I am method 439");
-    }
-
-    private void method440() {
-        System.out.println("I am method 440");
-    }
-
-    private void method441() {
-        System.out.println("I am method 441");
-    }
-
-    private void method442() {
-        System.out.println("I am method 442");
-    }
-
-    private void method443() {
-        System.out.println("I am method 443");
-    }
-
-    private void method444() {
-        System.out.println("I am method 444");
-    }
-
-    private void method445() {
-        System.out.println("I am method 445");
-    }
-
-    private void method446() {
-        System.out.println("I am method 446");
-    }
-
-    private void method447() {
-        System.out.println("I am method 447");
-    }
-
-    private void method448() {
-        System.out.println("I am method 448");
-    }
-
-    private void method449() {
-        System.out.println("I am method 449");
-    }
-
-    private void method450() {
-        System.out.println("I am method 450");
-    }
-
-    private void method451() {
-        System.out.println("I am method 451");
-    }
-
-    private void method452() {
-        System.out.println("I am method 452");
-    }
-
-    private void method453() {
-        System.out.println("I am method 453");
-    }
-
-    private void method454() {
-        System.out.println("I am method 454");
-    }
-
-    private void method455() {
-        System.out.println("I am method 455");
-    }
-
-    private void method456() {
-        System.out.println("I am method 456");
-    }
-
-    private void method457() {
-        System.out.println("I am method 457");
-    }
-
-    private void method458() {
-        System.out.println("I am method 458");
-    }
-
-    private void method459() {
-        System.out.println("I am method 459");
-    }
-
-    private void method460() {
-        System.out.println("I am method 460");
-    }
-
-    private void method461() {
-        System.out.println("I am method 461");
-    }
-
-    private void method462() {
-        System.out.println("I am method 462");
-    }
-
-    private void method463() {
-        System.out.println("I am method 463");
-    }
-
-    private void method464() {
-        System.out.println("I am method 464");
-    }
-
-    private void method465() {
-        System.out.println("I am method 465");
-    }
-
-    private void method466() {
-        System.out.println("I am method 466");
-    }
-
-    private void method467() {
-        System.out.println("I am method 467");
-    }
-
-    private void method468() {
-        System.out.println("I am method 468");
-    }
-
-    private void method469() {
-        System.out.println("I am method 469");
-    }
-
-    private void method470() {
-        System.out.println("I am method 470");
-    }
-
-    private void method471() {
-        System.out.println("I am method 471");
-    }
-
-    private void method472() {
-        System.out.println("I am method 472");
-    }
-
-    private void method473() {
-        System.out.println("I am method 473");
-    }
-
-    private void method474() {
-        System.out.println("I am method 474");
-    }
-
-    private void method475() {
-        System.out.println("I am method 475");
-    }
-
-    private void method476() {
-        System.out.println("I am method 476");
-    }
-
-    private void method477() {
-        System.out.println("I am method 477");
-    }
-
-    private void method478() {
-        System.out.println("I am method 478");
-    }
-
-    private void method479() {
-        System.out.println("I am method 479");
-    }
-
-    private void method480() {
-        System.out.println("I am method 480");
-    }
-
-    private void method481() {
-        System.out.println("I am method 481");
-    }
-
-    private void method482() {
-        System.out.println("I am method 482");
-    }
-
-    private void method483() {
-        System.out.println("I am method 483");
-    }
-
-    private void method484() {
-        System.out.println("I am method 484");
-    }
-
-    private void method485() {
-        System.out.println("I am method 485");
-    }
-
-    private void method486() {
-        System.out.println("I am method 486");
-    }
-
-    private void method487() {
-        System.out.println("I am method 487");
-    }
-
-    private void method488() {
-        System.out.println("I am method 488");
-    }
-
-    private void method489() {
-        System.out.println("I am method 489");
-    }
-
-    private void method490() {
-        System.out.println("I am method 490");
-    }
-
-    private void method491() {
-        System.out.println("I am method 491");
-    }
-
-    private void method492() {
-        System.out.println("I am method 492");
-    }
-
-    private void method493() {
-        System.out.println("I am method 493");
-    }
-
-    private void method494() {
-        System.out.println("I am method 494");
-    }
-
-    private void method495() {
-        System.out.println("I am method 495");
-    }
-
-    private void method496() {
-        System.out.println("I am method 496");
-    }
-
-    private void method497() {
-        System.out.println("I am method 497");
-    }
-
-    private void method498() {
-        System.out.println("I am method 498");
-    }
-
-    private void method499() {
-        System.out.println("I am method 499");
-    }
-
-    private void method500() {
-        System.out.println("I am method 500");
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
deleted file mode 100644
index 9275656..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class LocalVariablesTests {
-	public static void nop() {
-		// used to allow breakpoint on otherwise empty lines
-	}
-	
-	public static void simpleTest() {
-		nop(); // should see no local variables here
-		int i1 = 0;
-		nop(); // should see 1 local variable: i1
-		int i2 = 1;
-		nop(); // should see 2 local variables: i1 && i2
-	}
-
-	public static void outerMethod() {
-		int i1 = 0;
-		innerMethod();
-		// i1 visible and i1==0, i2 not visible
-		int i2 = 1;
-		nop();
-	}
-
-	public static void innerMethod() {
-		int i2 = 7;
-		nop(); // i1 not visible in the top stack frame, i2 visible
-	}
-	
-	public static void testFor() {
-		nop(); // should see no variable
-		for (int i = 0; i < 1; i++) {
-			nop(); // should see i
-			for (int j = 0; j < 1; j++) {
-				nop(); // 	should see i, j
-				Object obj = null;
-				nop(); // should see i, j, obj
-				obj = "foo";
-			}
-		}
-		nop(); // should not see i and j
-	}
-	
-	public static void testIf(boolean cond) {
-		if (cond) {
-			Object ifObj = new String("true");
-			nop();
-		} else {
-			Object elseObj = new String("false");
-			nop();
-		}
-		nop();
-	}
-	
-	public static void testWhile() {
-		int i = 0;
-		while (i < 1) {
-			int j = i/2;
-			nop(); // should see i & j
-			i++;
-		}
-	}
-	
-	public static void testTryCatch() {
-		try {
-			String str = null;
-			nop(); // should see str
-			str.length();
-		} catch (NullPointerException ex) {
-			nop(); // should see ex
- 		} finally {
- 			nop(); // should see str
- 		}
-	}
-	
-	public static void testAliasing() {
-		String str1 = new String("value");
-		String str2 = str1;
-		nop();
-	}
-
-	public static void main(String[] args) {
-		simpleTest();  // @see LocalVariablesTests.testSimple()
-		outerMethod(); // @see LocalVariablesTests.testMethodCall()
-		testFor();    // @see LocalVariablesTests.testFor()
-		testIf(true);  // @see LocalVariablesTests.testIf()
-		testIf(false); // @see LocalVariablesTests.testIf()
-		testWhile();   // @see LocalVariablesTests.testWhile()
-		testTryCatch();// @see LocalVariablesTests.testTryCatch()
-		testAliasing(); // @see LocalVariablesTests.testAliasing()
-
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/LotsOfFields.java b/org.eclipse.jdt.debug.tests/testprograms/LotsOfFields.java
deleted file mode 100644
index 581e4b8..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/LotsOfFields.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class LotsOfFields {
-
-    private int field_1;
-    private int field_2;
-    private int field_3;
-    private int field_4;
-    private int field_5;
-    private int field_6;
-    private int field_7;
-    private int field_8;
-    private int field_9;
-    private int field_10;
-    private int field_11;
-    private int field_12;
-    private int field_13;
-    private int field_14;
-    private int field_15;
-    private int field_16;
-    private int field_17;
-    private int field_18;
-    private int field_19;
-    private int field_20;
-    private int field_21;
-    private int field_22;
-    private int field_23;
-    private int field_24;
-    private int field_25;
-    private int field_26;
-    private int field_27;
-    private int field_28;
-    private int field_29;
-    private int field_30;
-    private int field_31;
-    private int field_32;
-    private int field_33;
-    private int field_34;
-    private int field_35;
-    private int field_36;
-    private int field_37;
-    private int field_38;
-    private int field_39;
-    private int field_40;
-    private int field_41;
-    private int field_42;
-    private int field_43;
-    private int field_44;
-    private int field_45;
-    private int field_46;
-    private int field_47;
-    private int field_48;
-    private int field_49;
-    private int field_50;
-    private int field_51;
-    private int field_52;
-    private int field_53;
-    private int field_54;
-    private int field_55;
-    private int field_56;
-    private int field_57;
-    private int field_58;
-    private int field_59;
-    private int field_60;
-    private int field_61;
-    private int field_62;
-    private int field_63;
-    private int field_64;
-    private int field_65;
-    private int field_66;
-    private int field_67;
-    private int field_68;
-    private int field_69;
-    private int field_70;
-    private int field_71;
-    private int field_72;
-    private int field_73;
-    private int field_74;
-    private int field_75;
-    private int field_76;
-    private int field_77;
-    private int field_78;
-    private int field_79;
-    private int field_80;
-    private int field_81;
-    private int field_82;
-    private int field_83;
-    private int field_84;
-    private int field_85;
-    private int field_86;
-    private int field_87;
-    private int field_88;
-    private int field_89;
-    private int field_90;
-    private int field_91;
-    private int field_92;
-    private int field_93;
-    private int field_94;
-    private int field_95;
-    private int field_96;
-    private int field_97;
-    private int field_98;
-    private int field_99;
-    private int field_100;
-    private int field_101;
-    private int field_102;
-    private int field_103;
-    private int field_104;
-    private int field_105;
-    private int field_106;
-    private int field_107;
-    private int field_108;
-    private int field_109;
-    private int field_110;
-    private int field_111;
-    private int field_112;
-    private int field_113;
-    private int field_114;
-    private int field_115;
-    private int field_116;
-    private int field_117;
-    private int field_118;
-    private int field_119;
-    private int field_120;
-    private int field_121;
-    private int field_122;
-    private int field_123;
-    private int field_124;
-    private int field_125;
-    private int field_126;
-    private int field_127;
-    private int field_128;
-    private int field_129;
-    private int field_130;
-    private int field_131;
-    private int field_132;
-    private int field_133;
-    private int field_134;
-    private int field_135;
-    private int field_136;
-    private int field_137;
-    private int field_138;
-    private int field_139;
-    private int field_140;
-    private int field_141;
-    private int field_142;
-    private int field_143;
-    private int field_144;
-    private int field_145;
-    private int field_146;
-    private int field_147;
-    private int field_148;
-    private int field_149;
-    private int field_150;
-    private int field_151;
-    private int field_152;
-    private int field_153;
-    private int field_154;
-    private int field_155;
-    private int field_156;
-    private int field_157;
-    private int field_158;
-    private int field_159;
-    private int field_160;
-    private int field_161;
-    private int field_162;
-    private int field_163;
-    private int field_164;
-    private int field_165;
-    private int field_166;
-    private int field_167;
-    private int field_168;
-    private int field_169;
-    private int field_170;
-    private int field_171;
-    private int field_172;
-    private int field_173;
-    private int field_174;
-    private int field_175;
-    private int field_176;
-    private int field_177;
-    private int field_178;
-    private int field_179;
-    private int field_180;
-    private int field_181;
-    private int field_182;
-    private int field_183;
-    private int field_184;
-    private int field_185;
-    private int field_186;
-    private int field_187;
-    private int field_188;
-    private int field_189;
-    private int field_190;
-    private int field_191;
-    private int field_192;
-    private int field_193;
-    private int field_194;
-    private int field_195;
-    private int field_196;
-    private int field_197;
-    private int field_198;
-    private int field_199;
-    private int field_200;
-    private int field_201;
-    private int field_202;
-    private int field_203;
-    private int field_204;
-    private int field_205;
-    private int field_206;
-    private int field_207;
-    private int field_208;
-    private int field_209;
-    private int field_210;
-    private int field_211;
-    private int field_212;
-    private int field_213;
-    private int field_214;
-    private int field_215;
-    private int field_216;
-    private int field_217;
-    private int field_218;
-    private int field_219;
-    private int field_220;
-    private int field_221;
-    private int field_222;
-    private int field_223;
-    private int field_224;
-    private int field_225;
-    private int field_226;
-    private int field_227;
-    private int field_228;
-    private int field_229;
-    private int field_230;
-    private int field_231;
-    private int field_232;
-    private int field_233;
-    private int field_234;
-    private int field_235;
-    private int field_236;
-    private int field_237;
-    private int field_238;
-    private int field_239;
-    private int field_240;
-    private int field_241;
-    private int field_242;
-    private int field_243;
-    private int field_244;
-    private int field_245;
-    private int field_246;
-    private int field_247;
-    private int field_248;
-    private int field_249;
-    private int field_250;
-    private int field_251;
-    private int field_252;
-    private int field_253;
-    private int field_254;
-    private int field_255;
-    private int field_256;
-    private int field_257;
-    private int field_258;
-    private int field_259;
-    private int field_260;
-    private int field_261;
-    private int field_262;
-    private int field_263;
-    private int field_264;
-    private int field_265;
-    private int field_266;
-    private int field_267;
-    private int field_268;
-    private int field_269;
-    private int field_270;
-    private int field_271;
-    private int field_272;
-    private int field_273;
-    private int field_274;
-    private int field_275;
-    private int field_276;
-    private int field_277;
-    private int field_278;
-    private int field_279;
-    private int field_280;
-    private int field_281;
-    private int field_282;
-    private int field_283;
-    private int field_284;
-    private int field_285;
-    private int field_286;
-    private int field_287;
-    private int field_288;
-    private int field_289;
-    private int field_290;
-    private int field_291;
-    private int field_292;
-    private int field_293;
-    private int field_294;
-    private int field_295;
-    private int field_296;
-    private int field_297;
-    private int field_298;
-    private int field_299;
-    private int field_300;
-    private int field_301;
-    private int field_302;
-    private int field_303;
-    private int field_304;
-    private int field_305;
-    private int field_306;
-    private int field_307;
-    private int field_308;
-    private int field_309;
-    private int field_310;
-    private int field_311;
-    private int field_312;
-    private int field_313;
-    private int field_314;
-    private int field_315;
-    private int field_316;
-    private int field_317;
-    private int field_318;
-    private int field_319;
-    private int field_320;
-    private int field_321;
-    private int field_322;
-    private int field_323;
-    private int field_324;
-    private int field_325;
-    private int field_326;
-    private int field_327;
-    private int field_328;
-    private int field_329;
-    private int field_330;
-    private int field_331;
-    private int field_332;
-    private int field_333;
-    private int field_334;
-    private int field_335;
-    private int field_336;
-    private int field_337;
-    private int field_338;
-    private int field_339;
-    private int field_340;
-    private int field_341;
-    private int field_342;
-    private int field_343;
-    private int field_344;
-    private int field_345;
-    private int field_346;
-    private int field_347;
-    private int field_348;
-    private int field_349;
-    private int field_350;
-    private int field_351;
-    private int field_352;
-    private int field_353;
-    private int field_354;
-    private int field_355;
-    private int field_356;
-    private int field_357;
-    private int field_358;
-    private int field_359;
-    private int field_360;
-    private int field_361;
-    private int field_362;
-    private int field_363;
-    private int field_364;
-    private int field_365;
-    private int field_366;
-    private int field_367;
-    private int field_368;
-    private int field_369;
-    private int field_370;
-    private int field_371;
-    private int field_372;
-    private int field_373;
-    private int field_374;
-    private int field_375;
-    private int field_376;
-    private int field_377;
-    private int field_378;
-    private int field_379;
-    private int field_380;
-    private int field_381;
-    private int field_382;
-    private int field_383;
-    private int field_384;
-    private int field_385;
-    private int field_386;
-    private int field_387;
-    private int field_388;
-    private int field_389;
-    private int field_390;
-    private int field_391;
-    private int field_392;
-    private int field_393;
-    private int field_394;
-    private int field_395;
-    private int field_396;
-    private int field_397;
-    private int field_398;
-    private int field_399;
-    private int field_400;
-    private int field_401;
-    private int field_402;
-    private int field_403;
-    private int field_404;
-    private int field_405;
-    private int field_406;
-    private int field_407;
-    private int field_408;
-    private int field_409;
-    private int field_410;
-    private int field_411;
-    private int field_412;
-    private int field_413;
-    private int field_414;
-    private int field_415;
-    private int field_416;
-    private int field_417;
-    private int field_418;
-    private int field_419;
-    private int field_420;
-    private int field_421;
-    private int field_422;
-    private int field_423;
-    private int field_424;
-    private int field_425;
-    private int field_426;
-    private int field_427;
-    private int field_428;
-    private int field_429;
-    private int field_430;
-    private int field_431;
-    private int field_432;
-    private int field_433;
-    private int field_434;
-    private int field_435;
-    private int field_436;
-    private int field_437;
-    private int field_438;
-    private int field_439;
-    private int field_440;
-    private int field_441;
-    private int field_442;
-    private int field_443;
-    private int field_444;
-    private int field_445;
-    private int field_446;
-    private int field_447;
-    private int field_448;
-    private int field_449;
-    private int field_450;
-    private int field_451;
-    private int field_452;
-    private int field_453;
-    private int field_454;
-    private int field_455;
-    private int field_456;
-    private int field_457;
-    private int field_458;
-    private int field_459;
-    private int field_460;
-    private int field_461;
-    private int field_462;
-    private int field_463;
-    private int field_464;
-    private int field_465;
-    private int field_466;
-    private int field_467;
-    private int field_468;
-    private int field_469;
-    private int field_470;
-    private int field_471;
-    private int field_472;
-    private int field_473;
-    private int field_474;
-    private int field_475;
-    private int field_476;
-    private int field_477;
-    private int field_478;
-    private int field_479;
-    private int field_480;
-    private int field_481;
-    private int field_482;
-    private int field_483;
-    private int field_484;
-    private int field_485;
-    private int field_486;
-    private int field_487;
-    private int field_488;
-    private int field_489;
-    private int field_490;
-    private int field_491;
-    private int field_492;
-    private int field_493;
-    private int field_494;
-    private int field_495;
-    private int field_496;
-    private int field_497;
-    private int field_498;
-    private int field_499;
-    private int field_500;
-
-    public static void main(String[] args) {
-        System.out.println("Hello World");
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java b/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
deleted file mode 100644
index 599772a..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.lang.reflect.Method;
-
-
-public class MethodEntryRunner {
-
-	// Why the reflection?  Because this class fires up a class that is meant to exist only as 
-	// a .class file in the tests, and MethodEntryRunner wouldn't compile in
-	// development if we directly invoked MethodEntryTest, since there's no source for it
-	public static void main(java.lang.String[] args) {
-		try {
-			Class clazz= Class.forName("MethodEntryTest");
-			Method method= clazz.getMethod("main", new Class[] {String[].class});
-			method.invoke(null, new Object[] { new String[] {} } );
-		} catch (Exception ex) {
-			System.err.println("Exception trying to invoke MethodEntryTest");
-			ex.printStackTrace();
-		}
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java b/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
deleted file mode 100644
index ba05964..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class MethodLoop {
-	
-	private int i;
-	private int sum = 0;
-
-	public static void main(String[] args) {
-		MethodLoop ml = new MethodLoop();
-		ml.go();
-	}
-	
-	public void go() {
-		for (i = 1; i < 10; i++) {
-			calculateSum();
-		}
-	}
-	
-	protected void calculateSum() {
-		sum += i;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java b/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
deleted file mode 100644
index 6c1b4ea..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.Vector;
-
-
-public class MultiThreadedException {
-
-	public static void main(String[] args) {
-		MultiThreadedException mte = new MultiThreadedException();
-		mte.go();
-	}
-	
-	private void go() {
-		Thread.currentThread().setName("1stThread");
-		
-		Thread secondThread = new Thread(new Runnable() {
-			public void run() {
-				generateNPE();
-			}
-		});
-		secondThread.setName("2ndThread");
-		secondThread.start();
-		
-		try {
-			Thread.sleep(1000);
-		} catch (InterruptedException e) {
-		}
-		
-		generateNPE();
-	}
-	
-	void generateNPE() {
-		Vector vector = null;
-		if (1 > 2) {
-			vector = new Vector();
-		}
-		vector.add("item");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java b/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
deleted file mode 100644
index abab0c8..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class MultiThreadedList {
-
-	int i = 0;
-	List list = new ArrayList();
-
-	public static void main(String[] args) {
-		MultiThreadedList mtl = new MultiThreadedList();
-		Thread.currentThread().setName("1stThread");
-		mtl.go();
-	}
-	
-	protected void go() {
-		Thread secondThread = new Thread(new Runnable() {
-			public void run() {
-				listLoop();
-			}
-		});
-		secondThread.setName("2ndThread");
-		secondThread.start();
-		
-		try {
-			Thread.sleep(400);
-		} catch (InterruptedException e) {
-		}
-		
-		listLoop();
-	}
-	
-	private void listLoop() {
-		while (i < 20) {
-			list.add(new Integer(i++));
-			System.out.println("Size = " + list.size());
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java b/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
deleted file mode 100644
index 79889ef..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class MultiThreadedLoop {
-
-	public static void main(String[] args) {
-		MultiThreadedLoop mtl = new MultiThreadedLoop();
-		Thread.currentThread().setName("1stThread");
-		mtl.go();
-	}
-	
-	protected void go() {
-		Thread secondThread = new Thread(new Runnable() {
-			public void run() {
-				loop();
-			}
-		});
-		secondThread.setName("2ndThread");
-		secondThread.start();
-		
-		try {
-			Thread.sleep(400);
-		} catch (InterruptedException e) {
-		}
-		
-		loop();
-	}
-	
-	private void loop() {
-		int i = 0;
-		while (i < 20) {
-			System.out.println("Thread: " + Thread.currentThread().getName() + " loop #" + i++); 
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java b/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
deleted file mode 100644
index fc339a8..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class NativeDropTests {
-	public static void foo() {
-		System.out.println("foo"); 
-		System.out.println("breakpoint"); // breakpoint on this line
-	}
-	
-	public static void bar() {
-		foo();
-	}
-
-	public static void main(String[] args) throws Exception {
-		Class clazz = NativeDropTests.class;
-		java.lang.reflect.Method method = clazz.getMethod("bar", new Class[] {});
-		method.invoke(null, new Object[] {});
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/OneToTen.java b/org.eclipse.jdt.debug.tests/testprograms/OneToTen.java
deleted file mode 100644
index 05e9942..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/OneToTen.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * Counts one thru ten on the console
- */
-public class OneToTen {
-
-	public static void main(String[] args) {
-		System.out.println("one");
-		System.out.println("two");
-		System.out.println("three");
-		System.out.println("four");
-		System.out.println("five");
-		System.out.println("six");
-		System.out.println("seven");
-		System.out.println("eight");
-		System.out.println("nine");
-		System.out.println("ten");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/OneToTenPrint.java b/org.eclipse.jdt.debug.tests/testprograms/OneToTenPrint.java
deleted file mode 100644
index acc5776..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/OneToTenPrint.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * Counts one thru ten on the console
- */
-public class OneToTenPrint {
-
-	public static void main(String[] args) {
-		System.out.println("one");
-		System.out.println("two");
-		System.out.println("three");
-		System.out.println("four");
-		System.out.println("five");
-		System.out.println("six");
-		System.out.println("seven");
-		System.out.println("eight");
-		System.out.println("nine");
-		System.out.print("ten");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/PerfLoop.java b/org.eclipse.jdt.debug.tests/testprograms/PerfLoop.java
deleted file mode 100644
index 5976c95..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/PerfLoop.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.Vector;
-
-/**
- * A loop adding to a collection
- */
-public class PerfLoop {
-
-	public static void main(String[] args) {
-		Vector v = new Vector(200);
-		for (int i = 0; i < 10000; i++) {
-			v.add(new Integer(i));
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/PrintConcatenation.java b/org.eclipse.jdt.debug.tests/testprograms/PrintConcatenation.java
deleted file mode 100644
index e95b04b..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/PrintConcatenation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * PrintConcatenation
- */
-public class PrintConcatenation {
-
-    public static void main(String[] args) {
-        String foo = "foo";
-        int x = 35;
-        System.currentTimeMillis();
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StackTraces.java b/org.eclipse.jdt.debug.tests/testprograms/StackTraces.java
deleted file mode 100644
index 248f2d4..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StackTraces.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * StackTraces
- */
-public class StackTraces {
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 100; i++) {
-            try {
-                String fred = null;
-                fred.toString();
-            } catch (NullPointerException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
deleted file mode 100644
index 6a974ad..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class StaticVariablesTests {
-	
-	private int i;
-	private String s;
-	
-	public StaticVariablesTests() {
-		i = 1;
-		s = "string";	
-	}
-	
-	public static void nop() {
-	}
-	
-	public static String pubStr = "public";
-	protected static String protStr = "protected";
-	/* default */ static String defStr = "default";
-	private static String privStr = "private";	
- 		
-	public static void run() {
-		nop();
-	}
-	
-	public int fcn() {
-		return 1;	
-	}
-	
-	public static void main(String[] args) {
-		run();
-		(new StaticVariablesTests()).fcn();
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
deleted file mode 100644
index d5149b4..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class StepFilterOne {
-
-	public static void main(String[] args) {
-		StepFilterOne sf1 = new StepFilterOne();
-		sf1.go();
-	}
-	
-	private void go() {
-		StepFilterTwo sf2 = new StepFilterTwo();
-		sf2.test();
-		sf2.go();
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
deleted file mode 100644
index 6681fac..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class StepFilterThree {
-
-	public StepFilterThree() {
-		//int i = 0;
-	}
-
-	void go() {
-		System.out.println("StepFilterThree.go()");
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
deleted file mode 100644
index f18ca17..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class StepFilterTwo {
-
-	private StepFilterThree sf3;
-
-	public StepFilterTwo() {
-		sf3 = new StepFilterThree();
-	}
-
-	protected void go() {
-		sf3.go();
-	}
-	
-	void test() {
-		System.out.println("StepFilterTwo.test()");
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/testprograms/TestIO.java b/org.eclipse.jdt.debug.tests/testprograms/TestIO.java
deleted file mode 100644
index f324660..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/TestIO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-import java.io.*;
-
-
-public class TestIO {
-	
-	public static void main(String[] args) {
-		TestIO tio = new TestIO();
-		try {
-			tio.testBaby();
-		} catch (EOFException e) {
-		}
-	}
-
-	public void testBaby() throws EOFException {
-		throw new EOFException("test");
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java b/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
deleted file mode 100644
index f0ac8f5..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class ThrowsNPE {
-	
-	public static void main(String[] args) {
-		ThrowsNPE anObject = new ThrowsNPE();
-		try {
-			anObject.throwBaby();
-		} catch(NullPointerException ne) {
-			// do nothing
-		}		
-		anObject.throwBaby();
-	}
-
-
-	public void throwBaby() {
-		throw new NullPointerException();
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/VariableChanges.java b/org.eclipse.jdt.debug.tests/testprograms/VariableChanges.java
deleted file mode 100644
index 2307e31..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/VariableChanges.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class VariableChanges {
-
-		public static void main(String[] args) {
-			new VariableChanges().test();
-		}
-
-		int count= 0;
-		private void test() {
-			int i = 0;
-			count++;
-			i++;
-			count++;
-			i++;
-			count++;
-		}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/VariableDetails.java b/org.eclipse.jdt.debug.tests/testprograms/VariableDetails.java
deleted file mode 100644
index ef405f8..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/VariableDetails.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.Vector;
-
-/**
- * A loop adding to a collection
- */
-public class VariableDetails {
-
-	public static void main(String[] args) {
-		Vector v = new Vector(200);
-		for (int i = 0; i < 100; i++) {
-			v.add(new Integer(i));
-		}
-		System.out.println(v);
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/WatchItemTests.java b/org.eclipse.jdt.debug.tests/testprograms/WatchItemTests.java
deleted file mode 100644
index 591a598..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/WatchItemTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-/**
- * WatchItemTests
- */
-public class WatchItemTests {
-	
-	public Vector fVector =  null;
-	public Map fMap = null;
-
-	public static void main(String[] args) {
-		WatchItemTests test = new WatchItemTests();
-		test.fillVector();
-		test.fillMap(); 
-	}
-	
-	public WatchItemTests() {
-	}	
-	
-	public void fillVector() {
-		fVector = new Vector();
-		for (int i = 0; i < 100; i++) {
-			fVector.add(new Integer(i));
-		}
-	}
-	
-	public void fillMap() {
-		fMap = new HashMap();
-		Iterator iterator = fVector.iterator();
-		while (iterator.hasNext()) {
-			Integer i = (Integer)iterator.next();
-			fMap.put(i, i.toString());
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java b/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
deleted file mode 100644
index 6e2248a..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-public class WorkingDirectoryTest {
-
-	public static void main(String[] args) {
-		String dir = System.getProperty("user.dir");
-		System.out.println(dir);
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/non-java.txt b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/non-java.txt
deleted file mode 100644
index eaa3571..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/non-java.txt
+++ /dev/null
@@ -1 +0,0 @@
-A non java file to test source lookup
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
deleted file mode 100644
index 1685490..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-public class CallLoop {
-	public static void main(String[] args) {
-		(new Looper()).loop();
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallStack.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallStack.java
deleted file mode 100644
index fef8242..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallStack.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-/**
- * @author Dwright
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CallStack {
-	
-	public static void main(String[] args) {
-		ClassOne one = new ClassOne();
-		ClassTwo two = new ClassTwo();
-		one.method1();
-		two.method1();
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassOne.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassOne.java
deleted file mode 100644
index 4f84780..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassOne.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.tests.targets;
-
-/**
- * ClassOne 
- */
-public class ClassOne {
-	
-	public void method1() {
-		method2();
-	}
-	
-	public void method2() {
-		method3();
-	}
-	
-	public void method3() {
-		System.out.println("ClassOne, method3");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassTwo.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassTwo.java
deleted file mode 100644
index fae384c..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/ClassTwo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.debug.tests.targets;
-
-/**
- * ClassTwo
- */
-public class ClassTwo {
-	
-	public void method1() {
-		method2();
-	}
-	
-	public void method2() {
-		method3();
-	}
-	
-	public void method3() {
-		System.out.println("ClassTwo, method3");
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HcrClass.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HcrClass.java
deleted file mode 100644
index 9d0b89f..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HcrClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-/**
- * Class used to test hot code replace
- */
-public class HcrClass {
-	
-	protected String instVar = null;
-	
-	public static void main(String[] args) {
-		new HcrClass().one();
-	}
-	
-	public void one() {
-		instVar = "One";
-		two();
-	}
-	
-	public void two() {
-		three();
-	}
-	
-	public void three() {
-		four();
-	}
-	
-	public void four() {
-		String x = instVar;
-		System.out.println(x);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
deleted file mode 100644
index 8e30129..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-public class HelloLauncher {
-	public static void main(String args[]) {
-		for (int i = 0; i < 10; i++) {
-			System.out.println("Hello Launcher");
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
deleted file mode 100644
index 2cfbc42..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-public class HelloLauncherWithArg {
-	public static void main(String args[]) {
-		int argCount = args.length;
-		if (argCount > 0) {
-			if (args[0].equals("foo")) {
-				System.out.println("First argument was foo");
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
deleted file mode 100644
index 68b0f52..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-public class HelloLauncherWithArgs {
-	public static void main(String args[]) {
-		int argCount = args.length;
-		if (argCount > 1) {
-			if (args[0].equals("foo") && args[1].equals("bar")) {
-				System.out.println("First argument was foo and second argument was bar");
-			}
-		}			
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
deleted file mode 100644
index 4e0688e..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-
-public class HitCountLooper {
-	public static void main(String[] args) {
-		int i = 0;
-		while (i < 20) {
-			System.out.println("Main Looping " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-		(new HitCountLooper()).loop();
-	}
-
-	public void loop() {
-		Runnable r= new Runnable() {
-			public void run() {
-				while (true) {
-					int i = 0;
-					System.out.println("Thread Looping " + i);
-					i++;
-					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-		};
-		new Thread(r).start();
-		int i = 0;
-		while (true) {
-			System.out.println("Instance Looping " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
deleted file mode 100644
index efc9d61..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-public class InfiniteLoop {
-	public static void main(String[] args) {
-		(new InfiniteLoop()).loop();
-	}
-
-	public void loop() {
-		int i = 0;
-		while (true) {
-			System.out.println("Looping " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
deleted file mode 100644
index 87a2324..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-public class Looper {
-	public void loop() {
-		int i = 0;
-		while (true) {
-			System.out.println("Loop " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/SourceLookup.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/SourceLookup.java
deleted file mode 100644
index bd86839..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/SourceLookup.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-/**
- * Used for source lookup tests in non-default package 
- */
-public class SourceLookup {
-	
-	public static void main(String[] args) {
-			
-	}
-	
-	public void foo() {
-		System.out.println("foo");
-	}
-	
-	public class Inner {
-		
-		public void innerFoo() {
-			System.out.println("innerFoo");
-		}
-		
-		public class Nested {
-			public void nestedFoo() {
-				System.out.println("nestedFoo");
-			}
-		}
-		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Source_$_Lookup.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Source_$_Lookup.java
deleted file mode 100644
index 880c97b..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Source_$_Lookup.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-/**
- * Used for source lookup tests in non-default package, with non-standard name
- */
-public class Source_$_Lookup {
-		
-	public void foo() {
-		System.out.println("foo");
-	}
-	
-	public class Inner {
-		
-		public void innerFoo() {
-			System.out.println("innerFoo");
-		}
-		
-		public class Nested {
-			public void nestedFoo() {
-				System.out.println("nestedFoo");
-			}
-		}		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java
deleted file mode 100644
index 18e44a1..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/StepIntoSelectionClass.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-import java.util.Vector;
-
-/**
- * Class for testing 'step into selection'
- */
-public class StepIntoSelectionClass {
-
-	public static void main(String[] args) {
-		StepIntoSelectionClass stepper = new StepIntoSelectionClass();
-		stepper.step();
-	}
-	
-	public StepIntoSelectionClass() {
-		super();
-	}
-	
-	public void step() {
-		Vector vector = new Vector(); 
-		int size= vector.size(); 
-		for (int i= 0; i < 100; i++) {
-			vector.addElement(new Integer(i));
-		}		
-		method1(method2(), new String[0]);
-	}
-	
-	public void method1(int[] i, String[] s) {
-		new String("test");
-	}
-	
-	public int[] method2() {
-		return new int[0];
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
deleted file mode 100644
index 623eedd..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.debug.tests.targets;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Watchpoint {
-	
-	public List list;
-	
-	public static void main(String[] args) {
-		Watchpoint wp = new Watchpoint();
-		wp.fillList();
-	}
-	
-	public void fillList() {
-		list = new ArrayList(10);
-		int value = 10;
-		while (value > 0) {
-			list.add(new Integer(value));
-			value--;
-		}
-		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/testresources/TestSource.jar b/org.eclipse.jdt.debug.tests/testresources/TestSource.jar
deleted file mode 100644
index 4c0bdf4..0000000
--- a/org.eclipse.jdt.debug.tests/testresources/TestSource.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/testresources/source-test.zip b/org.eclipse.jdt.debug.tests/testresources/source-test.zip
deleted file mode 100644
index 4712ce7..0000000
--- a/org.eclipse.jdt.debug.tests/testresources/source-test.zip
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/testresources/testJarWithOutRoot.jar b/org.eclipse.jdt.debug.tests/testresources/testJarWithOutRoot.jar
deleted file mode 100644
index d391026..0000000
--- a/org.eclipse.jdt.debug.tests/testresources/testJarWithOutRoot.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugPerformanceTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugPerformanceTest.java
deleted file mode 100644
index 351007f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugPerformanceTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-
-public class AbstractDebugPerformanceTest extends AbstractDebugTest {
-
-	protected PerformanceMeter fPerformanceMeter;
-
-	/**
-	 * Constructs a performance test case with the given name.
-	 * @param name the name of the performance test case
-	 */
-	public AbstractDebugPerformanceTest(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Overridden to create a default performance meter for this test case.
-	 * @throws Exception
-	 */
-	protected void setUp() throws Exception {
-		Performance performance= Performance.getDefault();
-		fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(this));
-	}
-
-	/**
-	 * Overridden to dispose of the performance meter.
-	 * @throws Exception
-	 */
-	protected void tearDown() throws Exception {
-		fPerformanceMeter.dispose();
-	}
-
-	/**
-	 * Mark the scenario of this test case
-	 * to be included into the global performance summary. The summary shows
-	 * the given dimension of the scenario and labels the scenario with the short name.
-	 * 
-	 * @param shortName a short (shorter than 40 characters) descritive name of the scenario
-	 * @param dimension the dimension to show in the summary
-	 */
-	public void tagAsGlobalSummary(String shortName, Dimension dimension) {
-		Performance performance= Performance.getDefault();
-		performance.tagAsGlobalSummary(fPerformanceMeter, shortName, new Dimension[] { dimension } );
-	}
-
-	/**
-	 * Mark the scenario represented by the given PerformanceMeter
-	 * to be included into the global performance summary. The summary shows
-	 * the given dimensions of the scenario and labels the scenario with the short name.
-	 * 
-	 * @param shortName a short (shorter than 40 characters) descritive name of the scenario
-	 * @param dimensions an array of dimensions to show in the summary
-	 */
-	public void tagAsGlobalSummary(String shortName, Dimension[] dimensions) {
-		Performance performance= Performance.getDefault();
-		performance.tagAsGlobalSummary(fPerformanceMeter, shortName, dimensions );
-	}
-	
-	/**
-	 * Mark the scenario of this test case
-	 * to be included into the component performance summary. The summary shows
-	 * the given dimension of the scenario and labels the scenario with the short name.
-	 * 
-	 * @param shortName a short (shorter than 40 characters) descritive name of the scenario
-	 * @param dimension the dimension to show in the summary
-	 */
-	public void tagAsSummary(String shortName, Dimension dimension) {
-		tagAsSummary(shortName, new Dimension[]{dimension});
-	}
-	
-	/**
-	 * Mark the scenario of this test case
-	 * to be included into the component performance summary. The summary shows
-	 * the given dimension of the scenario and labels the scenario with the short name.
-	 * 
-	 * @param shortName a short (shorter than 40 characters) descritive name of the scenario
-	 * @param dimensions an array of dimensions to show in the summary
-	 */
-	public void tagAsSummary(String shortName, Dimension[] dimensions) {
-		Performance performance= Performance.getDefault();
-		performance.tagAsSummary(fPerformanceMeter, shortName, dimensions);
-	}
-	
-	/**
-	 * Called from within a test case immediately before the code to measure is run.
-	 * It starts capturing of performance data.
-	 * Must be followed by a call to {@link PerformanceTestCase#stopMeasuring()} before subsequent calls
-	 * to this method or {@link PerformanceTestCase#commitMeasurements()}.
-	 */
-	protected void startMeasuring() {
-		fPerformanceMeter.start();
-	}
-	
-	protected void stopMeasuring() {
-		fPerformanceMeter.stop();
-	}
-	
-	protected void commitMeasurements() {
-		fPerformanceMeter.commit(); 
-	}
-
-	/**
-	 * Asserts default properties of the measurements captured for this test case.
-	 * 
-	 * @throws RuntimeException if the properties do not hold
-	 */
-	protected void assertPerformance() {
-		Performance.getDefault().assertPerformance(fPerformanceMeter);
-	}
-
-	/**
-	 * Asserts that the measurement specified by the given dimension
-	 * is within a certain range with respect to some reference value.
-	 * If the specified dimension isn't available, the call has no effect.
-	 * 
-	 * @param dim the Dimension to check
-	 * @param lowerPercentage a negative number indicating the percentage the measured value is allowed to be smaller than some reference value
-	 * @param upperPercentage a positive number indicating the percentage the measured value is allowed to be greater than some reference value
-	 * @throws RuntimeException if the properties do not hold
-	 */
-	protected void assertPerformanceInRelativeBand(Dimension dim, int lowerPercentage, int upperPercentage) {
-		Performance.getDefault().assertPerformanceInRelativeBand(fPerformanceMeter, dim, lowerPercentage, upperPercentage);
-	}
-    
-    /**
-     * Sets a comment to explain performance degradation.
-     * @param comment the explanation for a performance degradation.
-     */
-    protected void setComment(String comment) {
-        Performance performance = Performance.getDefault();
-        performance.setComment(fPerformanceMeter, Performance.EXPLAINS_DEGRADATION_COMMENT, comment);
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
deleted file mode 100644
index 3dce0e6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ /dev/null
@@ -1,921 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPatternBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaTargetPatternBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.debug.eval.EvaluationManager;
-import org.eclipse.jdt.debug.eval.IAstEvaluationEngine;
-import org.eclipse.jdt.debug.eval.IEvaluationListener;
-import org.eclipse.jdt.debug.eval.IEvaluationResult;
-import org.eclipse.jdt.debug.testplugin.DebugElementEventWaiter;
-import org.eclipse.jdt.debug.testplugin.DebugElementKindEventDetailWaiter;
-import org.eclipse.jdt.debug.testplugin.DebugElementKindEventWaiter;
-import org.eclipse.jdt.debug.testplugin.DebugEventWaiter;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IHyperlink;
-import org.eclipse.ui.console.TextConsole;
-import org.eclipse.ui.internal.console.ConsoleHyperlinkPosition;
-
-
- 
-/**
- * Tests for launch configurations
- */
-public abstract class AbstractDebugTest extends TestCase implements  IEvaluationListener {
-	
-	public static final int DEFAULT_TIMEOUT = 30000;
-	
-	public IEvaluationResult fEvaluationResult;
-	
-	public static IJavaProject fJavaProject;
-	
-	/**
-	 * The last relevent event set - for example, that caused
-	 * a thread to suspend
-	 */
-	protected DebugEvent[] fEventSet;
-	
-	public AbstractDebugTest(String name) {
-		super(name);
-		// set error dialog to non-blocking to avoid hanging the UI during test
-		ErrorDialog.AUTOMATED_MODE = true;
-		SafeRunnable.setIgnoreErrors(true);
-		if (!(this.getClass() == ProjectCreationDecorator.class) && !getJavaProject().exists()) {
-			new TestSuite(ProjectCreationDecorator.class).run(new TestResult());
-		}
-	}
-	
-	/**
-	 * Sets the last relevant event set
-	 *
-	 * @param set event set
-	 */
-	protected void setEventSet(DebugEvent[] set) {
-		fEventSet = set;
-	}
-	
-	/**
-	 * Returns the last relevant event set
-	 * 
-	 * @return event set
-	 */
-	protected DebugEvent[] getEventSet() {
-		return fEventSet;
-	}
-	
-	/**
-	 * Returns the launch manager
-	 * 
-	 * @return launch manager
-	 */
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Returns the breakpoint manager
-	 * 
-	 * @return breakpoint manager
-	 */
-	protected IBreakpointManager getBreakpointManager() {
-		return DebugPlugin.getDefault().getBreakpointManager();
-	}	
-	
-	/**
-	 * Returns the 'DebugTests' project.
-	 * 
-	 * @return the test project
-	 */
-	protected IJavaProject getJavaProject() {
-		return getJavaProject("DebugTests");
-	}
-	
-	/**
-	 * Returns the Java project with the given name.
-	 * 
-	 * @param name project name
-	 * @return the Java project with the given name
-	 */
-	protected IJavaProject getJavaProject(String name) {
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		return JavaCore.create(project);
-	}
-	
-	/**
-	 * Returns the source folder with the given name in the given project.
-	 * 
-	 * @param project
-	 * @param name source folder name
-	 * @return package fragment root
-	 */
-	protected IPackageFragmentRoot getPackageFragmentRoot(IJavaProject project, String name) {
-		IProject p = project.getProject();
-		return project.getPackageFragmentRoot(p.getFolder(name));
-	}
-	
-	protected IHyperlink getHyperlink(int offset, IDocument doc) {
-		if (offset >= 0 && doc != null) {
-			Position[] positions = null;
-			try {
-				positions = doc.getPositions(ConsoleHyperlinkPosition.HYPER_LINK_CATEGORY);
-			} catch (BadPositionCategoryException ex) {
-				// no links have been added
-				return null;
-			}
-			for (int i = 0; i < positions.length; i++) {
-				Position position = positions[i];
-				if (offset >= position.getOffset() && offset <= (position.getOffset() + position.getLength())) {
-					return ((ConsoleHyperlinkPosition)position).getHyperLink();
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Launches the given configuration and waits for an event. Returns the
-	 * source of the event. If the event is not received, the launch is
-	 * terminated and an exception is thrown.
-	 * 
-	 * @param configuration the configuration to launch
-	 * @param waiter the event waiter to use
-	 * @return Object the source of the event
-	 * @exception Exception if the event is never received.
-	 */
-	protected Object launchAndWait(ILaunchConfiguration configuration, DebugEventWaiter waiter) throws CoreException {
-	    return launchAndWait(configuration, waiter, true);
-	}
-	
-	/**
-	 * Launches the given configuration and waits for an event. Returns the
-	 * source of the event. If the event is not received, the launch is
-	 * terminated and an exception is thrown.
-	 * 
-	 * @param configuration the configuration to launch
-	 * @param waiter the event waiter to use
-	 * @param register whether to register the launch
-	 * @return Object the source of the event
-	 * @exception Exception if the event is never received.
-	 */
-	protected Object launchAndWait(ILaunchConfiguration configuration, DebugEventWaiter waiter, boolean register) throws CoreException {
-		ILaunch launch = configuration.launch(ILaunchManager.DEBUG_MODE, null, false, register);
-		Object suspendee= waiter.waitForEvent();
-		if (suspendee == null) {
-            System.out.println();
-            System.out.println("Test case: " + this.getName());
-            System.out.println("Never received event: " + waiter.getEventKindName());
-            if (launch.isTerminated()) {
-                System.out.println("Process exit value: " + launch.getProcesses()[0].getExitValue());
-            }
-            IConsole console = DebugUITools.getConsole(launch.getProcesses()[0]);
-            if (console instanceof TextConsole) {
-                TextConsole textConsole = (TextConsole)console;
-                String string = textConsole.getDocument().get();
-                System.out.println("Console output follows:");
-                System.out.println(string);
-            }
-            System.out.println();
-			try {
-				launch.terminate();
-			} catch (CoreException e) {
-				e.printStackTrace();
-				fail("Program did not suspend, and unable to terminate launch.");
-			}
-		}
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend, launch terminated.", suspendee);
-		return suspendee;		
-	}	
-	
-	/**
-	 * Launches the type with the given name, and waits for a
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param mainTypeName the program to launch
-	 * @return thread in which the first suspend event occurred
-	 */
-	protected IJavaThread launchAndSuspend(String mainTypeName) throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration(mainTypeName);
-		assertNotNull("Could not locate launch configuration for " + mainTypeName, config);
-		return launchAndSuspend(config);
-	}
-
-	/**
-	 * Launches the given configuration in debug mode, and waits for a 
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param config the configuration to launch
-	 * @return thread in which the first suspend event occurred
-	 */	
-	protected IJavaThread launchAndSuspend(ILaunchConfiguration config) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		Object suspendee = launchAndWait(config, waiter);
-		return (IJavaThread)suspendee;		
-	}
-	
-	/**
-	 * Launches the type with the given name, and waits for a breakpoint-caused 
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param mainTypeName the program to launch
-	 * @return thread in which the first suspend event occurred
-	 */
-	protected IJavaThread launchToBreakpoint(String mainTypeName) throws Exception {
-		return launchToBreakpoint(mainTypeName, true);
-	}
-	
-	/**
-	 * Launches the type with the given name, and waits for a breakpoint-caused 
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param mainTypeName the program to launch
-	 * @param register whether to register the launch
-	 * @return thread in which the first suspend event occurred
-	 */
-	protected IJavaThread launchToBreakpoint(String mainTypeName, boolean register) throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration(mainTypeName);
-		assertNotNull("Could not locate launch configuration for " + mainTypeName, config);
-		return launchToBreakpoint(config, register);
-	}	
-
-	/**
-	 * Launches the given configuration in debug mode, and waits for a breakpoint-caused 
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param config the configuration to launch
-	 * @return thread in which the first suspend event occurred
-	 */	
-	protected IJavaThread launchToBreakpoint(ILaunchConfiguration config) throws CoreException {
-	    return launchToBreakpoint(config, true);
-	}
-	
-	/**
-	 * Launches the given configuration in debug mode, and waits for a breakpoint-caused 
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param config the configuration to launch
-	 * @param whether to register the launch
-	 * @return thread in which the first suspend event occurred
-	 */	
-	protected IJavaThread launchToBreakpoint(ILaunchConfiguration config, boolean register) throws CoreException {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-
-		Object suspendee= launchAndWait(config, waiter, register);
-		assertTrue("suspendee was not an IJavaThread", suspendee instanceof IJavaThread);
-		return (IJavaThread)suspendee;		
-	}	
-	
-	/**
-	 * Launches the type with the given name, and waits for a terminate
-	 * event in that program. Returns the debug target in which the suspend
-	 * event occurred.
-	 * 
-	 * @param mainTypeName the program to launch
-	 * @param timeout the number of milliseconds to wait for a terminate event
-	 * @return debug target in which the terminate event occurred
-	 */
-	protected IJavaDebugTarget launchAndTerminate(String mainTypeName) throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration(mainTypeName);
-		assertNotNull("Could not locate launch configuration for " + mainTypeName, config);
-		return launchAndTerminate(config, DEFAULT_TIMEOUT);
-	}
-
-	/**
-	 * Launches the given configuration in debug mode, and waits for a terminate
-	 * event in that program. Returns the debug target in which the terminate
-	 * event occurred.
-	 * 
-	 * @param config the configuration to launch
-	 * @param timeout the number of milliseconds to wait for a terminate event
-	 * @return thread in which the first suspend event occurred
-	 */	
-	protected IJavaDebugTarget launchAndTerminate(ILaunchConfiguration config, int timeout) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.TERMINATE, IJavaDebugTarget.class);
-		waiter.setTimeout(timeout);
-
-		Object terminatee = launchAndWait(config, waiter);		
-		assertNotNull("Program did not terminate.", terminatee);
-		assertTrue("terminatee is not an IJavaDebugTarget", terminatee instanceof IJavaDebugTarget);
-		IJavaDebugTarget debugTarget = (IJavaDebugTarget) terminatee;
-		assertTrue("debug target is not terminated", debugTarget.isTerminated() || debugTarget.isDisconnected());
-		return debugTarget;		
-	}
-	
-	/**
-	 * Launches the type with the given name, and waits for a line breakpoint suspend
-	 * event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param mainTypeName the program to launch
-	 * @param bp the breakpoint that should cause a suspend event
-	 * @return thread in which the first suspend event occurred
-	 */
-	protected IJavaThread launchToLineBreakpoint(String mainTypeName, ILineBreakpoint bp) throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration(mainTypeName);
-		assertNotNull("Could not locate launch configuration for " + mainTypeName, config);
-		return launchToLineBreakpoint(config, bp);
-	}
-
-	/**
-	 * Launches the given configuration in debug mode, and waits for a line breakpoint 
-	 * suspend event in that program. Returns the thread in which the suspend
-	 * event occurred.
-	 * 
-	 * @param config the configuration to launch
-	 * @param bp the breakpoint that should cause a suspend event
-	 * @return thread in which the first suspend event occurred
-	 */	
-	protected IJavaThread launchToLineBreakpoint(ILaunchConfiguration config, ILineBreakpoint bp) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-
-		Object suspendee= launchAndWait(config, waiter);
-		assertTrue("suspendee was not an IJavaThread", suspendee instanceof IJavaThread);
-		IJavaThread thread = (IJavaThread) suspendee;
-		IBreakpoint hit = getBreakpoint(thread);
-		assertNotNull("suspended, but not by breakpoint", hit);
-		assertTrue("hit un-registered breakpoint", bp.equals(hit));
-		assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-		ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-		int lineNumber = breakpoint.getLineNumber();
-		int stackLine = thread.getTopStackFrame().getLineNumber();
-		assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-		
-		return thread;		
-	}
-	
-	/**
-	 * Resumes the given thread, and waits for another breakpoint-caused suspend event.
-	 * Returns the thread in which the suspend event occurs.
-	 * 
-	 * @param thread thread to resume
-	 * @return thread in which the first suspend event occurs
-	 */
-	protected IJavaThread resume(IJavaThread thread) throws Exception {
-	    return resume(thread, DEFAULT_TIMEOUT);
-	}	
-	
-	/**
-	 * Resumes the given thread, and waits for another breakpoint-caused suspend event.
-	 * Returns the thread in which the suspend event occurs.
-	 * 
-	 * @param thread thread to resume
-	 * @param timeout timeout in ms
-	 * @return thread in which the first suspend event occurs
-	 */
-	protected IJavaThread resume(IJavaThread thread, int timeout) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
-		waiter.setTimeout(timeout);
-		
-		thread.resume();
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread)suspendee;
-	}	
-	
-	/**
-	 * Resumes the given thread, and waits for a suspend event caused by the specified
-	 * line breakpoint.  Returns the thread in which the suspend event occurs.
-	 * 
-	 * @param thread thread to resume
-	 * @return thread in which the first suspend event occurs
-	 */
-	protected IJavaThread resumeToLineBreakpoint(IJavaThread resumeThread, ILineBreakpoint bp) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		resumeThread.resume();
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		assertTrue("suspendee was not an IJavaThread", suspendee instanceof IJavaThread);
-		IJavaThread thread = (IJavaThread) suspendee;
-		IBreakpoint hit = getBreakpoint(thread);
-		assertNotNull("suspended, but not by breakpoint", hit);
-		assertTrue("hit un-registered breakpoint", bp.equals(hit));
-		assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-		ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-		int lineNumber = breakpoint.getLineNumber();
-		int stackLine = thread.getTopStackFrame().getLineNumber();
-		assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-		
-		return (IJavaThread)suspendee;
-	}	
-	
-	/**
-	 * Resumes the given thread, and waits for the debug target
-	 * to terminate (i.e. finish/exit the program).
-	 * 
-	 * @param thread thread to resume
-	 */
-	protected void exit(IJavaThread thread) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.TERMINATE, IProcess.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		thread.resume();
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not terminate.", suspendee);
-	}	
-		
-	/**
-	 * Resumes the given thread, and waits the associated debug
-	 * target to terminate.
-	 * 
-	 * @param thread thread to resume
-	 * @return the terminated debug target
-	 */
-	protected IJavaDebugTarget resumeAndExit(IJavaThread thread) throws Exception {
-		DebugEventWaiter waiter= new DebugElementEventWaiter(DebugEvent.TERMINATE, thread.getDebugTarget());
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		thread.resume();
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not terminate.", suspendee);
-		IJavaDebugTarget target = (IJavaDebugTarget)suspendee;
-		assertTrue("program should have exited", target.isTerminated() || target.isDisconnected());
-		return target;
-	}	
-		
-	/**
-	 * Returns the launch configuration for the given main type
-	 * 
-	 * @param mainTypeName program to launch
-	 * @see ProjectCreationDecorator
-	 */
-	protected ILaunchConfiguration getLaunchConfiguration(String mainTypeName) {
-		IFile file = getJavaProject().getProject().getFolder("launchConfigurations").getFile(mainTypeName + ".launch");
-		ILaunchConfiguration config = getLaunchManager().getLaunchConfiguration(file);
-		assertTrue("Could not find launch configuration for " + mainTypeName, config.exists());
-		return config;
-	}
-	
-	protected IResource getBreakpointResource(String typeName) throws Exception {
-		IJavaElement element = getJavaProject().findElement(new Path(typeName + ".java"));
-		IResource resource = element.getCorrespondingResource();
-		if (resource == null) {
-			resource = getJavaProject().getProject();
-		}		
-		return resource;
-	}
-	
-	/**
-	 * Creates and returns a line breakpoint at the given line number in the type with the
-	 * given name.
-	 * 
-	 * @param lineNumber line number
-	 * @param typeName type name
-	 */
-	protected IJavaLineBreakpoint createLineBreakpoint(int lineNumber, String typeName) throws Exception {
-		return JDIDebugModel.createLineBreakpoint(getBreakpointResource(typeName), typeName, lineNumber, -1, -1, 0, true, null);
-	}
-	
-	/**
-	 * Creates and returns a line breakpoint at the given line number in the type with the
-	 * given name and sets the specified condition on the breakpoint.
-	 * 
-	 * @param lineNumber line number
-	 * @param typeName type name
-	 * @param condition condition
-	 */
-	protected IJavaLineBreakpoint createConditionalLineBreakpoint(int lineNumber, String typeName, String condition, boolean suspendOnTrue) throws Exception {
-		IJavaLineBreakpoint bp = JDIDebugModel.createLineBreakpoint(getBreakpointResource(typeName), typeName, lineNumber, -1, -1, 0, true, null);
-		bp.setCondition(condition);
-		bp.setConditionEnabled(true);
-		bp.setConditionSuspendOnTrue(suspendOnTrue);
-		return bp;
-	}
-	
-	/**
-	 * Creates and returns a pattern breakpoint at the given line number in the
-	 * source file with the given name.
-	 * 
-	 * @param lineNumber line number
-	 * @param sourceName name of source file
-	 * @param pattern the pattern of the class file name
-	 */
-	protected IJavaPatternBreakpoint createPatternBreakpoint(int lineNumber, String sourceName, String pattern) throws Exception {
-		return JDIDebugModel.createPatternBreakpoint(getJavaProject().getProject(), sourceName, pattern, lineNumber, -1, -1, 0, true, null);
-	}
-	
-	/**
-	 * Creates and returns a target pattern breakpoint at the given line number in the
-	 * source file with the given name.
-	 * 
-	 * @param lineNumber line number
-	 * @param sourceName name of source file
-	 */
-	protected IJavaTargetPatternBreakpoint createTargetPatternBreakpoint(int lineNumber, String sourceName) throws Exception {
-		return JDIDebugModel.createTargetPatternBreakpoint(getJavaProject().getProject(), sourceName, lineNumber, -1, -1, 0, true, null);
-	}	
-	
-	/**
-	 * Creates and returns a stratum breakpoint at the given line number in the
-	 * source file with the given name.
-	 * 
-	 * @param lineNumber line number
-	 * @param sourceName name of source file
-	 * @param stratum the stratum of the source file
-	 */
-	protected IJavaStratumLineBreakpoint createStratumBreakpoint(int lineNumber, String sourceName, String stratum) throws Exception {
-		return JDIDebugModel.createStratumBreakpoint(getJavaProject().getProject(), stratum, sourceName, null, null, lineNumber, -1, -1, 0, true, null);
-	}
-	
-	/**
-	 * Creates and returns a method breakpoint
-	 * 
-	 * @param typeNamePattern type name pattern
-	 * @param methodName method name
-	 * @param methodSignature method signature
-	 * @param entry whether to break on entry
-	 * @param exit whether to break on exit
-	 */
-	protected IJavaMethodBreakpoint createMethodBreakpoint(String typeNamePattern, String methodName, String methodSignature, boolean entry, boolean exit) throws Exception {
-		return JDIDebugModel.createMethodBreakpoint(getJavaProject().getProject(), typeNamePattern, methodName, methodSignature, entry, exit,false, -1, -1, -1, 0, true, null);
-	}	
-	
-	/**
-	 * Creates and returns an exception breakpoint
-	 * 
-	 * @param exName exception name
-	 * @param caught whether to suspend in caught locations
-	 * @param uncaught whether to suspend in uncaught locations
-	 */	
-	protected IJavaExceptionBreakpoint createExceptionBreakpoint(String exName, boolean caught, boolean uncaught) throws Exception {
-		return JDIDebugModel.createExceptionBreakpoint(getBreakpointResource(exName),exName, caught, uncaught, false, true, null);
-	}
-	
-	/**
-	 * Creates and returns a watchpoint
-	 * 
-	 * @param typeNmae type name
-	 * @param fieldName field name
-	 * @param access whether to suspend on field access
-	 * @param modification whether to suspend on field modification
-	 */	
-	protected IJavaWatchpoint createWatchpoint(String typeName, String fieldName, boolean access, boolean modification) throws Exception {
-		IJavaWatchpoint wp = JDIDebugModel.createWatchpoint(getBreakpointResource(typeName), typeName, fieldName, -1, -1, -1, 0, true, null);
-		wp.setAccess(access);
-		wp.setModification(modification);
-		return wp;
-	}
-		
-	/**
-	 * Terminates the given thread and removes its launch
-	 */
-	protected void terminateAndRemove(IJavaThread thread) {
-		if (thread != null) {
-			terminateAndRemove((IJavaDebugTarget)thread.getDebugTarget());
-		}
-	}
-	
-	/**
-	 * Terminates the given debug target and removes its launch.
-	 * 
-	 * NOTE: all breakpoints are removed, all threads are resumed, and then
-	 * the target is terminated. This avoids defunct processes on linux.
-	 */
-	protected void terminateAndRemove(IJavaDebugTarget debugTarget) {
-	    ILaunch launch = debugTarget.getLaunch();
-		if (debugTarget != null && !(debugTarget.isTerminated() || debugTarget.isDisconnected())) {
-			IPreferenceStore jdiUIPreferences = JDIDebugUIPlugin.getDefault().getPreferenceStore();
-			jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-			
-			DebugEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.TERMINATE, debugTarget);
-			try {
-				removeAllBreakpoints();
-				IThread[] threads = debugTarget.getThreads();
-				for (int i = 0; i < threads.length; i++) {
-					IThread thread = threads[i];
-					try {
-						if (thread.isSuspended()) {
-							thread.resume();
-						}
-					} catch (CoreException e) {
-					}
-				}
-				debugTarget.getDebugTarget().terminate();
-				waiter.waitForEvent();
-			} catch (CoreException e) {
-			}
-		}
-		getLaunchManager().removeLaunch(launch);
-        // ensure event queue is flushed
-        DebugEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.MODEL_SPECIFIC, this);
-        DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[]{new DebugEvent(this, DebugEvent.MODEL_SPECIFIC)});
-        waiter.waitForEvent();
-	}
-	
-	/**
-	 * Deletes all existing breakpoints
-	 */
-	protected void removeAllBreakpoints() {
-		IBreakpoint[] bps = getBreakpointManager().getBreakpoints();
-		try {
-			getBreakpointManager().removeBreakpoints(bps, true);
-		} catch (CoreException e) {
-		}
-	}
-	
-	/**
-	 * Returns the first breakpoint the given thread is suspended
-	 * at, or <code>null</code> if none.
-	 * 
-	 * @return the first breakpoint the given thread is suspended
-	 * at, or <code>null</code> if none
-	 */
-	protected IBreakpoint getBreakpoint(IThread thread) {
-		IBreakpoint[] bps = thread.getBreakpoints();
-		if (bps.length > 0) {
-			return bps[0];
-		}
-		return null;
-	}
-	
-	/**
-	 * Evaluates the given snippet in the context of the given stack frame and returns
-	 * the result.
-	 * 
-	 * @param snippet code snippet
-	 * @param frame stack frame context
-	 * @return evaluation result
-	 */
-	protected IEvaluationResult evaluate(String snippet, IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		IAstEvaluationEngine engine = EvaluationManager.newAstEvaluationEngine(getJavaProject(), (IJavaDebugTarget)frame.getDebugTarget());
-		engine.evaluate(snippet, frame, this, DebugEvent.EVALUATION, true);
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		engine.dispose();
-		return fEvaluationResult;
-	}		
-	
-	/**
-	 * @see IEvaluationListener#evaluationComplete(IEvaluationResult)
-	 */
-	public void evaluationComplete(IEvaluationResult result) {
-		fEvaluationResult = result;
-	}
-	
-	/**
-	 * Performs a step over in the given stack frame and returns when complete.
-	 * 
-	 * @param frame stack frame to step in
-	 */
-	protected IJavaThread stepOver(IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.STEP_END);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		frame.stepOver();
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;
-	}
-
-	/**
-	 * Performs a step into in the given stack frame and returns when complete.
-	 * 
-	 * @param frame stack frame to step in
-	 */
-	protected IJavaThread stepInto(IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.STEP_END);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		frame.stepInto();
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;		
-	}
-	
-	/**
-	 * Performs a step return in the given stack frame and returns when complete.
-	 * 
-	 * @param frame stack frame to step return from
-	 */
-	protected IJavaThread stepReturn(IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.STEP_END);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		frame.stepReturn();
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;
-	}	
-	
-	/**
-	 * Performs a step into with filters in the given stack frame and returns when
-	 * complete.
-	 * 
-	 * @param frame stack frame to step in
-	 */
-	protected IJavaThread stepIntoWithFilters(IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		// turn filters on
-		try {
-			DebugUITools.setUseStepFilters(true);
-			frame.stepInto();
-		} finally {
-			// turn filters off
-			DebugUITools.setUseStepFilters(false);
-		}
-		
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;		
-	}	
-
-	/**
-	 * Performs a step return with filters in the given stack frame and returns when
-	 * complete.
-	 * 
-	 * @param frame stack frame to step in
-	 */
-	protected IJavaThread stepReturnWithFilters(IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		// turn filters on
-		try {
-			DebugUITools.setUseStepFilters(true);
-			frame.stepReturn();
-		} finally {
-			// turn filters off
-			DebugUITools.setUseStepFilters(false);
-		}
-		
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;		
-	}	
-	
-	/**
-	 * Performs a step over with filters in the given stack frame and returns when
-	 * complete.
-	 * 
-	 * @param frame stack frame to step in
-	 */
-	protected IJavaThread stepOverWithFilters(IJavaStackFrame frame) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		// turn filters on
-		try {
-			DebugUITools.setUseStepFilters(true);
-			frame.stepOver();
-		} finally {
-			// turn filters off
-			DebugUITools.setUseStepFilters(false);
-		}
-		
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;		
-	}
-
-	/**
-	 * Returns the compilation unit with the given name.
-	 * 
-	 * @param project the project containing the CU
-	 * @param root the name of the source folder in the project
-	 * @param pkg the name of the package (empty string for default package)
-	 * @param name the name of the CU (ex. Something.java)
-	 * @return compilation unit
-	 */
-	protected ICompilationUnit getCompilationUnit(IJavaProject project, String root, String pkg, String name) {
-		IProject p = project.getProject();
-		IResource r = p.getFolder(root);
-		return project.getPackageFragmentRoot(r).getPackageFragment(pkg).getCompilationUnit(name);
-	}
-	
-	/**
-	 * Wait for autobuild to occur
-	 */
-	public void waitForAutoBuild() {
-		try {
-			Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-		} catch (OperationCanceledException e) {
-		} catch (InterruptedException e) {
-		}
-	}	
-    
-    protected IJavaVariable findVariable(IJavaStackFrame frame, String name) throws DebugException {
-        IJavaVariable variable = frame.findVariable(name);
-        if (variable == null) {
-            // dump visible variables
-            IDebugModelPresentation presentation = DebugUIPlugin.getModelPresentation();
-            System.out.println("Could not find variable '" + name + "' in frame: " + presentation.getText(frame));
-            System.out.println("Visible variables are:");
-            IVariable[] variables = frame.getVariables();
-            for (int i = 0; i < variables.length; i++) {
-                IVariable variable2 = variables[i];
-                System.out.println("\t" + presentation.getText(variable2));
-            }
-            if (!frame.isStatic()) {
-                variables = frame.getThis().getVariables();
-                for (int i = 0; i < variables.length; i++) {
-                    IVariable variable2 = variables[i];
-                    System.out.println("\t" + presentation.getText(variable2));
-                }
-            }
-        }
-        return variable;
-    }
-	
-	protected boolean isFileSystemCaseSensitive() {
-		return Platform.OS_MACOSX.equals(Platform.getOS()) ? false : new File("a").compareTo(new File("A")) != 0; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
deleted file mode 100644
index 163fb7b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.tests.console.IOConsoleTests;
-import org.eclipse.jdt.debug.tests.core.ArchiveSourceLookupTests;
-import org.eclipse.jdt.debug.tests.core.ArgumentTests;
-import org.eclipse.jdt.debug.tests.core.ArrayTests;
-import org.eclipse.jdt.debug.tests.core.BootpathTests;
-import org.eclipse.jdt.debug.tests.core.BreakpointListenerTests;
-import org.eclipse.jdt.debug.tests.core.BreakpointLocationVerificationTests;
-import org.eclipse.jdt.debug.tests.core.ClasspathContainerTests;
-import org.eclipse.jdt.debug.tests.core.ClasspathProviderTests;
-import org.eclipse.jdt.debug.tests.core.ClasspathVariableTests;
-import org.eclipse.jdt.debug.tests.core.ConditionalBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.ConsoleInputTests;
-import org.eclipse.jdt.debug.tests.core.ConsoleTests;
-import org.eclipse.jdt.debug.tests.core.DebugEventTests;
-import org.eclipse.jdt.debug.tests.core.DefaultSourceContainerTests;
-import org.eclipse.jdt.debug.tests.core.DeferredBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.DirectorySourceContainerTests;
-import org.eclipse.jdt.debug.tests.core.DirectorySourceLookupTests;
-import org.eclipse.jdt.debug.tests.core.EnvironmentTests;
-import org.eclipse.jdt.debug.tests.core.EventSetTests;
-import org.eclipse.jdt.debug.tests.core.ExceptionBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.ExternalArchiveSourceContainerTests;
-import org.eclipse.jdt.debug.tests.core.FolderSourceContainerTests;
-import org.eclipse.jdt.debug.tests.core.HcrTests;
-import org.eclipse.jdt.debug.tests.core.HitCountBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.InstanceFilterTests;
-import org.eclipse.jdt.debug.tests.core.InstanceVariableTests;
-import org.eclipse.jdt.debug.tests.core.JavaBreakpointListenerTests;
-import org.eclipse.jdt.debug.tests.core.JavaLibraryPathTests;
-import org.eclipse.jdt.debug.tests.core.JavaProjectSourceContainerTests;
-import org.eclipse.jdt.debug.tests.core.LaunchConfigurationTests;
-import org.eclipse.jdt.debug.tests.core.LaunchDelegateTests;
-import org.eclipse.jdt.debug.tests.core.LaunchModeTests;
-import org.eclipse.jdt.debug.tests.core.LaunchTests;
-import org.eclipse.jdt.debug.tests.core.LaunchesTests;
-import org.eclipse.jdt.debug.tests.core.LineTrackerTests;
-import org.eclipse.jdt.debug.tests.core.LocalVariableTests;
-import org.eclipse.jdt.debug.tests.core.MemoryRenderingTests;
-import org.eclipse.jdt.debug.tests.core.MethodBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.MiscBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.PatternBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.PreLaunchBreakpointTest;
-import org.eclipse.jdt.debug.tests.core.ProcessTests;
-import org.eclipse.jdt.debug.tests.core.ProjectSourceContainerTests;
-import org.eclipse.jdt.debug.tests.core.RefreshTabTests;
-import org.eclipse.jdt.debug.tests.core.RunToLineTests;
-import org.eclipse.jdt.debug.tests.core.RuntimeClasspathEntryTests;
-import org.eclipse.jdt.debug.tests.core.SourceLocationTests;
-import org.eclipse.jdt.debug.tests.core.SourceLookupTests;
-import org.eclipse.jdt.debug.tests.core.StaticVariableTests;
-import org.eclipse.jdt.debug.tests.core.StepFilterTests;
-import org.eclipse.jdt.debug.tests.core.StepIntoSelectionTests;
-import org.eclipse.jdt.debug.tests.core.StratumTests;
-import org.eclipse.jdt.debug.tests.core.StringSubstitutionTests;
-import org.eclipse.jdt.debug.tests.core.SuspendVMBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.TargetPatternBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.ThreadFilterBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.TypeTests;
-import org.eclipse.jdt.debug.tests.core.VMInstallTests;
-import org.eclipse.jdt.debug.tests.core.WatchExpressionTests;
-import org.eclipse.jdt.debug.tests.core.WatchpointTests;
-import org.eclipse.jdt.debug.tests.core.WorkspaceSourceContainerTests;
-
-/**
- * Tests for integration and nightly builds.
- */
-public class AutomatedSuite extends DebugSuite {
-	
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new AutomatedSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public AutomatedSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.class));
-		
-		addTest(new TestSuite(LaunchModeTests.class));
-		addTest(new TestSuite(LaunchDelegateTests.class));
-		addTest(new TestSuite(LaunchTests.class));
-		addTest(new TestSuite(LaunchesTests.class));
-		addTest(new TestSuite(ClasspathVariableTests.class));
-		addTest(new TestSuite(DebugEventTests.class));
-		addTest(new TestSuite(ClasspathContainerTests.class));
-        addTest(new TestSuite(VMInstallTests.class));
-		addTest(new TestSuite(ArgumentTests.class));
-		addTest(new TestSuite(ConsoleTests.class));
-		addTest(new TestSuite(ConsoleInputTests.class));
-		addTest(new TestSuite(LaunchConfigurationTests.class));
-		addTest(new TestSuite(DeferredBreakpointTests.class));
-		addTest(new TestSuite(ConditionalBreakpointsTests.class));
-		addTest(new TestSuite(HitCountBreakpointsTests.class));
-		addTest(new TestSuite(ThreadFilterBreakpointsTests.class));
-		addTest(new TestSuite(SuspendVMBreakpointsTests.class));
-		addTest(new TestSuite(PreLaunchBreakpointTest.class));
-		
-		addTest(new TestSuite(StepFilterTests.class));
-
-		addTest(new TestSuite(InstanceVariableTests.class));
-		addTest(new TestSuite(LocalVariableTests.class));
-		addTest(new TestSuite(StaticVariableTests.class));
-		addTest(new TestSuite(MethodBreakpointTests.class));
-		addTest(new TestSuite(ExceptionBreakpointTests.class));
-		addTest(new TestSuite(WatchpointTests.class));
-		addTest(new TestSuite(PatternBreakpointTests.class));
-		addTest(new TestSuite(TargetPatternBreakpointTests.class));
-		addTest(new TestSuite(EventSetTests.class));
-		addTest(new TestSuite(RuntimeClasspathEntryTests.class));
-		addTest(new TestSuite(ClasspathProviderTests.class));
-		addTest(new TestSuite(SourceLocationTests.class));
-		addTest(new TestSuite(ProcessTests.class));
-		addTest(new TestSuite(BootpathTests.class));
-		addTest(new TestSuite(TypeTests.class));
-		addTest(new TestSuite(InstanceFilterTests.class));
-		addTest(new TestSuite(BreakpointListenerTests.class));
-		addTest(new TestSuite(JavaBreakpointListenerTests.class));
-		
-		addTest(new TestSuite(SourceLookupTests.class));
-		addTest(new TestSuite(FolderSourceContainerTests.class));
-		addTest(new TestSuite(DirectorySourceContainerTests.class));
-		addTest(new TestSuite(ProjectSourceContainerTests.class));
-		addTest(new TestSuite(WorkspaceSourceContainerTests.class));		
-		addTest(new TestSuite(DefaultSourceContainerTests.class));
-		addTest(new TestSuite(DirectorySourceLookupTests.class));
-		addTest(new TestSuite(ExternalArchiveSourceContainerTests.class));
-		addTest(new TestSuite(ArchiveSourceLookupTests.class));
-		addTest(new TestSuite(JavaProjectSourceContainerTests.class));
-		addTest(new TestSuite(MiscBreakpointsTests.class));
-		// removed for M5 - see bug 46991
-		//addTest(new TestSuite(WorkingDirectoryTests.class));
-		addTest(new TestSuite(StepIntoSelectionTests.class));
-		addTest(new TestSuite(StringSubstitutionTests.class));
-		addTest(new TestSuite(RefreshTabTests.class));
-		addTest(new TestSuite(WatchExpressionTests.class));
-		addTest(new TestSuite(LineTrackerTests.class));
-		addTest(new TestSuite(StratumTests.class));
-		addTest(new TestSuite(BreakpointLocationVerificationTests.class));
-		addTest(new TestSuite(ArrayTests.class));
-		addTest(new TestSuite(IOConsoleTests.class));
-		addTest(new TestSuite(RunToLineTests.class));
-		addTest(new TestSuite(MemoryRenderingTests.class));
-		addTest(new TestSuite(JavaLibraryPathTests.class));
-		addTest(new TestSuite(EnvironmentTests.class));
-		// HCR tests are last - they modify resources
-		addTest(new TestSuite(HcrTests.class));
-		
-		
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java
deleted file mode 100644
index 2589fe8..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/DebugSuite.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Debug test suite framework that runs test in a non UI thread.
- */
-public abstract class DebugSuite extends TestSuite {
-	
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean fTesting = true;
-
-
-	/**
-	 * Construct the test suite.
-	 */
-	public DebugSuite() {
-	}
-	
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 * The debug tests cannot be run in the UI thread or the event
-	 * waiter blocks the UI when a resource changes.
-	 */
-	public void run(final TestResult result) {
-		final Display display = Display.getCurrent();
-		Thread thread = null;
-		try {
-			Runnable r = new Runnable() {
-				public void run() {
-					for (Enumeration e= tests(); e.hasMoreElements(); ) {
-				  		if (result.shouldStop() )
-				  			break;
-						Test test= (Test)e.nextElement();
-						runTest(test, result);
-					}					
-					fTesting = false;
-					display.wake();
-				}
-			};
-			thread = new Thread(r);
-			thread.start();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		while (fTesting) {
-			try {
-				if (!display.readAndDispatch())
-					display.sleep();
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}			
-		}		
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
deleted file mode 100644
index 4fcb5c0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.tests.eval.ArrayAllocationTests;
-import org.eclipse.jdt.debug.tests.eval.ArrayAssignmentTests;
-import org.eclipse.jdt.debug.tests.eval.ArrayValueTests;
-import org.eclipse.jdt.debug.tests.eval.BooleanAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.BooleanOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.ByteAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.ByteOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.CharAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.CharOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.DoubleAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.DoubleOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.FieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.FloatAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.FloatOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.IntAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.IntOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.LabelTests;
-import org.eclipse.jdt.debug.tests.eval.LocalVarAssignmentTests;
-import org.eclipse.jdt.debug.tests.eval.LocalVarValueTests;
-import org.eclipse.jdt.debug.tests.eval.LongAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.LongOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.LoopTests;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_120;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_145;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_155;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_179;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_203;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_214;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_252;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_279;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_304;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_315;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_354;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_381;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_406;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_417;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_455;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_481;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_506;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_517;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_529;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_566;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_592;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_616;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_65;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_69;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_690;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_714;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_724;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_739;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_94;
-import org.eclipse.jdt.debug.tests.eval.NumericTypesCastTests;
-import org.eclipse.jdt.debug.tests.eval.QualifiedFieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.QualifiedStaticFieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.QualifiedStaticFieldValueTests2;
-import org.eclipse.jdt.debug.tests.eval.ShortAssignmentOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.ShortOperatorsTests;
-import org.eclipse.jdt.debug.tests.eval.StaticFieldValueTests;
-import org.eclipse.jdt.debug.tests.eval.StaticFieldValueTests2;
-import org.eclipse.jdt.debug.tests.eval.StringPlusAssignmentOpTests;
-import org.eclipse.jdt.debug.tests.eval.StringPlusOpTests;
-import org.eclipse.jdt.debug.tests.eval.TestsArrays;
-import org.eclipse.jdt.debug.tests.eval.TestsNestedTypes1;
-import org.eclipse.jdt.debug.tests.eval.TestsNestedTypes2;
-import org.eclipse.jdt.debug.tests.eval.TestsNumberLiteral;
-import org.eclipse.jdt.debug.tests.eval.TestsOperators1;
-import org.eclipse.jdt.debug.tests.eval.TestsOperators2;
-import org.eclipse.jdt.debug.tests.eval.TestsTypeHierarchy1;
-import org.eclipse.jdt.debug.tests.eval.TestsTypeHierarchy2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_119_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_146_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_3;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_4;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_5;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_32_6;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_68_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_68_2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_68_3;
-import org.eclipse.jdt.debug.tests.eval.VariableDeclarationTests;
-import org.eclipse.jdt.debug.tests.eval.XfixOperatorsTests;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Test all areas of the UI.
- */
-public class EvalTestSuite extends TestSuite {
-
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean fTesting = true;
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new EvalTestSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public EvalTestSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.class));
-		// Tests included in the automated suite
-		addTest(new TestSuite(TestsOperators1.class));
-		addTest(new TestSuite(TestsOperators2.class));
-		addTest(new TestSuite(TestsArrays.class));
-		addTest(new TestSuite(TestsNestedTypes1.class));
-		addTest(new TestSuite(TestsNestedTypes2.class));
-		addTest(new TestSuite(TestsTypeHierarchy1.class));
-		addTest(new TestSuite(TestsTypeHierarchy2.class));
-		
-		// Extended evaluation tests
-		addTest(new TestSuite(BooleanOperatorsTests.class));
-		addTest(new TestSuite(ByteOperatorsTests.class));
-		addTest(new TestSuite(CharOperatorsTests.class));
-		addTest(new TestSuite(ShortOperatorsTests.class));
-		addTest(new TestSuite(IntOperatorsTests.class));
-		addTest(new TestSuite(LongOperatorsTests.class));
-		addTest(new TestSuite(FloatOperatorsTests.class));
-		addTest(new TestSuite(DoubleOperatorsTests.class));
-		addTest(new TestSuite(StringPlusOpTests.class));
-
-		addTest(new TestSuite(LocalVarValueTests.class));
-		addTest(new TestSuite(LocalVarAssignmentTests.class));
-
-		addTest(new TestSuite(BooleanAssignmentOperatorsTests.class));
-		addTest(new TestSuite(ByteAssignmentOperatorsTests.class));
-		addTest(new TestSuite(CharAssignmentOperatorsTests.class));
-		addTest(new TestSuite(ShortAssignmentOperatorsTests.class));
-		addTest(new TestSuite(IntAssignmentOperatorsTests.class));
-		addTest(new TestSuite(LongAssignmentOperatorsTests.class));
-		addTest(new TestSuite(FloatAssignmentOperatorsTests.class));
-		addTest(new TestSuite(DoubleAssignmentOperatorsTests.class));
-		addTest(new TestSuite(StringPlusAssignmentOpTests.class));
-
-		addTest(new TestSuite(XfixOperatorsTests.class));
-
-		addTest(new TestSuite(NumericTypesCastTests.class));
-
-		addTest(new TestSuite(FieldValueTests.class));
-		addTest(new TestSuite(QualifiedFieldValueTests.class));
-		addTest(new TestSuite(StaticFieldValueTests.class));
-		addTest(new TestSuite(StaticFieldValueTests2.class));
-		addTest(new TestSuite(QualifiedStaticFieldValueTests.class));
-		addTest(new TestSuite(QualifiedStaticFieldValueTests2.class));
-
-		addTest(new TestSuite(ArrayAllocationTests.class));
-		addTest(new TestSuite(ArrayAssignmentTests.class));
-		addTest(new TestSuite(ArrayValueTests.class));
-
-		addTest(new TestSuite(NestedTypeFieldValue_65.class));
-		addTest(new TestSuite(NestedTypeFieldValue_69.class));
-		addTest(new TestSuite(NestedTypeFieldValue_94.class));
-		addTest(new TestSuite(NestedTypeFieldValue_120.class));
-		addTest(new TestSuite(NestedTypeFieldValue_145.class));
-		addTest(new TestSuite(NestedTypeFieldValue_155.class));
-		addTest(new TestSuite(NestedTypeFieldValue_179.class));
-		addTest(new TestSuite(NestedTypeFieldValue_203.class));
-		addTest(new TestSuite(NestedTypeFieldValue_214.class));
-		addTest(new TestSuite(NestedTypeFieldValue_252.class));
-		addTest(new TestSuite(NestedTypeFieldValue_279.class));
-		addTest(new TestSuite(NestedTypeFieldValue_304.class));
-		addTest(new TestSuite(NestedTypeFieldValue_315.class));
-		addTest(new TestSuite(NestedTypeFieldValue_354.class));
-		addTest(new TestSuite(NestedTypeFieldValue_381.class));
-		addTest(new TestSuite(NestedTypeFieldValue_406.class));
-		addTest(new TestSuite(NestedTypeFieldValue_417.class));
-		addTest(new TestSuite(NestedTypeFieldValue_455.class));
-		addTest(new TestSuite(NestedTypeFieldValue_481.class));
-		addTest(new TestSuite(NestedTypeFieldValue_506.class));
-		addTest(new TestSuite(NestedTypeFieldValue_517.class));
-		addTest(new TestSuite(NestedTypeFieldValue_529.class));
-		addTest(new TestSuite(NestedTypeFieldValue_566.class));
-		addTest(new TestSuite(NestedTypeFieldValue_592.class));
-		addTest(new TestSuite(NestedTypeFieldValue_616.class));
-//		addTest(new TestSuite(NestedTypeFieldValue_626.class));
-//		addTest(new TestSuite(NestedTypeFieldValue_664.class));
-		addTest(new TestSuite(NestedTypeFieldValue_690.class));
-		addTest(new TestSuite(NestedTypeFieldValue_714.class));
-		addTest(new TestSuite(NestedTypeFieldValue_724.class));
-		addTest(new TestSuite(NestedTypeFieldValue_739.class));
-
-		addTest(new TestSuite(TypeHierarchy_32_1.class));
-		addTest(new TestSuite(TypeHierarchy_32_2.class));
-		addTest(new TestSuite(TypeHierarchy_32_3.class));
-		addTest(new TestSuite(TypeHierarchy_32_4.class));
-		addTest(new TestSuite(TypeHierarchy_32_5.class));
-		addTest(new TestSuite(TypeHierarchy_32_6.class));
-		addTest(new TestSuite(TypeHierarchy_68_1.class));
-		addTest(new TestSuite(TypeHierarchy_68_2.class));
-		addTest(new TestSuite(TypeHierarchy_68_3.class));
-		addTest(new TestSuite(TypeHierarchy_119_1.class));
-		addTest(new TestSuite(TypeHierarchy_146_1.class));
-		
-		addTest(new TestSuite(TestsNumberLiteral.class));
-
-		addTest(new TestSuite(VariableDeclarationTests.class));
-		addTest(new TestSuite(LoopTests.class));
-		addTest(new TestSuite(LabelTests.class));
-		
-
-	}
-	
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 * The debug tests cannot be run in the UI thread or the event
-	 * waiter blocks the UI when a resource changes.
-	 */
-	public void run(final TestResult result) {
-		final Display display = Display.getCurrent();
-		Thread thread = null;
-		try {
-			Runnable r = new Runnable() {
-				public void run() {
-					for (Enumeration e= tests(); e.hasMoreElements(); ) {
-				  		if (result.shouldStop() )
-				  			break;
-						runTest((Test)e.nextElement(), result);
-					}					
-					fTesting = false;
-					display.wake();
-				}
-			};
-			thread = new Thread(r);
-			thread.start();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		while (fTesting) {
-			try {
-				if (!display.readAndDispatch())
-					display.sleep();
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}			
-		}		
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java
deleted file mode 100644
index 11a975c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ManualSuite.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.tests.core.RemoteAttachTests;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Tests that are to be run manually by the debug team, in addition to
- * automated tests.
- */
-public class ManualSuite extends TestSuite {
-	
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean fTesting = true;
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new ManualSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public ManualSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.class));
-		
-		addTest(new TestSuite(RemoteAttachTests.class));
-
-	}
-	
-	/**
-	 * Runs the tests and collects their result in a TestResult.
-	 * The debug tests cannot be run in the UI thread or the event
-	 * waiter blocks the UI when a resource changes.
-	 */
-	public void run(final TestResult result) {
-		final Display display = Display.getCurrent();
-		Thread thread = null;
-		try {
-			Runnable r = new Runnable() {
-				public void run() {
-					for (Enumeration e= tests(); e.hasMoreElements(); ) {
-				  		if (result.shouldStop() )
-				  			break;
-						Test test= (Test)e.nextElement();
-						runTest(test, result);
-					}					
-					fTesting = false;
-					display.wake();
-				}
-			};
-			thread = new Thread(r);
-			thread.start();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-				
-		while (fTesting) {
-			try {
-				if (!display.readAndDispatch())
-					display.sleep();
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}			
-		}		
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java
deleted file mode 100644
index 335902a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.tests.performance.PerfBreakpointTests;
-import org.eclipse.jdt.debug.tests.performance.PerfConditionalBreakpointsTests;
-import org.eclipse.jdt.debug.tests.performance.PerfConsoleTests;
-import org.eclipse.jdt.debug.tests.performance.PerfContextualLaunchMenu;
-import org.eclipse.jdt.debug.tests.performance.PerfSteppingTests;
-import org.eclipse.jdt.debug.tests.performance.PerfVariableDetailTests;
-
-/**
- * Tests for integration and nightly builds.
- */
-public class PerformanceSuite extends DebugSuite {
-
-    /**
-     * Returns the suite. This is required to use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new PerformanceSuite();
-    }
-
-    /**
-     * Construct the test suite.
-     */
-    public PerformanceSuite() {
-        addTest(new TestSuite(ProjectCreationDecorator.class));
-
-        addTest(new TestSuite(PerfContextualLaunchMenu.class));
-        addTest(new TestSuite(PerfBreakpointTests.class));
-        addTest(new TestSuite(PerfConditionalBreakpointsTests.class));
-        addTest(new TestSuite(PerfSteppingTests.class));
-        addTest(new TestSuite(PerfConsoleTests.class));
-        addTest(new TestSuite(PerfVariableDetailTests.class));
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
deleted file mode 100644
index a9581b2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
-import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Test to close the workbench, since debug tests do not run in the UI
- * thread.
- */
-public class ProjectCreationDecorator extends AbstractDebugTest {
-	
-	public ProjectCreationDecorator(String name) {
-		super(name);
-	}
-	
-	public void testProjectCreation() throws Exception {
-		// delete any pre-existing project
-		IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject("DebugTests");
-		if (pro.exists()) {
-			pro.delete(true, true, null);
-		}
-		// create project and import source
-		fJavaProject = JavaProjectHelper.createJavaProject("DebugTests", "bin");
-		IPackageFragmentRoot src = JavaProjectHelper.addSourceContainer(fJavaProject, "src");
-		File root = JavaTestPlugin.getDefault().getFileInPlugin(JavaProjectHelper.TEST_SRC_DIR);
-		JavaProjectHelper.importFilesFromDirectory(root, src.getPath(), null);
-		
-		// add rt.jar
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		assertNotNull("No default JRE", vm);
-		JavaProjectHelper.addVariableEntry(fJavaProject, new Path(JavaRuntime.JRELIB_VARIABLE), new Path(JavaRuntime.JRESRC_VARIABLE), new Path(JavaRuntime.JRESRCROOT_VARIABLE));
-		
-		pro = fJavaProject.getProject();
-		
-		//add A.jar
-		root = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testjars"));
-		JavaProjectHelper.importFilesFromDirectory(root, src.getPath(), null);
-		IPath path = src.getPath().append("A.jar");
-		JavaProjectHelper.addLibrary(fJavaProject, path);
-		
-		// create launch configuration folder
-		
-		IFolder folder = pro.getFolder("launchConfigurations");
-		if (folder.exists()) {
-			folder.delete(true,null);
-		}
-		folder.create(true, true, null);
-		
-		// delete any existing launch configs
-		ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			configs[i].delete();
-		}
-		
-		// create launch configurations
-        createLaunchConfiguration("LargeSourceFile");
-        createLaunchConfiguration("LotsOfFields");
-		createLaunchConfiguration("Breakpoints");
-		createLaunchConfiguration("InstanceVariablesTests");
-		createLaunchConfiguration("LocalVariablesTests");
-		createLaunchConfiguration("StaticVariablesTests");
-		createLaunchConfiguration("DropTests");
-		createLaunchConfiguration("ThrowsNPE");
-		createLaunchConfiguration("org.eclipse.debug.tests.targets.Watchpoint");
-		createLaunchConfiguration("A");
-		createLaunchConfiguration("HitCountLooper");
-		createLaunchConfiguration("CompileError");
-		createLaunchConfiguration("MultiThreadedLoop");
-		createLaunchConfiguration("HitCountException");
-		createLaunchConfiguration("MultiThreadedException");
-		createLaunchConfiguration("MultiThreadedList");
-		createLaunchConfiguration("MethodLoop");
-		createLaunchConfiguration("StepFilterOne");
-				
-		createLaunchConfiguration("EvalArrayTests");
-		createLaunchConfiguration("EvalSimpleTests");
-		createLaunchConfiguration("EvalTypeTests");
-		createLaunchConfiguration("EvalNestedTypeTests");
-		createLaunchConfiguration("EvalTypeHierarchyTests");
-		createLaunchConfiguration("WorkingDirectoryTest");
-		createLaunchConfiguration("OneToTen");
-		createLaunchConfiguration("OneToTenPrint");
-		createLaunchConfiguration("FloodConsole");
-		createLaunchConfiguration("ConditionalStepReturn");	
-		createLaunchConfiguration("VariableChanges");		
-		createLaunchConfiguration("DefPkgReturnType");
-		createLaunchConfiguration("InstanceFilterObject");
-		createLaunchConfiguration("org.eclipse.debug.tests.targets.CallStack");
-		createLaunchConfiguration("org.eclipse.debug.tests.targets.HcrClass");
-		createLaunchConfiguration("org.eclipse.debug.tests.targets.StepIntoSelectionClass");
-		createLaunchConfiguration("WatchItemTests");
-		createLaunchConfiguration("ArrayTests");
-		createLaunchConfiguration("PerfLoop");
-		createLaunchConfiguration("Console80Chars");
-		createLaunchConfiguration("ConsoleStackTrace");
-		createLaunchConfiguration("ConsoleVariableLineLength");
-		createLaunchConfiguration("StackTraces");
-		createLaunchConfiguration("ConsoleInput");
-		createLaunchConfiguration("PrintConcatenation");
-		createLaunchConfiguration("VariableDetails");  
-	}
-	
-	/**
-	 * Creates a shared launch configuration for the type with the given
-	 * name.
-	 */
-	protected void createLaunchConfiguration(String mainTypeName) throws Exception {
-		ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		ILaunchConfigurationWorkingCopy config = type.newInstance(getJavaProject().getProject().getFolder("launchConfigurations"), mainTypeName);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainTypeName);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-		// use 'java' instead of 'javaw' to launch tests (javaw is problematic on JDK1.4.2)
-		Map map = new HashMap(1);
-		map.put(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, "java");
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, map);
-		config.doSave();
-	}
-	
-	/**
-	 * Set up preferences that need to be changed for the tests
-	 */
-	public void testSetPreferences() {
-		IPreferenceStore debugUIPreferences = DebugUIPlugin.getDefault().getPreferenceStore();
-		// Don't prompt for perspective switching
-		debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_SWITCH_PERSPECTIVE_ON_SUSPEND, MessageDialogWithToggle.ALWAYS);
-		debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_SWITCH_TO_PERSPECTIVE, MessageDialogWithToggle.ALWAYS);
-		debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE, MessageDialogWithToggle.NEVER);
-		debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_WAIT_FOR_BUILD, MessageDialogWithToggle.ALWAYS);
-		debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_CONTINUE_WITH_COMPILE_ERROR, MessageDialogWithToggle.ALWAYS);
-        debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_SAVE_DIRTY_EDITORS_BEFORE_LAUNCH, MessageDialogWithToggle.NEVER);
-		
-		String property = System.getProperty("debug.workbenchActivation");
-		if (property != null && property.equals("off")) {
-		    debugUIPreferences.setValue(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR, false);
-		    debugUIPreferences.setValue(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT, false);
-		    debugUIPreferences.setValue(IInternalDebugUIConstants.PREF_ACTIVATE_DEBUG_VIEW, false);
-		    debugUIPreferences.setValue(IDebugUIConstants.PREF_ACTIVATE_WORKBENCH, false);
-		}
-		
-		IPreferenceStore jdiUIPreferences = JDIDebugUIPlugin.getDefault().getPreferenceStore();
-		// Turn off suspend on  uncaught exceptions
-        jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-        jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, false);
-        // Don't warn about HCR failures
-		jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED, false);
-		jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED, false);
-		jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS, false);
-		// Set the timeout preference to a high value, to avoid timeouts while testing
-		JDIDebugModel.getPreferences().setDefault(JDIDebugModel.PREF_REQUEST_TIMEOUT, 10000);
-		// turn off monitor information
-		jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_SHOW_MONITOR_THREAD_INFO, false);
-	}
-	
-	/**
-	 * Create a project with non-default, mulitple output locations.
-	 * 
-	 * @throws Exception
-	 */
-	public void testMultipleOutputProjectCreation() throws Exception {
-		// delete any pre-existing project
-		IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject("MultiOutput");
-		if (pro.exists()) {
-			pro.delete(true, true, null);
-		}
-		// create project with two src folders and output locations
-		IJavaProject project = JavaProjectHelper.createJavaProject("MultiOutput");
-		JavaProjectHelper.addSourceContainer(project, "src1", "bin1");
-		JavaProjectHelper.addSourceContainer(project, "src2", "bin2");
-		
-		// add rt.jar
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		assertNotNull("No default JRE", vm);
-		JavaProjectHelper.addVariableEntry(project, new Path(JavaRuntime.JRELIB_VARIABLE), new Path(JavaRuntime.JRESRC_VARIABLE), new Path(JavaRuntime.JRESRCROOT_VARIABLE));
-				
-	}
-	
-	public void testPerspectiveSwtich() {
-	    DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
-            public void run() {
-                IWorkbench workbench = PlatformUI.getWorkbench();
-                IPerspectiveDescriptor descriptor = workbench.getPerspectiveRegistry().findPerspectiveWithId(IDebugUIConstants.ID_DEBUG_PERSPECTIVE);
-                workbench.getActiveWorkbenchWindow().getActivePage().setPerspective(descriptor);
-            }
-        }
-	    );
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArchiveSourceLookupTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArchiveSourceLookupTests.java
deleted file mode 100644
index 637748b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArchiveSourceLookupTests.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.sourcelookup.ArchiveSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.ZipEntryStorage;
-
-/**
- * Tests source lookup in archives
- */
-public class ArchiveSourceLookupTests extends AbstractDebugTest {
-	
-	public ArchiveSourceLookupTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Tests source lookup in a top level type, in the default package.
-	 */
-	public void testDefTopLevelType() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("Breakpoints");
-		assertEquals("Did not find source", "Breakpoints.java", storage.getName());
-	}
-	
-	/**
-	 * Tests source lookup in an inner type, the default package.
-	 */
-	public void testDefInnerType() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("Breakpoints$InnerRunnable");
-		assertEquals("Did not find source", "Breakpoints.java", storage.getName());
-	}
-	
-	
-	/**
-	 * Tests source lookup in a top level type.
-	 */
-	public void testTopLevelType() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup");
-		assertEquals("Did not find source", "SourceLookup.java", storage.getName());		
-	}
-	
-	/**
-	 * Tests source lookup in an inner type.
-	 */
-	public void testInnerType() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup$Inner");
-		assertEquals("Did not find source", "SourceLookup.java", storage.getName());
-	}
-	
-	/**
-	 * Tests source lookup in an inner, inner type.
-	 */
-	public void testNestedType() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup$Inner$Nested");
-		assertEquals("Did not find source", "SourceLookup.java", storage.getName());
-	}
-		
-	/**
-	 * Tests source lookup in a top level type, with a $ named class
-	 */
-	public void testTopLevel$Type() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup");
-		assertEquals("Did not find source", "Source_$_Lookup.java", storage.getName());
-	}
-	
-	/**
-	 * Tests source lookup in an inner type in a $ named class.
-	 */
-	public void testInner$Type() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup$Inner");
-		assertEquals("Did not find source", "Source_$_Lookup.java", storage.getName());
-	}	
-	
-	/**
-	 * Tests source lookup in an inner type in a $ named class.
-	 */
-	public void testInnerNested$Type() throws Exception {
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testresources/testJarWithOutRoot.jar"));
-		ArchiveSourceLocation location = new ArchiveSourceLocation(file.getAbsolutePath(), null);
-				
-		ZipEntryStorage storage = (ZipEntryStorage) location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup$Inner$Nested");
-		assertEquals("Did not find source", "Source_$_Lookup.java", storage.getName());
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java
deleted file mode 100644
index 0b30ed0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArgumentTests.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jdt.debug.testplugin.ConsoleLineTracker;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Tests for program and VM arguments
- */
-public class ArgumentTests extends AbstractDebugTest {
-    
-    private Object fLock = new Object();
-
-	private class ConsoleArgumentOutputRetriever implements IConsoleLineTrackerExtension {
-
-		StringBuffer buffer;
-		IDocument document;
-		boolean closed = false;
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-		 */
-		public void init(IConsole console) {
-			buffer = new StringBuffer();
-			document = console.getDocument();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-		 */
-		public void lineAppended(IRegion line) {
-			try {
-                assertNotNull("received notification of invalid line", line);
-                assertNotNull("buffer is null", buffer); 
-                buffer.append(document.get(line.getOffset(), line.getLength()));
-			} catch (BadLocationException e) {
-				e.printStackTrace();
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
-		 */
-		public void consoleClosed() {
-			synchronized (fLock) {
-				closed = true;
-			    fLock.notifyAll();
-            }
-		}
-		
-		public String getOutput() {
-			// wait to be closed
-		    synchronized (fLock) {
-		    	if (!closed) {
-			        try {
-	                    fLock.wait(30000);
-	                } catch (InterruptedException e) {
-	                }
-		    	}
-		    }
-		    if (!closed) {
-				// output contents to console in case of error 
-				if (buffer != null) {
-				    System.out.println();
-				    System.out.println(ArgumentTests.this.getName());
-				    System.out.println("\treceived " + buffer.length() + " chars: " + buffer.toString()); 
-				}
-		    }
-		    assertNotNull("Line tracker did not receive init notification", buffer);
-		    assertTrue("Line tracker did not receive close notification", closed);
-			return buffer.toString();
-		}
-
-}
-
-	public ArgumentTests(String name) {
-		super(name);
-	}
-
-	/** 
-	 * Creates and returns a new launch config the given name
-	 */
-	protected ILaunchConfigurationWorkingCopy newConfiguration(IContainer container, String name) throws CoreException {
-		ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		return type.newInstance(container, name);
-	}
-
-	/*
-	 * VM argument tests
-	 */
-	/**
-	 * Test a single VM argument.
-	 * Program output should be: foo
-	 */
-	public void testVMArgSingle() throws CoreException {
-		testWithVMArg("-Dfoo=foo", "foo");
-	}
-	/**
-	 * Test a VM argument with quotes in a valid location.
-	 * Program output should be: foo
-	 */
-	public void testVMArgSimpleQuotes() throws CoreException {
-		testWithVMArg("-Dfoo=\"foo\"", "foo");
-	}
-	/**
-	 * Test a VM argument with the standard style quoting for arguments with
-	 * spaces.
-	 * Program output should be: foo bar
-	 */
-	public void testVMArgStandardQuotes() throws CoreException {
-		testWithVMArg("-Dfoo=\"foo bar\"", "foo bar");
-	}
-	/**
-	 * Test a VM argument with quotes in a standard location.
-	 * Program output should be: "foo"
-	 */
-	public void testVMArgStandardEmbeddedQuotes() throws CoreException {
-		testWithVMArg("-Dfoo=\"\\\"foo\\\"\"", "\"foo\"");
-	}
-	/**
-	 * Test a VM argument with the quoting style we recommended as a workaround
-	 * to a bug (now fixed) that we suggested in the past. 
-	 * Program output should be: foo bar
-	 */
-	public void testVMArgWorkaroundQuotes() throws CoreException {
-		testWithVMArg("\"-Dfoo=foo bar\"", "foo bar");
-	}
-	/**
-	 * Test a VM argument with quotes placed in a creative (non-standard, but
-	 * valid) location
-	 * Program output should be: foo bar
-	 */
-	public void testVMArgCreativeQuotes() throws CoreException {
-		testWithVMArg("-Dfoo=fo\"o b\"ar", "foo bar");
-	}
-	/**
-	 * Test a VM argument with embedded quotes.
-	 * Program output should be: "foo bar"
-	 */
-	public void testVMArgEmbeddedQuotes() throws CoreException {
-		testWithVMArg("-Dfoo=\"\\\"foo bar\\\"\"", "\"foo bar\"");
-	}
-	/**
-	 * Test a VM argument with quotes placed in a creative (non-standard, but
-	 * valid) location
-	 * Program output should be: fo"o b"ar
-	 */
-	public void testVMArgEmbeddedCreativeQuotes() throws CoreException {
-		testWithVMArg("-Dfoo=fo\"\\\"o b\\\"\"ar", "fo\"o b\"ar");
-	}
-	
-	/*
-	 * Program argument tests
-	 */
-	/**
-	 * Test a single program argument.
-	 * Program output should be: foo
-	 */
-	public void testProgramArgSingle() throws CoreException {
-		testWithProgramArg("foo", "foo");
-	}
-	/**
-	 * Test multiple program arguments.
-	 * Program output should be: foo\nbar
-	 */
-	public void testProgramArgMultiple() throws CoreException {
-		testWithProgramArg("foo bar", "foobar");
-	}
-	/**
-	 * Test a program argument with quotes in a valid location.
-	 * Program output should be: foo
-	 */
-	public void testProgramArgSimpleQuotes() throws CoreException {
-		testWithProgramArg("\"foo\"", "foo");
-	}
-	/**
-	 * Test a program argument with quotes in a standard location.
-	 * Program output should be: foo bar
-	 */
-	public void testProgramArgStandardQuotes() throws CoreException {
-		testWithProgramArg("\"foo bar\"", "foo bar");
-	}
-	/**
-	 * Test a program argument with quotes placed in a creative (non-standard,
-	 * but valid) location.
-	 * Program output should be: foo bar
-	 */
-	public void testProgramArgCreativeQuotes() throws CoreException {
-		testWithProgramArg("fo\"o b\"ar", "foo bar");
-	}
-	/**
-	 * Test a program argument with embedded quotes in a standard location.
-	 * Program output should be: "blah"
-	 */
-	public void testProgramArgEmbeddedQuotes() throws CoreException {
-		testWithProgramArg("\\\"blah\\\"", "\"blah\"");
-	}
-	/**
-	 * Test a program argument with embedded quotes in a creative (non-standard,
-	 * but valie) location.
-	 * Program output should be: f"o"o
-	 */
-	public void testProgramArgCreativeEmbeddedQuotes() throws CoreException {
-		testWithProgramArg("f\\\"o\\\"o", "f\"o\"o");
-	}
-	
-	/**
-	 * Test a program argument with one empty string
-     *
-	 * Program output should be: 1
-	 */
-	public void testProgramArgEmptyString() throws CoreException {
-		testProgramArgCount("\"\"", "1");
-	}
-	
-	/**
-	 * Test a program with an empty string among other args.
-	 * 
-	 * Program output should be: 4
-	 */
-	public void testProgramArgEmptyStringWithOthers() throws CoreException {
-		testProgramArgCount("word1 \"\" \"part1 part2\" word2", "4");
-	}
-	
-	/**
-	 * Test a program argument with one double quote. We should pass in the
-	 * empty string to match Java console behavior.
-	 * 
-	 * Program output should be: 1
-	 */
-	public void testProgramArgOneQuote() throws CoreException {
-		testProgramArgCount("\"", "1");
-	}
-	
-	/**
-	 * Runs the FooPropertyPrinter with the given VM arguments and checks for
-	 * the given output.
-	 * @param argString the VM arguments
-	 * @param argValue the expected output
-	 */
-	private void testWithVMArg(String argString, String outputValue) throws CoreException {
-		testOutput("FooPropertyPrinter", argString, null, outputValue);
-	}
-	
-	/**
-	 * Runs the ArgumentPrinter with the given program arguments
-	 * @param argString
-	 * @param outputValue
-	 * @throws CoreException
-	 */
-	private void testWithProgramArg(String argString, String outputValue) throws CoreException {
-		testOutput("ArgumentPrinter", null, argString, outputValue);
-	}
-	
-	/**
-	 * Runs the ArgumentCounter with the given program arguments
-	 * @param argString
-	 * @param outputValue
-	 * @throws CoreException
-	 */
-	private void testProgramArgCount(String argString, String outputValue) throws CoreException {
-		testOutput("ArgumentCounter", null, argString, outputValue);
-	}	
-	
-	/**
-	 * Runs the given program with the given VM arguments and the given program arguments and
-	 * asserts that the output matches the given output.
-	 * @param mainTypeName the type to execute
-	 * @param vmArgs the VM arguments to specify
-	 * @param programArgs the program arguments to specify
-	 * @param outputValue the expected output
-	 */
-	private void testOutput(String mainTypeName, String vmArgs, String programArgs, String outputValue) throws CoreException {
-		ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "config1");
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getProject().getName());
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainTypeName);
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, true);
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs);
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArgs);
-
-		// use 'java' instead of 'javaw' to launch tests (javaw is problematic on JDK1.4.2)
-		Map map = new HashMap(1);
-		map.put(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, "java");
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, map);
-		
-		ConsoleArgumentOutputRetriever retriever = new ConsoleArgumentOutputRetriever();
-		ConsoleLineTracker.setDelegate(retriever);
-		IProcess process = null;
-		ILaunch launch = null;
-		try {
-			launch = workingCopy.launch(ILaunchManager.RUN_MODE, null);
-			process = launch.getProcesses()[0];
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		try {
-			String output = retriever.getOutput();
-			// output if in error
-			if (!outputValue.equals(output)) {
-			    System.out.println();
-			    System.out.println(getName());
-				System.out.println("\tExpected: " + outputValue);
-				System.out.println("\tActual:   " + output);
-			}
-			assertEquals(outputValue, output);
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			if (process != null) {
-				process.terminate();
-			}
-			if (launch != null) {
-				getLaunchManager().removeLaunch(launch);
-			}
-		}
-	}
-	
-	public void testDefaultVMArgs() throws CoreException {
-	    IVMInstall install = JavaRuntime.getDefaultVMInstall();
-	    assertTrue("should be an IVMInstall2", install instanceof IVMInstall2);
-	    IVMInstall2 vm2 = (IVMInstall2) install;
-	    String prev = vm2.getVMArgs();
-	    vm2.setVMArgs("-Dfoo=\"one two three\"");
-	    try {
-	        testWithVMArg(null, "one two three");
-	    } finally {
-	        vm2.setVMArgs(prev);
-	    }
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArrayTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArrayTests.java
deleted file mode 100644
index 6f4a974..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ArrayTests.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaArray;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests indexed collection API
- */
-public class ArrayTests extends AbstractDebugTest {
-
-	public ArrayTests(String name) {
-		super(name);
-	}
-
-	public void testGetSize() throws Exception {
-		String typeName = "ArrayTests";
-		ILineBreakpoint bp = createLineBreakpoint(19, typeName);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
-			assertNotNull(frame);
-			IJavaVariable variable = findVariable(frame, "array");
-			assertNotNull(variable);
-			IJavaArray array = (IJavaArray) variable.getValue();
-			assertEquals("Array has wrong size", 100, array.getSize());
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}
-	
-	
-	public void testGetVariable() throws Exception {
-		String typeName = "ArrayTests";
-		ILineBreakpoint bp = createLineBreakpoint(19, typeName);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
-			assertNotNull(frame);
-			IJavaVariable v = findVariable(frame, "array");
-			assertNotNull(v);
-			IJavaArray array = (IJavaArray) v.getValue();
-			assertNotNull(array);
-			IVariable variable = array.getVariable(99);
-			assertNotNull(variable);
-			assertEquals("Wrong value", ((IJavaDebugTarget)frame.getDebugTarget()).newValue(99), variable.getValue());
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}	
-	
-	public void testGetVariableRange() throws Exception {
-		String typeName = "ArrayTests";
-		ILineBreakpoint bp = createLineBreakpoint(19, typeName);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
-			assertNotNull(frame);
-			IJavaVariable v = findVariable(frame, "array");
-			assertNotNull(v);
-			IJavaArray array = (IJavaArray) v.getValue();
-			assertNotNull(array);
-			IVariable[] variables = array.getVariables(50, 15);
-			assertNotNull(variables);
-			for (int i = 0; i < 15; i++) {
-				assertEquals("Wrong value", ((IJavaDebugTarget)frame.getDebugTarget()).newValue(50 + i), variables[i].getValue());
-			}
-			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}		
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
deleted file mode 100644
index a51f67c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Tests bootpath settings
- */
-public class BootpathTests extends AbstractDebugTest {
-	
-	public BootpathTests(String name) {
-		super(name);
-	}
-
-	public void testDefaultBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		
-		JavaLaunchDelegate delegate = new JavaLaunchDelegate();
-		String[] path = delegate.getBootpath(config);
-		assertNull("Default bootpath should be null", path);
-		String[][] pathInfo= delegate.getBootpathExt(config);
-		assertNotNull("Bootpath info shouldn't be null", pathInfo);
-		assertEquals("Wrong bootpath info array size",3, pathInfo.length);
-		assertNull("Prepend bootpath should be null", pathInfo[0]);
-		assertNull("Main bootpath should be null", pathInfo[1]);
-		assertNull("Append bootpath should be null", pathInfo[2]);
-	}
-	
-	public void testEmptyBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-		
-		JavaLaunchDelegate delegate = new JavaLaunchDelegate();
-		String[] path = delegate.getBootpath(wc);
-		assertNotNull("Empty bootpath should be empty array", path);
-		assertEquals("bootpath should be empty", 0, path.length);
-		String[][] pathInfo= delegate.getBootpathExt(config);
-		assertNotNull("Bootpath info should'nt be null", pathInfo);
-		assertEquals("Wrong bootpath info array size",3, pathInfo.length);
-		assertNull("Prepend bootpath should be null", pathInfo[0]);
-		assertNull("Main bootpath should be empty array", pathInfo[1]);
-		assertNull("Append bootpath should be null", pathInfo[2]);
-	}
-	
-	public void testPrependBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		IRuntimeClasspathEntry[] classpath = JavaRuntime.computeUnresolvedRuntimeClasspath(wc);
-		IRuntimeClasspathEntry[] newpath = new IRuntimeClasspathEntry[classpath.length + 1];
-		IResource jar = getJavaProject().getProject().getFile(new Path("src/A.jar"));
-		IRuntimeClasspathEntry pre = JavaRuntime.newArchiveRuntimeClasspathEntry(jar);
-		pre.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		newpath[0] = pre;
-		System.arraycopy(classpath, 0, newpath, 1, classpath.length);
-		List mementos = new ArrayList(newpath.length);
-		for (int i = 0; i < newpath.length; i++) {
-			IRuntimeClasspathEntry entry = newpath[i];
-			mementos.add(entry.getMemento());
-		}
-		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, mementos);
-		
-		JavaLaunchDelegate delegate = new JavaLaunchDelegate();
-		Map map = delegate.getVMSpecificAttributesMap(wc);
-		assertNotNull("Missing VM specific attributes map", map);
-		String[] prepath = (String[]) map.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND);
-		assertNotNull("Missing bootpath prepend", pre);
-		assertEquals("Incorrect number of prepends", 1, prepath.length);
-		assertEquals("wrong prepended path", jar.getLocation().toOSString(), prepath[0]);
-	}	
-		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java
deleted file mode 100644
index 1651164..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointListenerTests.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.IBreakpointListener;
-import org.eclipse.debug.core.IBreakpointsListener;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests breakpoint creation/deletion and listener interfaces.
- */
-public class BreakpointListenerTests extends AbstractDebugTest implements IBreakpointListener, IBreakpointsListener {
-	
-	public int fAddCallbacks = 0;
-	public int fTotalAdded = 0;
-	
-	public int fRemoveCallbacks = 0;
-	public int fTotalRemoved = 0;
-	
-	public int fChangeCallabcks = 0;
-	public int fTotalChanged = 0;
-		
-	public BreakpointListenerTests(String name) {
-		super(name);
-	}
-
-	protected void resetCallbacks() {
-		waitForAutoBuild();
-		fAddCallbacks = 0;
-		fTotalAdded = 0;
-	
-		fRemoveCallbacks = 0;
-		fTotalRemoved = 0;
-	
-		fChangeCallabcks = 0;
-		fTotalChanged = 0;		
-	}
-	/**
-	 * Creates sample breakpoints
-	 * 
-	 * @return List
-	 */
-	protected List createBreakpoints(String typeName) throws Exception {
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createUnregisteredLineBreakpoint(43, typeName));
-		// blocks
-		bps.add(createUnregisteredLineBreakpoint(102, typeName));
-		// constructor
-		bps.add(createUnregisteredLineBreakpoint(77, typeName));
-		// else
-		bps.add(createUnregisteredLineBreakpoint(88, typeName));
-		//finally after catch
-		bps.add(createUnregisteredLineBreakpoint(120, typeName));
-		//finally after try
-		bps.add(createUnregisteredLineBreakpoint(128, typeName));
-		// for loop
-		bps.add(createUnregisteredLineBreakpoint(93, typeName));
-		// if
-		bps.add(createUnregisteredLineBreakpoint(81, typeName));
-		// initializer
-		bps.add(createUnregisteredLineBreakpoint(17, typeName));
-		// inner class
-		bps.add(createUnregisteredLineBreakpoint(22, typeName));
-		// return true
-		bps.add(createUnregisteredLineBreakpoint(72, typeName));
-		// instance method
-		bps.add(createUnregisteredLineBreakpoint(107, typeName));
-		// static method 
-		bps.add(createUnregisteredLineBreakpoint(53, typeName));
-		// case statement
-		bps.add(createUnregisteredLineBreakpoint(133, typeName));
-		// default statement
-		bps.add(createUnregisteredLineBreakpoint(140, typeName));
-		// synchronized blocks
-		bps.add(createUnregisteredLineBreakpoint(146, typeName));
-		// try
-		bps.add(createUnregisteredLineBreakpoint(125, typeName));
-		//catch
-		bps.add(createUnregisteredLineBreakpoint(118, typeName));
-		// while
-		bps.add(createUnregisteredLineBreakpoint(97, typeName));
-		
-		return bps;
-	}
-
-	public void testSingleListener() throws Exception {		
-		List bps = createBreakpoints("Breakpoints");
-		
-		try {
-			getBreakpointManager().addBreakpointListener((IBreakpointListener)this);		
-			
-			resetCallbacks();
-			getBreakpointManager().addBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]));
-			assertEquals("Should have received individual add notifications", bps.size(), fAddCallbacks);
-			assertEquals("Number of breakpoints added incorrect", bps.size(), fTotalAdded);
-			//assertEquals("Should be change callbacks for IMarker.MESSAGE updates", bps.size(), fChangeCallabcks);
-			assertEquals("Should be no removes", 0, fRemoveCallbacks);
-			
-			resetCallbacks();
-			getBreakpointManager().removeBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]), true);
-			assertEquals("Should have received individual remove notifications", bps.size(), fRemoveCallbacks);
-			assertEquals("Should of breakpoints removed incorrect", bps.size(), fTotalRemoved);
-			assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no additions", 0, fAddCallbacks);
-			
-		} finally {
-			getBreakpointManager().removeBreakpointListener((IBreakpointListener)this);
-			removeAllBreakpoints();
-		}
-		
-	}
-	
-	public void testMultiListener() throws Exception {		
-		List bps = createBreakpoints("Breakpoints");
-		
-		try {
-			getBreakpointManager().addBreakpointListener((IBreakpointsListener)this);		
-			
-			resetCallbacks();
-			getBreakpointManager().addBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]));
-			assertEquals("Should have received one add notification", 1, fAddCallbacks);
-			assertEquals("Number of breakpoints added incorrect", bps.size(), fTotalAdded);
-			//assertEquals("Should be 1 change for IMarker.MESSAGE update", 1, fChangeCallabcks);
-			assertEquals("Should be no removes", 0, fRemoveCallbacks);
-			
-			resetCallbacks();
-			getBreakpointManager().removeBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]), true);
-			assertEquals("Should have received one remove notification", 1, fRemoveCallbacks);
-			assertEquals("Should of breakpoints removed incorrect", bps.size(), fTotalRemoved);
-			assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no additions", 0, fAddCallbacks);
-			
-		} finally {
-			getBreakpointManager().removeBreakpointListener((IBreakpointsListener)this);
-			removeAllBreakpoints();
-		}
-		
-	}	
-	
-	public void testMultiListenerProjectCloseOpen() throws Exception {		
-		List bps = createBreakpoints("Breakpoints");
-		
-		try {
-			getBreakpointManager().addBreakpointListener((IBreakpointsListener)this);		
-			
-			resetCallbacks();
-			getBreakpointManager().addBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]));
-			assertEquals("Should have received one add notification", 1, fAddCallbacks);
-			assertEquals("Number of breakpoints added incorrect", bps.size(), fTotalAdded);
-			//assertEquals("Should be 1 change for IMarker.MESSAGE update", 1, fChangeCallabcks);
-			assertEquals("Should be no removes", 0, fRemoveCallbacks);
-			
-			resetCallbacks();
-			getJavaProject().getProject().close(null);
-			waitForAutoBuild();
-			assertEquals("Should have received one remove notification", 1, fRemoveCallbacks);
-			assertEquals("Should of breakpoints removed incorrect", bps.size(), fTotalRemoved);
-			assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no additions", 0, fAddCallbacks);
-			
-			resetCallbacks();
-			getJavaProject().getProject().open(null);
-			waitForAutoBuild();
-			assertEquals("Should have received one add notification", 1, fAddCallbacks);
-			assertEquals("Number of breakpoints added incorrect", bps.size(), fTotalAdded);
-			assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no removes", 0, fRemoveCallbacks);			
-			
-		} finally {
-			getJavaProject().getProject().open(null);
-			getBreakpointManager().removeBreakpointListener((IBreakpointsListener)this);
-			removeAllBreakpoints();
-		}
-		
-	}		
-
-	public void testMultiListenerMoveCompilationUnit() throws Exception {	
-		IJavaProject project = getJavaProject();
-		ICompilationUnit cu = (ICompilationUnit)project.findElement(new Path("Breakpoints.java"));
-		assertNotNull("Did not find compilation unit", cu);
-		cu.copy(cu.getParent(), null, "BreakpointsCopyA.java", false, null);
-		waitForAutoBuild();
-		List bps = createBreakpoints("BreakpointsCopyA");
-		cu = (ICompilationUnit)project.findElement(new Path("BreakpointsCopyA.java"));
-		assertNotNull("Did not find compilation unit copy", cu);
-		
-		try {
-			getBreakpointManager().addBreakpointListener((IBreakpointsListener)this);		
-			
-			resetCallbacks();
-			getBreakpointManager().addBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]));
-			waitForAutoBuild();
-			assertEquals("Should have received one add notification", 1, fAddCallbacks);
-			assertEquals("Number of breakpoints added incorrect", bps.size(), fTotalAdded);
-			//assertEquals("Should be 1 change callback for IMarker.MESSAGE update", 1, fChangeCallabcks);
-			assertEquals("Should be no removes", 0, fRemoveCallbacks);
-			
-			resetCallbacks();
-			cu.rename("BreakpointsCopyTwoA.java", false, null);
-			waitForAutoBuild();
-			assertEquals("Should have received one remove notification", 1, fRemoveCallbacks);
-			assertEquals("Number of breakpoints removed incorrect", bps.size(), fTotalRemoved);
-			assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no additions", 0, fAddCallbacks);
-			
-			cu = (ICompilationUnit)project.findElement(new Path("BreakpointsCopyTwoA.java"));
-			assertNotNull("Did not find CU", cu);
-			cu.delete(false, null);
-			waitForAutoBuild();
-			
-		} finally {
-			getBreakpointManager().removeBreakpointListener((IBreakpointsListener)this);
-			removeAllBreakpoints();
-		}
-		
-	}		
-	
-	public void testSingleListenerMoveCompilationUnit() throws Exception {	
-		IJavaProject project = getJavaProject();
-		ICompilationUnit cu = (ICompilationUnit)project.findElement(new Path("Breakpoints.java"));
-		assertNotNull("Did not find compilation unit", cu);
-		cu.copy(cu.getParent(), null, "BreakpointsCopy.java", false, null);
-		waitForAutoBuild();
-		List bps = createBreakpoints("BreakpointsCopy");
-		cu = (ICompilationUnit)project.findElement(new Path("BreakpointsCopy.java"));
-		assertNotNull("Did not find compilation unit copy", cu);
-		
-		try {
-			getBreakpointManager().addBreakpointListener((IBreakpointListener)this);		
-			
-			resetCallbacks();
-			getBreakpointManager().addBreakpoints((IBreakpoint[])bps.toArray(new IBreakpoint[bps.size()]));
-			waitForAutoBuild();
-			assertEquals("Should have received one add notification", bps.size(), fAddCallbacks);
-			assertEquals("Number of breakpoints added incorrect", bps.size(), fTotalAdded);
-			//assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no removes", 0, fRemoveCallbacks);
-			
-			resetCallbacks();
-			cu.rename("BreakpointsCopyTwo.java", false, null);
-			waitForAutoBuild();
-			assertEquals("Incorrect number of remove notifications", bps.size(), fRemoveCallbacks);
-			assertEquals("Incorrect number of breakpoints removed", bps.size(), fTotalRemoved);
-			assertEquals("Should be no changes", 0, fChangeCallabcks);
-			assertEquals("Should be no additions", 0, fAddCallbacks);
-			
-			cu = (ICompilationUnit)project.findElement(new Path("BreakpointsCopyTwo.java"));
-			assertNotNull("Did not find CU", cu);			
-			cu.delete(false, null);
-			waitForAutoBuild();
-			
-		} finally {
-			getBreakpointManager().removeBreakpointListener((IBreakpointListener)this);
-			removeAllBreakpoints();
-		}
-		
-	}			
-
-	/**
-	 * Creates and returns a line breakpoint at the given line number in the type with the
-	 * given name, that is <b>not</b> registered with the breakpoint manager.
-	 * 
-	 * @param lineNumber line number
-	 * @param typeName type name
-	 */
-	protected IJavaLineBreakpoint createUnregisteredLineBreakpoint(int lineNumber, String typeName) throws Exception {
-		return JDIDebugModel.createLineBreakpoint(getBreakpointResource(typeName), typeName, lineNumber, -1, -1, 0, false, null);
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
-	 */
-	public void breakpointAdded(IBreakpoint breakpoint) {
-		fAddCallbacks++;
-		fTotalAdded++;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
-		fChangeCallabcks++;
-		fTotalChanged++;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
-		fRemoveCallbacks++;
-		fTotalRemoved++;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint)
-	 */
-	public void breakpointsAdded(IBreakpoint[] breakpoints) {
-		fAddCallbacks++;
-		fTotalAdded += breakpoints.length;		
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointsChanged(
-		IBreakpoint[] breakpoints,
-		IMarkerDelta[] deltas) {
-			fChangeCallabcks++;
-			fTotalChanged += breakpoints.length;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointsRemoved(
-		IBreakpoint[] breakpoints,
-		IMarkerDelta[] deltas) {
-			fRemoveCallbacks++;
-			fTotalRemoved += breakpoints.length;			
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointLocationVerificationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointLocationVerificationTests.java
deleted file mode 100644
index f95b63d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BreakpointLocationVerificationTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.actions.BreakpointFieldLocator;
-import org.eclipse.jdt.internal.debug.ui.actions.BreakpointMethodLocator;
-import org.eclipse.jdt.internal.debug.ui.actions.ValidBreakpointLocationLocator;
-import org.eclipse.jface.text.Document;
-
-/**
- * Tests breakpoint location locator.
- */
-public class BreakpointLocationVerificationTests extends AbstractDebugTest {
-	
-	public BreakpointLocationVerificationTests(String name) {
-		super(name);
-	}
-
-	private CompilationUnit parseCompilationUnit(ICompilationUnit unit) {
-		ASTParser parser = ASTParser.newParser(AST.JLS3);
-		parser.setSource(unit);
-		parser.setUnitName(unit.getElementName());
-		parser.setResolveBindings(true);
-		return (CompilationUnit) parser.createAST(null);
-	}
-	
-	private void testLocation(int lineToTry, int expectedLineNumber, String expectedTypeName) throws JavaModelException {
-		IType type= getJavaProject().findType(expectedTypeName);
-		assertNotNull("Cannot find type", type);
-		CompilationUnit compilationUnit= parseCompilationUnit(type.getCompilationUnit());
-		ValidBreakpointLocationLocator locator= new ValidBreakpointLocationLocator(compilationUnit, lineToTry, true, false);
-		compilationUnit.accept(locator);
-		int lineNumber= locator.getLineLocation();		
-		assertEquals("Wrong line number", expectedLineNumber, lineNumber);
-		String typeName= locator.getFullyQualifiedTypeName();
-        if (lineNumber == -1) {
-            assertEquals("Wrong type name", null, typeName);
-        } else {
-            assertEquals("Wrong type name", expectedTypeName, typeName);
-        }
-	}
-
-	/**
-	 * Test line before type declaration
-	 * 
-	 * @throws Exception
-	 */
-	public void testLineBeforeTypeDeclaration() throws Exception {
-		testLocation(9, 18, "BreakpointsLocation");
-	}
-	
-	public void testLineMethodSignature() throws Exception {
-		testLocation(32, 33, "BreakpointsLocation");
-	}
-	
-	public void testLineInInnerType() throws Exception {
-		testLocation(25, 25, "BreakpointsLocation$InnerClass");
-	}
-	
-	public void testLineInAnnonymousType() throws Exception {
-		testLocation(39, 39, "BreakpointsLocation");
-	}
-	
-	public void testLineAfterAllCode() throws Exception {
-		// ********* this test need to be updated everytime BreakpointsLocation.java is modified *************
-		testLocation(74, -1, "BreakpointsLocation");
-		// ******************************
-	}
-	
-	public void testLineVariableDeclarationWithAssigment() throws Exception {
-		testLocation(43, 46, "BreakpointsLocation");
-	}
-    
-    public void testEmptyLabel() throws Exception {
-        testLocation(15, 16, "LabelTest");
-    }
-	
-    public void testNestedEmptyLabels() throws Exception {
-        testLocation(19, 21, "LabelTest");
-    }
-    
-    public void testLabelWithCode() throws Exception {
-        testLocation(21, 21, "LabelTest");
-    }
-    
-	public void testLineFieldDeclarationWithAssigment() throws Exception {
-		testLocation(51, 55, "BreakpointsLocation");
-	}
-	
-	public void testLineExpressionReplacedByConstant1() throws Exception {
-		testLocation(62, 62, "BreakpointsLocation");
-	}
-	
-	public void testLineExpressionReplacedByConstant2() throws Exception {
-		testLocation(64, 62, "BreakpointsLocation");
-	}
-	
-	public void testLineExpressionNotReplacedByConstant1() throws Exception {
-		testLocation(70, 70, "BreakpointsLocation");
-	}
-	
-	public void testLineExpressionNotReplacedByConstant2() throws Exception {
-		testLocation(72, 72, "BreakpointsLocation");
-	}
-	
-	public void testLineLitteral1() throws Exception {
-		testLocation(46, 46, "BreakpointsLocation");
-	}
-	
-	public void testLineLitteral2() throws Exception {
-		testLocation(55, 55, "BreakpointsLocation");
-	}
-	
-	public void testField(int line, int offsetInLine, String expectedFieldName, String expectedTypeName) throws Exception {
-		IType type= getJavaProject().findType("BreakpointsLocation");
-		assertNotNull("Cannot find type", type);
-		ICompilationUnit unit= type.getCompilationUnit();
-		CompilationUnit compilationUnit= parseCompilationUnit(unit);
-		int offset= new Document(unit.getSource()).getLineOffset(line - 1) + offsetInLine;
-		BreakpointFieldLocator locator= new BreakpointFieldLocator(offset);
-		compilationUnit.accept(locator);
-		String fieldName= locator.getFieldName();
-		assertEquals("Wrong File Name", expectedFieldName, fieldName);
-		String typeName= locator.getTypeName();
-		assertEquals("Wrong Type Name", expectedTypeName, typeName);
-	}
-	
-	public void testFieldLocationOnField() throws Exception {
-		testField(30, 20, "fList", "BreakpointsLocation");
-	}
-	
-	public void testFieldLocationNotOnField() throws Exception {
-		testField(33, 18, null, null);
-	}
-	
-	public void testMethod(int line, int offsetInLine, String expectedMethodName, String expectedTypeName, String expectedMethodSignature) throws Exception {
-		IType type= getJavaProject().findType("BreakpointsLocation");
-		assertNotNull("Cannot find type", type);
-		ICompilationUnit unit= type.getCompilationUnit();
-		CompilationUnit compilationUnit= parseCompilationUnit(unit);
-		int offset= new Document(unit.getSource()).getLineOffset(line - 1) + offsetInLine;
-		BreakpointMethodLocator locator= new BreakpointMethodLocator(offset);
-		compilationUnit.accept(locator);
-		String methodName= locator.getMethodName();
-		assertEquals("Wrong method name", expectedMethodName, methodName);
-		String typeName= locator.getTypeName();
-		assertEquals("Wrong type name", expectedTypeName, typeName);
-		String methodSignature= locator.getMethodSignature();
-		assertEquals("Wrong method signature", expectedMethodSignature, methodSignature);
-	}
-	
-	public void testMethodOnSignature() throws Exception {
-		testMethod(17, 20, "test1", "BreakpointsLocation", "()V");
-	}
-		
-	public void testMethodOnCode() throws Exception {
-		testMethod(19, 17, "test1", "BreakpointsLocation", "()V");
-	}
-	
-	public void testMethodNotOnMethod() throws Exception {
-		testMethod(30, 1, null, null, null);
-	}
-	
-	public void testMethodOnMethodSignatureNotAvailable() throws Exception {
-		testMethod(32, 1, "test2", "BreakpointsLocation", null);
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java
deleted file mode 100644
index f4a3404..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathContainerTests.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JREContainer;
-import org.eclipse.jdt.internal.launching.JREContainerInitializer;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.VMStandin;
-
-/**
- * Tests JRE classpath container
- */
-public class ClasspathContainerTests extends AbstractDebugTest {
-	
-	class FakeContainer implements IClasspathContainer {
-		
-		IClasspathEntry[] entries = new IClasspathEntry[0];
-		/**
-		 * @see org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
-		 */
-		public IClasspathEntry[] getClasspathEntries() {
-			return entries;
-		}
-
-		/**
-		 * @see org.eclipse.jdt.core.IClasspathContainer#getDescription()
-		 */
-		public String getDescription() {
-			return "Fake";
-		}
-
-		/**
-		 * @see org.eclipse.jdt.core.IClasspathContainer#getKind()
-		 */
-		public int getKind() {
-			return IClasspathContainer.K_DEFAULT_SYSTEM;
-		}
-
-		/**
-		 * @see org.eclipse.jdt.core.IClasspathContainer#getPath()
-		 */
-		public IPath getPath() {
-			return new Path(JavaRuntime.JRE_CONTAINER);
-		}
-		
-		public void setEntries(IClasspathEntry[] cpe) {
-			entries = cpe;
-		}
-
-	}
-	
-	public ClasspathContainerTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Tests that the container will accept an update
-	 */
-	public void testCanUpdate() throws CoreException {
-		// Create a new VM install that mirros the current install
-		IVMInstall def = JavaRuntime.getDefaultVMInstall();
-		String vmId = def.getId() + System.currentTimeMillis();
-		VMStandin standin = new VMStandin(def.getVMInstallType(), vmId);
-		String vmName = "Alternate JRE";
-		IPath containerPath = new Path(JavaRuntime.JRE_CONTAINER);
-		containerPath = containerPath.append(new Path(def.getVMInstallType().getId()));
-		containerPath = containerPath.append(new Path(vmName));
-		standin.setName(vmName);
-		standin.setInstallLocation(def.getInstallLocation());
-		standin.setJavadocLocation(def.getJavadocLocation());
-		standin.setLibraryLocations(JavaRuntime.getLibraryLocations(def));
-		standin.convertToRealVM();
-		
-		// ensure the new VM exists
-		IVMInstall newVM = def.getVMInstallType().findVMInstall(vmId);
-		assertNotNull("Failed to create new VM", newVM);
-		
-		JREContainer container = new JREContainer(newVM, containerPath);
-		JREContainerInitializer initializer = new JREContainerInitializer();
-		// store the current library settings
-		LibraryLocation[] originalLibs = JavaRuntime.getLibraryLocations(newVM);
-		assertTrue("Libraries should not be empty", originalLibs.length > 0);
-		IClasspathEntry[] originalEntries = container.getClasspathEntries();
-		assertEquals("Libraries should be same size as classpath entries", originalLibs.length, originalEntries.length);
-		
-		// ensure we can update
-		assertTrue("Initializer will not accept update", initializer.canUpdateClasspathContainer(containerPath, getJavaProject()));
-		
-		// update to an empty set of libs
-		FakeContainer fakeContainer = new FakeContainer();
-		initializer.requestClasspathContainerUpdate(containerPath, getJavaProject(), fakeContainer);
-		
-		// ensure the library locations are now empty on the new VM
-		LibraryLocation[] newLibs = JavaRuntime.getLibraryLocations(newVM);
-		assertEquals("Libraries should be empty", 0, newLibs.length);
-		
-		// re-set to original libs
-		fakeContainer.setEntries(originalEntries);
-		initializer.requestClasspathContainerUpdate(containerPath, getJavaProject(), fakeContainer);
-		
-		// ensure libs are restored
-		newLibs = JavaRuntime.getLibraryLocations(newVM);
-		assertEquals("Libraries should be restored", originalLibs.length, newLibs.length);
-		for (int i = 0; i < newLibs.length; i++) {
-			LibraryLocation location = newLibs[i];
-			LibraryLocation origi = originalLibs[i];
-			assertEquals("Library should be the eqaual", origi.getSystemLibraryPath().toFile(), location.getSystemLibraryPath().toFile());
-		} 
-	}
-	
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
deleted file mode 100644
index 20bb97a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathProvider;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Tests runtime classpath provider extension point
- */
-public class ClasspathProviderTests extends AbstractDebugTest {
-	
-	public ClasspathProviderTests(String name) {
-		super(name);
-	}
-
-	public void testEmptyProvider() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.jdt.debug.tests.EmptyClasspathProvider");
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, "org.eclipse.jdt.debug.tests.EmptyClasspathProvider");
-		
-		IRuntimeClasspathProvider cpProvider = JavaRuntime.getClasspathProvider(wc);
-		IRuntimeClasspathProvider spProvider = JavaRuntime.getSourceLookupPathProvider(wc);
-		
-		assertNotNull("Did not retrieve classpath provider", cpProvider);
-		assertNotNull("Did not retrieve source path provider", spProvider);
-		
-		assertEquals("Classpath should be empty", 0, cpProvider.computeUnresolvedClasspath(config).length);
-		assertEquals("Source path should be empty", 0, spProvider.computeUnresolvedClasspath(config).length);
-	}
-	
-	/**
-	 * Test that a variable set to the location of an archive resolves properly.
-	 */
-	public void testVariableArchiveResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-		String varName = "COMPLETE_ARCHIVE";
-		JavaCore.setClasspathVariable(varName, archive.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName));
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-	}
-	
-	/**
-	 * Test that a variable set to the location of an archive via variable
-	 * extension resolves properly.
-	 */
-	public void testVariableExtensionResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		IProject root = getJavaProject().getProject();
-		String varName = "RELATIVE_ARCHIVE";
-		JavaCore.setClasspathVariable(varName, root.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName).append(new Path("src")).append(new Path("A.jar")));
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-	}
-
-	// BOOTPATH TESTS
-		
-	/**
-	 * Test that a variable added to the bootpath is resolved to be on the bootpath.
-	 */
-	public void testBootpathVariableResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-		String varName = "bootpathVar";
-		JavaCore.setClasspathVariable(varName, archive.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName));
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, resolved[0].getClasspathProperty());			
-	}
-	
-	/**
-	 * Test that an extended variable added to the bootpath is resolved to be on the bootpath.
-	 */	
-	public void testBootpathVariableExtensionResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		IProject root = getJavaProject().getProject();
-		String varName = "bootpathVarRoot";
-		JavaCore.setClasspathVariable(varName, root.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName).append(new Path("src")).append(new Path("A.jar")));
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, resolved[0].getClasspathProperty());			
-	}
-	
-	/**
-	 * Test that a project added to the bootpath is resolved to be on the bootpath.
-	 */
-	public void testBootpathProjectResolution() throws Exception {
-		IJavaProject project = getJavaProject();
-		IResource outputFolder = ResourcesPlugin.getWorkspace().getRoot().findMember(project.getOutputLocation());
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newProjectRuntimeClasspathEntry(project);
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", outputFolder.getLocation().toOSString(), resolved[0].getLocation());
-		assertEquals("Resolved entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a container added to the bootpath is resolved to have all entries on
-	 * the boothpath.
-	 */
-	public void testBootpathContainerResolution() throws Exception {
-		IRuntimeClasspathEntry entry = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, getJavaProject());
-		// each resolved entry should be on the bootpath
-		for (int i = 0; i < resolved.length; i++) {
-			assertEquals("Entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, resolved[i].getClasspathProperty());
-		}
-	}
-	
-	/**
-	 * Test that a jar added to the bootpath is resolved to be on the bootpath.
-	 */
-	public void testBootpathJarResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-
-		IRuntimeClasspathEntry jarEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(archive.getFullPath());
-		jarEntry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(jarEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a folder added to the bootpath is resolved to be on the bootpath.
-	 */	
-	public void testBootpathFolderResolution() throws Exception {
-		IResource folder = getJavaProject().getProject().getFolder("src");
-		assertTrue("Folder does not exist", folder.exists());
-
-		IRuntimeClasspathEntry folderEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(folder.getFullPath());
-		folderEntry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(folderEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", folder.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", folder.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a project with non-default output locations placed on the bootpath
-	 * resolves to entries on the bootpath.
-	 */
-	public void testBootpathProjectNonDefaultOutputLocationsResolution() throws Exception {
-		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("MultiOutput");
-		IJavaProject project = JavaCore.create(p);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newProjectRuntimeClasspathEntry(project);
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be 3 resolved entries", 3, resolved.length); // two specific entries & default entry
-		for (int i = 0; i < resolved.length; i++) {
-			IRuntimeClasspathEntry entry = resolved[i];
-			assertEquals("Resolved entry should be on bootpath", IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, entry.getClasspathProperty());
-		}
-				
-	}
-	
-	// USER CLASSES TESTS
-		
-	/**
-	 * Test that a variable added to the user application classpath is resolved to be on
-	 * the user application classpath.
-	 */
-	public void testUserClassesVariableResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-		String varName = "bootpathVar";
-		JavaCore.setClasspathVariable(varName, archive.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName));
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, resolved[0].getClasspathProperty());			
-	}
-	
-	/**
-	 * Test that an extended variable added to the user classpath is resolved to be
-	 * on the user classpath.
-	 */	
-	public void testUserClassesVariableExtensionResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		IProject root = getJavaProject().getProject();
-		String varName = "bootpathVarRoot";
-		JavaCore.setClasspathVariable(varName, root.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName).append(new Path("src")).append(new Path("A.jar")));
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, resolved[0].getClasspathProperty());			
-	}
-	
-	/**
-	 * Test that a project added to the user classpath is resolved to be on the
-	 * user classpath.
-	 */
-	public void testUserClassesProjectResolution() throws Exception {
-		IJavaProject project = getJavaProject();
-		IResource outputFolder = ResourcesPlugin.getWorkspace().getRoot().findMember(project.getOutputLocation());
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newProjectRuntimeClasspathEntry(project);
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", outputFolder.getLocation().toOSString(), resolved[0].getLocation());
-		assertEquals("Resolved entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a container added to the user classpath is resolved to have all
-	 * entries on the user classpath.
-	 */
-	public void testUserClassesContainerResolution() throws Exception {
-		IRuntimeClasspathEntry entry = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, getJavaProject());
-		// each resolved entry should be on the bootpath
-		for (int i = 0; i < resolved.length; i++) {
-			assertEquals("Entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, resolved[i].getClasspathProperty());
-		}
-	}
-	
-	/**
-	 * Test that a jar added to the user classpath is resolved to be on the user classpath.
-	 */
-	public void testUserClassesJarResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-
-		IRuntimeClasspathEntry jarEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(archive.getFullPath());
-		jarEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(jarEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a folder added to the user classpath is resolved to be on the
-	 * user classpath.
-	 */	
-	public void testUserClassesFolderResolution() throws Exception {
-		IResource folder = getJavaProject().getProject().getFolder("src");
-		assertTrue("Folder does not exist", folder.exists());
-
-		IRuntimeClasspathEntry folderEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(folder.getFullPath());
-		folderEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(folderEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", folder.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", folder.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a project with non-default output locations placed on the user classpath
-	 * resolves to entries on the user classpath.
-	 */
-	public void testUserClassesProjectNonDefaultOutputLocationsResolution() throws Exception {
-		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("MultiOutput");
-		IJavaProject project = JavaCore.create(p);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newProjectRuntimeClasspathEntry(project);
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be 3 resolved entries", 3, resolved.length); // two specific entries & default entry
-		for (int i = 0; i < resolved.length; i++) {
-			IRuntimeClasspathEntry entry = resolved[i];
-			assertEquals("Resolved entry should be on user classpath", IRuntimeClasspathEntry.USER_CLASSES, entry.getClasspathProperty());
-		}
-				
-	}
-	
-	// STANDARD CLASSES TESTS
-		
-	/**
-	 * Test that a variable added to the default bootpath is resolved to be on
-	 * the default bootpath.
-	 */
-	public void testStandardClassesVariableResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-		String varName = "bootpathVar";
-		JavaCore.setClasspathVariable(varName, archive.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName));
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, resolved[0].getClasspathProperty());			
-	}
-	
-	/**
-	 * Test that an extended variable added to the default bootpath is resolved to be
-	 * on the default bootpath.
-	 */	
-	public void testStandardClassesVariableExtensionResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		IProject root = getJavaProject().getProject();
-		String varName = "bootpathVarRoot";
-		JavaCore.setClasspathVariable(varName, root.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName).append(new Path("src")).append(new Path("A.jar")));
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, resolved[0].getClasspathProperty());			
-	}
-	
-	/**
-	 * Test that a project added to the default bootpath is resolved to be on the
-	 * default bootpath.
-	 */
-	public void testStandardClassesProjectResolution() throws Exception {
-		IJavaProject project = getJavaProject();
-		IResource outputFolder = ResourcesPlugin.getWorkspace().getRoot().findMember(project.getOutputLocation());
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newProjectRuntimeClasspathEntry(project);
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", outputFolder.getLocation().toOSString(), resolved[0].getLocation());
-		assertEquals("Resolved entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a container added to the default bootpath is resolved to have all
-	 * entries on the default bootpath.
-	 */
-	public void testStandardClassesContainerResolution() throws Exception {
-		IRuntimeClasspathEntry entry = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, getJavaProject());
-		// each resolved entry should be on the bootpath
-		for (int i = 0; i < resolved.length; i++) {
-			assertEquals("Entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, resolved[i].getClasspathProperty());
-		}
-	}
-	
-	/**
-	 * Test that a jar added to the default bootpath is resolved to be on the
-	 * default bootpath.
-	 */
-	public void testStandardClassesJarResolution() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		assertTrue("Archive does not exist", archive.exists());
-
-		IRuntimeClasspathEntry jarEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(archive.getFullPath());
-		jarEntry.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(jarEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a folder added to the default bootpath is resolved to be on the
-	 * default bootpath.
-	 */	
-	public void testStandardClassesFolderResolution() throws Exception {
-		IResource folder = getJavaProject().getProject().getFolder("src");
-		assertTrue("Folder does not exist", folder.exists());
-
-		IRuntimeClasspathEntry folderEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(folder.getFullPath());
-		folderEntry.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(folderEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", folder.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", folder.getLocation(), new Path(resolved[0].getLocation()));
-		assertEquals("Resolved entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, resolved[0].getClasspathProperty());		
-	}
-	
-	/**
-	 * Test that a project with non-default output locations placed on the default bootpath
-	 * resolves to entries on the default bootpath.
-	 */
-	public void testStandardClassesProjectNonDefaultOutputLocationsResolution() throws Exception {
-		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("MultiOutput");
-		IJavaProject project = JavaCore.create(p);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newProjectRuntimeClasspathEntry(project);
-		runtimeClasspathEntry.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be 3 resolved entries", 3, resolved.length); // two specific entries & default entry
-		for (int i = 0; i < resolved.length; i++) {
-			IRuntimeClasspathEntry entry = resolved[i];
-			assertEquals("Resolved entry should be on default bootpath", IRuntimeClasspathEntry.STANDARD_CLASSES, entry.getClasspathProperty());
-		}
-				
-	}	
-	
-	/**
-	 * Tests that default classpath computation works for a project with mulitple
-	 * output locations.
-	 * 
-	 * @throws Exception
-	 */
-	public void testMultiOutputDefaultClasspath() throws Exception {
-		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("MultiOutput");
-		IJavaProject project = JavaCore.create(p);
-		String[] entries = JavaRuntime.computeDefaultRuntimeClassPath(project);
-		
-		IFolder bin1 = p.getFolder("bin1");
-		IFolder bin2 = p.getFolder("bin2");
-		String location1 = bin1.getLocation().toOSString();
-		String location2 = bin2.getLocation().toOSString();
-		
-		List list = new ArrayList();
-		for (int i = 0; i < entries.length; i++) {
-			list.add(entries[i]);
-		}
-		
-		assertTrue("Classpath is missing " + location1, list.contains(location1));
-		assertTrue("Classpath is missing " + location2, list.contains(location2));
-				
-	}
-	
-	/**
-	 * Tests that default classpath computation works for a project with a default
-	 * output location.
-	 * 
-	 * @throws Exception
-	 */
-	public void testSingleOutputDefaultClasspath() throws Exception {
-		IJavaProject project = getJavaProject();
-		String[] entries = JavaRuntime.computeDefaultRuntimeClassPath(project);
-		
-		IFolder bin = ResourcesPlugin.getWorkspace().getRoot().getFolder(project.getOutputLocation());
-		String location = bin.getLocation().toOSString();
-		
-		List list = new ArrayList();
-		for (int i = 0; i < entries.length; i++) {
-			list.add(entries[i]);
-		}
-		
-		assertTrue("Classpath is missing " + location, list.contains(location));
-				
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathVariableTests.java
deleted file mode 100644
index c9e67e0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathVariableTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * Tests for classpath variables
- */
-public class ClasspathVariableTests extends AbstractDebugTest {
-		
-	public ClasspathVariableTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Tests that we do not fail on a null variable
-	 */
-	public void testNullVariableResolution() throws CoreException {
-		String varName = "NULL_VARIABLE";
-		IRuntimeClasspathEntry entry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName));
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, getJavaProject());
-		// since the variable cannot be resolved, the result should be the same before/after
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Entries should be equal", entry, resolved[0]);
-	}
-	
-	public void testJRELibResolution() throws CoreException {
-		String varName = JavaRuntime.JRELIB_VARIABLE;
-		IRuntimeClasspathEntry entry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName));
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(entry, getJavaProject());
-		assertTrue("Should be at least one resolved entry", resolved.length > 0);
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		assertNotNull("no default JRE", vm);
-		LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
-		assertTrue("no default libs", libs.length > 0);
-		assertEquals("Should resolve to location of local JRE", libs[0].getSystemLibraryPath().toOSString().toLowerCase(), resolved[0].getPath().toOSString().toLowerCase());
-	}
-	
-	/**
-	 * Test that a variable set to the location of an archive via variable
-	 * extension resolves properly, with a null source attachment.
-	 */
-	public void testVariableExtensionWithNullSourceAttachment() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		IProject root = getJavaProject().getProject();
-		String varName = "RELATIVE_ARCHIVE";
-		JavaCore.setClasspathVariable(varName, root.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName).append(new Path("src")).append(new Path("A.jar")));
-		runtimeClasspathEntry.setSourceAttachmentPath(new Path("NULL_VARIABLE"));
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertNull("Should be null source attachment", resolved[0].getSourceAttachmentPath());
-	}	
-	
-	/**
-	 * Test that a variable set to the location of an archive via variable
-	 * extension resolves properly, with a source attachment rooted with a null
-	 * variable with an extension.
-	 */
-	public void testVariableExtensionWithNullSourceAttachmentWithExtension() throws Exception {
-		IResource archive = getJavaProject().getProject().getFolder("src").getFile("A.jar");
-		IProject root = getJavaProject().getProject();
-		String varName = "RELATIVE_ARCHIVE";
-		JavaCore.setClasspathVariable(varName, root.getFullPath(), null);
-
-		IRuntimeClasspathEntry runtimeClasspathEntry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(varName).append(new Path("src")).append(new Path("A.jar")));
-		runtimeClasspathEntry.setSourceAttachmentPath(new Path("NULL_VARIABLE").append("one").append("two"));
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveRuntimeClasspathEntry(runtimeClasspathEntry, getJavaProject());
-		assertEquals("Should be one resolved entry", 1, resolved.length);
-		assertEquals("Resolved path not correct", archive.getFullPath(), resolved[0].getPath());
-		assertEquals("Resolved path not correct", archive.getLocation(), new Path(resolved[0].getLocation()));
-		assertNull("Should be null source attachment", resolved[0].getSourceAttachmentPath());
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
deleted file mode 100644
index 337aee8..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests conditional breakpoints.
- */
-public class ConditionalBreakpointsTests extends AbstractDebugTest {
-	
-	public ConditionalBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleConditionalBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "i == 3", true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '3', but was " + iValue, iValue == 3);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testStaticMethodCallConditionalBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "ArgumentsTests.fact(i) == 24", true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '4', but was " + iValue, iValue == 4);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testSimpleConditionalBreakpointSuspendOnChange() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createConditionalLineBreakpoint(16, typeName, "i != 9", false);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertEquals(0, iValue);
-			
-			resumeToLineBreakpoint(thread, bp);
-			
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			var = findVariable(frame, "i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			iValue = value.getIntValue();
-			assertEquals(9, iValue);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testConditionalStepReturn() throws Exception {
-		String typeName = "ConditionalStepReturn";
-		IJavaLineBreakpoint lineBreakpoint = createLineBreakpoint(17, typeName);
-		createConditionalLineBreakpoint(18, typeName, "!bool", true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, lineBreakpoint);
-			thread = stepReturn((IJavaStackFrame)thread.getTopStackFrame());
-			// should not have suspended at breakpoint
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should be in main", "main", frame.getMethodName());
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java
deleted file mode 100644
index 8112f1c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleInputTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.debug.core.model.IStreamsProxy2;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jdt.debug.testplugin.ConsoleLineTracker;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Tests console input.
- */
-public class ConsoleInputTests extends AbstractDebugTest implements IConsoleLineTrackerExtension {
-	
-	protected List fLinesRead = new ArrayList();
-	
-	protected boolean fStarted = false;
-	
-	protected boolean fStopped = false;
-	
-	protected IConsole fConsole = null;
-	
-	protected Object fConsoleLock = new Object();
-	protected Object fLock = new Object();
-	
-	public ConsoleInputTests(String name) {
-		super(name);
-	}
-	
-    protected void setUp() throws Exception {
-        super.setUp();
-        fStarted = false;
-        fStopped = false;
-    }
-    
-    /**
-     * Writes text to the console with line feeds (like pasting multiple lines).
-     * The lines with line delimiters should be echoed back. The text remaining
-     * on the last line (without a line delimiter) should remain in the input
-     * buffer until it is ended with a line delimiter.
-     */
-	public void testMultiLineInput() throws Exception {
-		ConsoleLineTracker.setDelegate(this);
-		ILaunchConfiguration configuration = getLaunchConfiguration("ConsoleInput");
-		ILaunch launch = null;
-		try {
-			launch = configuration.launch(ILaunchManager.RUN_MODE, null);
-			synchronized (fConsoleLock) {
-				if (!fStarted) {
-					fConsoleLock.wait(30000);
-				}
-			}
-			assertNotNull("Console is null", fConsole);
-			String[] list = appendAndGet(fConsole, "one\ntwo\nexit", 4);
-			verifyOutput(new String[]{"one", "two", "exitone", "two"}, list);
-			
-			// end the program
-			list = appendAndGet(fConsole, "three\n", 3);
-			verifyOutput(new String[]{"three", "exitthree", ""}, list);
-
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			launch.getProcesses()[0].terminate();
-		}
-	} 
-	
-    /**
-     * Tests closing standard in
-     */
-	public void testEOF() throws Exception {
-		ConsoleLineTracker.setDelegate(this);
-		ILaunchConfiguration configuration = getLaunchConfiguration("ConsoleInput");
-		ILaunch launch = null;
-		try {
-			launch = configuration.launch(ILaunchManager.RUN_MODE, null);
-			synchronized (fConsoleLock) {
-				if (!fStarted) {
-					fConsoleLock.wait(30000);
-				}
-			}
-			assertNotNull("Console is null", fConsole);
-			String[] list = appendAndGet(fConsole, "one\ntwo\n", 4);
-			verifyOutput(new String[]{"one", "two", "one", "two"}, list);
-			
-			// send EOF
-			IStreamsProxy streamsProxy = launch.getProcesses()[0].getStreamsProxy();
-			assertTrue("should be an IStreamsProxy2", streamsProxy instanceof IStreamsProxy2);
-			IStreamsProxy2 proxy2 = (IStreamsProxy2)streamsProxy;
-			fLinesRead.clear();
-			proxy2.closeInputStream();
-			int attempts = 0;
-			while (fLinesRead.size() < 2) {
-				synchronized (fLinesRead) {
-					if (fLinesRead.size() < 2) {
-						fLinesRead.wait(200);
-					}
-				}
-				attempts++;
-				if (attempts > 150) {
-					break;
-				}
-			}
-			assertEquals("Wrong number of lines", 2, fLinesRead.size());
-			assertEquals("Should be EOF message", "EOF", fLinesRead.get(0));
-			assertEquals("Should be empty line", "", fLinesRead.get(1));
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			launch.getProcesses()[0].terminate();
-		}
-	} 	
-	
-	private void verifyOutput(String[] expected, String[] actual) {
-		for (int i = 0; i < actual.length; i++) {
-			assertEquals("Wrong message", expected[i], actual[i]);
-		}
-	}
-	
-	/**
-	 * Appends the given text to the given console and waits for the number
-	 * of lines to be written to the console. Returns the lines written to
-	 * the console.
-	 * 
-	 * @param console
-	 * @param text
-	 * @param linesExpected
-	 * @return lines written to the console without line delimiters
-	 * @throws Exception
-	 */
-	private String[] appendAndGet(IConsole console, final String text, int linesExpected) throws Exception {
-		fLinesRead.clear();
-		final IDocument document = console.getDocument();
-		DebugUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
-            public void run() {
-                try {
-                    document.replace(document.getLength(), 0, text);
-                } catch (BadLocationException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-		
-		int attempts = 0;
-		while (fLinesRead.size() < linesExpected) {
-			synchronized (fLinesRead) {
-				if (fLinesRead.size() < linesExpected) {
-					fLinesRead.wait(200);
-				}
-			}
-			attempts++;
-			if (attempts > 150) {
-				break;
-			}
-		}
-		assertEquals("Wrong number of lines", linesExpected, fLinesRead.size());
-		return (String[])fLinesRead.toArray(new String[0]);
-	}
-		
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public void init(IConsole console) {
-		synchronized (fConsoleLock) {
-			fConsole = console;
-			fStarted = true;
-			fConsoleLock.notifyAll();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		if (fStarted) {
-			synchronized (fLinesRead) {
-				try {
-					String text = fConsole.getDocument().get(line.getOffset(), line.getLength());
-					fLinesRead.add(text);
-				} catch (BadLocationException e) {
-				    e.printStackTrace();
-				}
-				fLinesRead.notifyAll();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#streamClosed()
-	 */
-	public void consoleClosed() {
-	    synchronized (fLock) {
-			fStopped = true;
-			fLock.notifyAll();
-        }
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
deleted file mode 100644
index 4ebdc09..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-
-/**
- * Tests console line tracker.
- */
-public class ConsoleTests extends AbstractDebugTest {
-	
-	public ConsoleTests(String name) {
-		super(name);
-	}
-	
-	class TestConsole extends MessageConsole {
-	    
-	    public boolean fInit = false;
-	    public boolean fDispose = false;
-
-        public TestConsole(boolean autoLifecycle) {
-            super("Life's like that", null, autoLifecycle);
-        }
-        
-        protected void init() {
-            super.init();
-            fInit = true;
-        }
-        
-        protected void dispose() {
-            super.dispose();
-            fDispose = true;
-        }
-	    
-	}
-	
-	/** 
-	 * Test that when a process is removed from a launch, the associated
-	 * console is closed.
-	 * 
-	 * @throws Exception
-	 */
-	public void testRemoveProcess() throws Exception {
-		String typeName = "Breakpoints";
-		IJavaDebugTarget target = null;
-		try {
-			final IJavaDebugTarget otherTarget = launchAndTerminate(typeName);
-			target = otherTarget;
-			IProcess process = target.getProcess();
-			assertNotNull("Missing VM process", process);
-			ILaunch launch = target.getLaunch();
-			// make sure the console exists
-			DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
-				public void run() {
-					IConsole console = DebugUITools.getConsole(otherTarget);
-					assertNotNull("Missing console", console);
-				}
-			});
-			launch.removeProcess(process);
-			// make sure the console is gone
-			DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
-				public void run() {
-					IConsole console = DebugUITools.getConsole(otherTarget);
-					assertNull("Console should no longer exist", console);
-				}
-			});			
-		} finally {
-			terminateAndRemove(target);
-		}				
-	} 
-	
-	public void testAutoLifecycle() {
-	    TestConsole console = new TestConsole(true);
-	    IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-	    consoleManager.addConsoles(new IConsole[]{console});
-	    consoleManager.removeConsoles(new IConsole[]{console});
-	    assertTrue("Console was not initialized", console.fInit);
-	    assertTrue("Console was not disposed", console.fDispose);
-	}
-	
-	public void testManualLifecycle() {
-	    TestConsole console = new TestConsole(false);
-	    IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-	    consoleManager.addConsoles(new IConsole[]{console});
-	    consoleManager.removeConsoles(new IConsole[]{console});
-	    assertTrue("Console was initialized", !console.fInit);
-	    assertTrue("Console was disposed", !console.fDispose);
-	    console.dispose();
-	}	
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DebugEventTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DebugEventTests.java
deleted file mode 100644
index 40ca237..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DebugEventTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jdt.debug.testplugin.DebugEventWaiter;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * DebugEventTests
- */
-public class DebugEventTests extends AbstractDebugTest {
-
-	public DebugEventTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Ensure that a model specific event can be dispatched 
-	 */
-	public void testModelSpecificEvent() {
-		DebugEvent event = new DebugEvent(this, DebugEvent.MODEL_SPECIFIC, 5000);
-		event.setData("TEST");
-		
-		DebugEventWaiter waiter = new DebugEventWaiter(DebugEvent.MODEL_SPECIFIC);
-		DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] {event});
-		waiter.waitForEvent();
-		DebugEvent received = waiter.getEvent();
-		
-		assertEquals("Incorrect detail", 5000, received.getDetail());
-		assertEquals("incorrect user data", "TEST", received.getData());
-		assertEquals("incorrect source", this, received.getSource());
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DefaultSourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DefaultSourceContainerTests.java
deleted file mode 100644
index 4fad0ad..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DefaultSourceContainerTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.DefaultSourceContainer;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-
-/**
- * Tests default source containers
- */
-public class DefaultSourceContainerTests extends AbstractDebugTest {
-	
-	public DefaultSourceContainerTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testDefaultSourceContainerMemento() throws Exception {
-		JavaSourceLookupDirector director = new JavaSourceLookupDirector();
-		ILaunchConfiguration configuration = getLaunchConfiguration("Breakpoints");
-		director.initializeDefaults(configuration);		
-		ISourceContainer[] containers = director.getSourceContainers();
-		assertEquals("expected one default container", 1, containers.length);
-		assertTrue("Wrond default container", containers[0] instanceof DefaultSourceContainer);
-		DefaultSourceContainer container = (DefaultSourceContainer)containers[0];
-		String memento = director.getMemento();
-		JavaSourceLookupDirector director2 = new JavaSourceLookupDirector();
-		director2.initializeFromMemento(memento, configuration);
-		DefaultSourceContainer restore = (DefaultSourceContainer) director2.getSourceContainers()[0];
-		assertEquals("Default source container memento failed", container, restore);
-	}			
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
deleted file mode 100644
index 35212db..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests deferred breakpoints.
- */
-public class DeferredBreakpointTests extends AbstractDebugTest {
-	
-	public DeferredBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testDeferredBreakpoints() throws Exception {
-		String typeName = "Breakpoints";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createLineBreakpoint(43, typeName));
-		// blocks
-		bps.add(createLineBreakpoint(102, typeName));
-		// constructor
-		bps.add(createLineBreakpoint(77, typeName));
-		// else
-		bps.add(createLineBreakpoint(88, typeName));
-		//finally after catch
-		bps.add(createLineBreakpoint(120, typeName));
-		//finally after try
-		bps.add(createLineBreakpoint(128, typeName));
-		// for loop
-		bps.add(createLineBreakpoint(93, typeName));
-		// if
-		bps.add(createLineBreakpoint(81, typeName));
-		// initializer
-		bps.add(createLineBreakpoint(17, typeName));
-		// inner class
-		bps.add(createLineBreakpoint(22, typeName));
-		// return true
-		bps.add(createLineBreakpoint(72, typeName));
-		// instance method
-		bps.add(createLineBreakpoint(107, typeName));
-		// static method 
-		bps.add(createLineBreakpoint(53, typeName));
-		// case statement
-		bps.add(createLineBreakpoint(133, typeName));
-		// default statement
-		bps.add(createLineBreakpoint(140, typeName));
-		// synchronized blocks
-		bps.add(createLineBreakpoint(146, typeName));
-		// try
-		bps.add(createLineBreakpoint(125, typeName));
-		//catch
-		bps.add(createLineBreakpoint(118, typeName));
-		// while
-		bps.add(createLineBreakpoint(97, typeName));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				int stackLine = thread.getTopStackFrame().getLineNumber();
-				assertEquals("line numbers of breakpoint and stack frame do not match", lineNumber, stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDisabledBreakpoint() throws Exception {
-		String typeName = "Breakpoints";
-		ILineBreakpoint bp = createLineBreakpoint(52, typeName);
-		bp.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}				
-	}
-
-	public void testEnableDisableBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		ILineBreakpoint bp = createLineBreakpoint(16, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			bp.setEnabled(false);
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}
-	
-	public void testSkipLineBreakpoint() throws Exception {
-		String typeName = "Breakpoints";
-		ILineBreakpoint bp = createLineBreakpoint(52, typeName);
-		createLineBreakpoint(54, typeName);
-		
-		IJavaThread thread = null;
-		try {
-		    thread= launchToLineBreakpoint(typeName, bp);
-		    getBreakpointManager().setEnabled(false);
-		    resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			getBreakpointManager().setEnabled(true);
-		}			    
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceContainerTests.java
deleted file mode 100644
index 2c54e78..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceContainerTests.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-
-/**
- * Tests directory source containers
- */
-public class DirectorySourceContainerTests extends AbstractDebugTest {
-	
-	public DirectorySourceContainerTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns a directory source container.
-	 */
-	protected DirectorySourceContainer getContainer(boolean subfolders, boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		File folder = getJavaProject().getProject().getFolder("src").getLocation().toFile();
-		DirectorySourceContainer container = new DirectorySourceContainer(folder, subfolders);
-		director.setSourceContainers(new ISourceContainer[]{container});
-		return container;
-	}
-	
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testDirectorySourceContainerMemento() throws Exception {
-		DirectorySourceContainer container = getContainer(true, true);
-		assertTrue(container.isComposite());
-		String memento = container.getType().getMemento(container);
-		ISourceContainer restore = container.getType().createSourceContainer(memento);
-		assertEquals("Directory source container memento failed", container, restore);
-		assertTrue(restore.isComposite());
-	}	
-
-	public void testSimpleSourceLookupPositive() throws Exception {
-		DirectorySourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("Breakpoints.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", new File(container.getDirectory(), "Breakpoints.java"), ((LocalFileStorage)objects[0]).getFile());
-	}
-	
-	public void testSimpleSourceLookupNegative() throws Exception {
-		DirectorySourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-	
-	public void testSimpleNestedSourceLookupPositive() throws Exception {
-		DirectorySourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", new File(container.getDirectory(), "org/eclipse/debug/tests/targets/InfiniteLoop.java"), ((LocalFileStorage)objects[0]).getFile());		
-	}
-	
-	public void testSimpleNestedSourceLookupNegative() throws Exception {
-		DirectorySourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);		
-	}
-	
-	public void testQualifiedSourceLookupPositive() throws Exception {
-		DirectorySourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("org/eclipse/debug/tests/targets/InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", new File(container.getDirectory(), "org/eclipse/debug/tests/targets/InfiniteLoop.java"), ((LocalFileStorage)objects[0]).getFile());
-	}
-	
-	public void testQualifiedSourceLookupNegative() throws Exception {
-		DirectorySourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("a/b/c/FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}
-	
-	public void testPartiallyQualifiedNestedSourceLookupPositive() throws Exception {
-		DirectorySourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("debug/tests/targets/InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", new File(container.getDirectory(), "org/eclipse/debug/tests/targets/InfiniteLoop.java"), ((LocalFileStorage)objects[0]).getFile());
-	}	
-	
-	public void testCaseSensitiveQualifiedSourceLookup() throws Exception {
-		DirectorySourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("oRg/eClIpSe/dEbUg/tEsTs/tArGeTs/INfInItELOop.jaVa");
-		if (isFileSystemCaseSensitive()) {
-			// case sensitive - should not find the file
-			assertEquals("Expected 0 files", 0, objects.length);
-		} else {
-			// case insensitive - should find the file
-			assertEquals("Expected 1 result", 1, objects.length);
-			assertEquals("Wrong file", new File(container.getDirectory(), "org/eclipse/debug/tests/targets/InfiniteLoop.java"), ((LocalFileStorage)objects[0]).getFile());
-		}
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceLookupTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceLookupTests.java
deleted file mode 100644
index 838aff1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DirectorySourceLookupTests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.sourcelookup.DirectorySourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.LocalFileStorage;
-
-/**
- * Tests source lookup in directories
- */
-public class DirectorySourceLookupTests extends AbstractDebugTest {
-	
-	public DirectorySourceLookupTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Tests source lookup in a top level type, in the default package.
-	 */
-	public void testDefTopLevelType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "", "Breakpoints.java");
-		assertTrue("did not find compilation unit for Breakpoints.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("Breakpoints"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner type, the default package.
-	 */
-	public void testDefInnerType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "", "Breakpoints.java");
-		assertTrue("did not find compilation unit for Breakpoints.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("Breakpoints$InnerRunnable"));
-	}
-	
-	
-	/**
-	 * Tests source lookup in a top level type.
-	 */
-	public void testTopLevelType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");
-		assertTrue("did not find compilation unit for SourceLookup.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner type.
-	 */
-	public void testInnerType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");
-		assertTrue("did not find compilation unit for SourceLookup.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup$Inner"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner, inner type.
-	 */
-	public void testNestedType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");
-		assertTrue("did not find compilation unit for SourceLookup.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup$Inner$Nested"));
-	}
-		
-	/**
-	 * Tests source lookup in a top level type, with a $ named class
-	 */
-	public void testTopLevel$Type() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "Source_$_Lookup.java");
-		assertTrue("did not find compilation unit for Source_$_Lookup.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner type in a $ named class.
-	 */
-	public void testInner$Type() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "Source_$_Lookup.java");
-		assertTrue("did not find compilation unit for Source_$_Lookup.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup$Inner"));
-	}	
-	
-	/**
-	 * Tests source lookup in an inner type in a $ named class.
-	 */
-	public void testInnerNested$Type() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		File rootFile = root.getResource().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(rootFile);
-		
-		ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "Source_$_Lookup.java");
-		assertTrue("did not find compilation unit for Source_$_Lookup.java", cu.exists());
-		LocalFileStorage expectedSource = new LocalFileStorage(cu.getResource().getLocation().toFile());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup$Inner$Nested"));
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EnvironmentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EnvironmentTests.java
deleted file mode 100644
index 163d2b1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EnvironmentTests.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.osgi.service.environment.Constants;
-
-public class EnvironmentTests extends AbstractDebugTest {
-	
-	public EnvironmentTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Tests that we resolve environment variables as case insenitive on Windows.
-	 */
-	public void testWinOSCaseInsensitiveVariable() throws Exception {
-		boolean win32= Platform.getOS().equals(Constants.OS_WIN32);
-		if (win32) {
-			IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-			String path1 = manager.performStringSubstitution("${env_var:pAth}");
-			String path2 = manager.performStringSubstitution("${env_var:PaTh}");
-			assertEquals("env vars should be case insensitive", path1, path2);
-		}
-	}
-	
-	/**
-	 * Test that we can override a variable in a case insensitive way on Windows
-	 */
-	public void testWinOSCaseInsensitiveOverride() throws Exception {
-		boolean win32= Platform.getOS().equals(Constants.OS_WIN32);
-		if (win32) {
-			ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-			ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "testWinOSCaseInsensitiveOverride");
-			Map override = new HashMap();
-			override.put("pAtH", "OVERRIDE");
-			workingCopy.setAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, override);
-			String[] environment = getLaunchManager().getEnvironment(workingCopy);
-			assertNotNull("env should be specified", environment);
-			boolean found = false;
-			for (int i = 0; i < environment.length; i++) {
-				String var = environment[i];
-				if (var.endsWith("OVERRIDE")) {
-					found = true;
-					assertTrue("env var should be PATH", var.substring(0,4).equalsIgnoreCase("PATH"));
-				}
-			}
-			assertTrue("env var path not overridden", found);
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
deleted file mode 100644
index 3e34659..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests event sets.
- */
-public class EventSetTests extends AbstractDebugTest {
-	
-	public EventSetTests(String name) {
-		super(name);
-	}
-
-	public void testDoubleBreakpoint() throws Exception {
-		String typeName = "Breakpoints";
-		List bps = new ArrayList();
-		// add two breakpoints at the same location
-		bps.add(createLineBreakpoint(88, typeName));
-		bps.add(createLineBreakpoint(88, typeName));
-		
-
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				DebugEvent[] set = getEventSet();
-				assertTrue("Should be two events", set!= null && set.length == 2);
-				for (int i = 0; i < set.length; i++) {
-					assertTrue("should be a breakpoint event", set[i].getDetail() == DebugEvent.BREAKPOINT);
-				}
-				IBreakpoint[] hits = thread.getBreakpoints();
-				assertTrue("should be two breakpoints", hits != null && hits.length == 2);
-				for (int i = 0; i < hits.length; i++) {
-					bps.remove(hits[i]);
-				}
-				assertTrue("breakpoint collection should now be empty", bps.isEmpty());
-				
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
deleted file mode 100644
index 9b1a79a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests exception breakpoints.
- */
-
-public class ExceptionBreakpointTests extends AbstractDebugTest {
-	
-	public ExceptionBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testCaughtNPE() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testUncaughtNPE() throws Exception {
-		String typeName = "HitCountException";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", false, true);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			IJavaStackFrame frame= (IJavaStackFrame)thread.getTopStackFrame();
-			assertTrue("Should have been suspended at line number 35, not " + frame.getLineNumber(), frame.getLineNumber() == 35);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testDisabledCaughtNPE() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testDisabledUncaughtNPE() throws Exception {
-		String typeName = "MultiThreadedException";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", false, true);		
-		ex.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInclusiveScopedException() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"ThrowsNPE"});
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExclusiveScopedException() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setExclusionFilters(new String[] {"ThrowsNPE"});
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testHitCountException() throws Exception {
-		String typeName = "HitCountException";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, true);		
-		ex.setHitCount(2);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			IJavaStackFrame frame= (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should have been suspended at linenumber", 35, frame.getLineNumber());
-			
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testMultiExclusiveScopedExceptionHit() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setExclusionFilters(new String[] {"TestIO", "Breakpoints"});
-		
-		IJavaThread thread = null;
-		try {
-			thread = launchToBreakpoint(typeName);
-			assertNotNull("Did not suspend", thread);
-			assertEquals("Should have suspended at NPE", ex, thread.getBreakpoints()[0]);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiExclusiveScopedExceptionMissed() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setExclusionFilters(new String[] {"TestIO", "ThrowsNPE"});
-		
-		IJavaDebugTarget target= null;
-		try {
-			target = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(target);
-			removeAllBreakpoints();
-		}		
-	}			
-	
-	public void testMultiInclusiveScopedExceptionHit() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"ThrowsNPE", "Breakpoints"});
-		
-		IJavaThread thread = null;
-		try {
-			thread = launchToBreakpoint(typeName);
-			assertNotNull("Did not suspend", thread);
-			assertEquals("Should have suspended at NPE", ex, thread.getBreakpoints()[0]);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiInclusiveScopedExceptionMissed() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"TestIO", "Breakpoints"});
-		
-		IJavaDebugTarget target= null;
-		try {
-			target = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(target);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiInclusiveExclusiveScopedExceptionHit() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"ThrowsNPE", "Breakpoints"});
-		ex.setExclusionFilters(new String[] {"HitCountException", "MethodLoop"});
-		
-		IJavaThread thread = null;
-		try {
-			thread = launchToBreakpoint(typeName);
-			assertNotNull("Did not suspend", thread);
-			assertEquals("Should have suspended at NPE", ex, thread.getBreakpoints()[0]);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testMultiInclusiveExclusiveScopedExceptionMissed() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setInclusionFilters(new String[] {"TestIO", "Breakpoints"});
-		ex.setExclusionFilters(new String[] {"ThrowsNPE", "MethodLoop"});
-		
-		IJavaDebugTarget target= null;
-		try {
-			target = launchAndTerminate(typeName);
-			ex.delete();
-		} finally {
-			terminateAndRemove(target);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testSkipExceptionBreakpoint() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);	
-		IJavaLineBreakpoint lineBreakpoint = createLineBreakpoint(15, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, lineBreakpoint);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			getBreakpointManager().setEnabled(false);
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			getBreakpointManager().setEnabled(true);
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExternalArchiveSourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExternalArchiveSourceContainerTests.java
deleted file mode 100644
index 7c21f5e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExternalArchiveSourceContainerTests.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.ExternalArchiveSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ZipEntryStorage;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * Tests external archive source containers
- */
-public class ExternalArchiveSourceContainerTests extends AbstractDebugTest {
-	
-	public ExternalArchiveSourceContainerTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns the JREs source archive.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	protected ExternalArchiveSourceContainer getContainer(boolean detect, boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		LibraryLocation[] locations = JavaRuntime.getLibraryLocations(JavaRuntime.getDefaultVMInstall());
-		for (int i = 0; i < locations.length; i++) {
-			LibraryLocation location = locations[i];
-			IPath path = location.getSystemLibrarySourcePath();
-			if (path != null && !path.isEmpty()) {
-				ExternalArchiveSourceContainer container = new ExternalArchiveSourceContainer(path.toOSString(), detect);
-				director.setSourceContainers(new ISourceContainer[]{container});
-				return container;
-			}
-		}
-		assertTrue("Did not find JRE source archive", false);
-		return null;
-	}
-	
-	/**
-	 * Returns the source archive at the specified path within this plug-in.
-	 */
-	protected ExternalArchiveSourceContainer getContainer(String path, boolean detect, boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		IPath p = new Path(path);
-		File file = JavaTestPlugin.getDefault().getFileInPlugin(p);
-		assertTrue("file " + path +  " does not exist", file != null && file.exists());
-		ExternalArchiveSourceContainer container = new ExternalArchiveSourceContainer(file.getAbsolutePath(), detect);
-		director.setSourceContainers(new ISourceContainer[]{container});
-		return container;
-	}	
-	
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testArchiveSourceContainerMemento() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(true, false);
-		assertFalse(container.isComposite());
-		assertTrue(container.isDetectRoot());
-		String memento = container.getType().getMemento(container);
-		ExternalArchiveSourceContainer restore = (ExternalArchiveSourceContainer) container.getType().createSourceContainer(memento);
-		assertEquals("Directory source container memento failed", container, restore);
-		assertFalse(restore.isComposite());
-		assertTrue(restore.isDetectRoot());
-	}	
-
-	public void testAutoDetectRootSourceLookupPositive() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("java/lang/Object.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		ZipEntryStorage storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "Object.java", storage.getName());
-	}
-	
-	public void testAutoDetectRootSourceLookupNegative() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("java/lang/FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-	
-	public void testSourceLookupPositive() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("java/lang/Object.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		ZipEntryStorage storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "Object.java", storage.getName());
-	}
-	
-	public void testSourceLookupNegative() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("java/lang/FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}
-		
-	public void testPartiallyQualifiedSourceLookupPositive() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("lang/Object.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		ZipEntryStorage storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "Object.java", storage.getName());
-	}	
-	
-	public void testAutoDetectUnqualifiedSourceLookupPositive() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer(true, false);
-		// force detection
-		Object[] objects = container.findSourceElements("java/lang/Object.java");
-		// then search for unqualified file
-		objects = container.findSourceElements("Object.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		ZipEntryStorage storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "Object.java", storage.getName());
-	}
-	
-	public void testAutoDetectMultipleRoots() throws Exception {
-		ExternalArchiveSourceContainer container = getContainer("testresources/source-test.zip", true, false);
-		// find .java file
-		Object[] objects = container.findSourceElements("one/two/Three.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		ZipEntryStorage storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "Three.java", storage.getName());
-		// find .txt file
-		objects = container.findSourceElements("another/file-b.txt");
-		storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "file-b.txt", storage.getName());
-		// find another .txt file
-		objects = container.findSourceElements("folder/file-c.txt");
-		storage = (ZipEntryStorage) objects[0];
-		assertEquals("Wrong file", "file-c.txt", storage.getName());		
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/FolderSourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/FolderSourceContainerTests.java
deleted file mode 100644
index 6aeb324..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/FolderSourceContainerTests.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-
-/**
- * Tests folder source containers
- */
-public class FolderSourceContainerTests extends AbstractDebugTest {
-	
-	public FolderSourceContainerTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns a folder source container.
-	 */
-	protected FolderSourceContainer getContainer(boolean subfolders, boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		IFolder folder = getJavaProject().getProject().getFolder("src");
-		FolderSourceContainer container = new FolderSourceContainer(folder, subfolders);
-		director.setSourceContainers(new ISourceContainer[]{container});
-		return container;
-	}
-	protected IFolder getFolder(FolderSourceContainer container) {
-		return (IFolder)container.getContainer();
-	}
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testFolderSourceContainerMemento() throws Exception {
-		FolderSourceContainer container = getContainer(true, true);
-		assertTrue(container.isComposite());
-		String memento = container.getType().getMemento(container);
-		FolderSourceContainer restore = (FolderSourceContainer) container.getType().createSourceContainer(memento);
-		assertEquals("Folder source container memento failed", container, restore);
-		assertTrue(restore.isComposite());
-	}
-	
-	public void testSimpleSourceLookupPositive() throws Exception {
-		FolderSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("Breakpoints.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", getFolder(container).getFile("Breakpoints.java"), objects[0]);
-	}
-	
-	public void testSimpleSourceLookupNegative() throws Exception {
-		FolderSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-	
-	public void testSimpleNestedSourceLookupPositive() throws Exception {
-		FolderSourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", getFolder(container).getFile(new Path("org/eclipse/debug/tests/targets/InfiniteLoop.java")), objects[0]);		
-	}
-	
-	public void testSimpleNestedSourceLookupNegative() throws Exception {
-		FolderSourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);		
-	}
-	
-	public void testQualifiedSourceLookupPositive() throws Exception {
-		FolderSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("org/eclipse/debug/tests/targets/InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", getFolder(container).getFile(new Path("org/eclipse/debug/tests/targets/InfiniteLoop.java")), objects[0]);
-	}
-	
-	public void testQualifiedSourceLookupNegative() throws Exception {
-		FolderSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("a/b/c/FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}
-	
-	public void testPartiallyQualifiedNestedSourceLookupPositive() throws Exception {
-		FolderSourceContainer container = getContainer(true, false);
-		Object[] objects = container.findSourceElements("debug/tests/targets/InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", getFolder(container).getFile(new Path("org/eclipse/debug/tests/targets/InfiniteLoop.java")), objects[0]);
-	}	
-	
-	public void testCaseSensitiveQualifiedSourceLookup() throws Exception {
-		FolderSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("oRg/eClIpSe/dEbUg/tEsTs/tArGeTs/INfInItELOop.jaVa");
-		if (isFileSystemCaseSensitive()) {
-			// case sensitive - should not find the file
-			assertEquals("Expected 0 files", 0, objects.length);
-		} else {
-			// case insensitive - should find the file
-			assertEquals("Expected 1 result", 1, objects.length);
-			assertEquals("Wrong file", getFolder(container).getFile(new Path("org/eclipse/debug/tests/targets/InfiniteLoop.java")), objects[0]);
-		}
-	}	
-	
-	public void testRelativePathName() throws Exception {
-		FolderSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements(".."+File.separatorChar+".classpath");
-		assertEquals("Expected a hit", 1, objects.length);
-		assertEquals("Wrong file", getJavaProject().getProject().getFile(new Path(".classpath")), objects[0]);
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java
deleted file mode 100644
index fd90c9b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HcrTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.testplugin.DebugElementEventWaiter;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests hot code replace
- */
-public class HcrTests extends AbstractDebugTest {
-	
-	public HcrTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleHcr() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.HcrClass";
-		createLineBreakpoint(39, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IJavaDebugTarget target = (IJavaDebugTarget)thread.getDebugTarget();
-			if (target.supportsHotCodeReplace()) {
-
-				// look at the value of 'x' - it should be "One"
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				IJavaVariable variable = findVariable(frame, "x");
-				assertNotNull("Could not find 'x'", variable);
-				assertEquals("value of 'x' should be 'One'", "One", variable.getValue().getValueString());
-				removeAllBreakpoints();
-				// now do the HCR
-				ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "HcrClass.java");
-				cu = cu.getPrimary();
-				if (!cu.isWorkingCopy()) {
-					cu = cu.getWorkingCopy(null);
-				}
-				assertTrue("HcrClass.java does not exist", cu.exists());
-				IBuffer buffer = cu.getBuffer();
-				String contents = buffer.getContents();
-				int index = contents.indexOf("\"One\"");
-				assertTrue("Could not find code to replace", index > 0);
-				String newCode = contents.substring(0, index) + "\"Two\"" + contents.substring(index + 5);
-				buffer.setContents(newCode);
-				
-				// save contents
-				DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-				cu.commitWorkingCopy(false, null);
-				waitForAutoBuild();
-				waiter.waitForEvent();
-	
-				// should have dropped to frame 'one'
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull("No top stack frame", frame);
-				assertEquals("Should have dropped to method 'one'", "one", frame.getMethodName());
-				
-				// resume to breakpoint
-				createLineBreakpoint(39, typeName);
-				thread = resume(thread);
-				
-				// value of 'x' should now be "Two"
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				variable = findVariable(frame, "x");
-				assertNotNull("Could not find 'x'", variable);
-				assertEquals("value of 'x' should be 'Two'", "Two", variable.getValue().getValueString());
-			} else {
-				System.err.println("Warning: HCR test skipped since target VM does not support HCR.");
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
deleted file mode 100644
index 8f856c9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests hit count breakpoints
- */
-public class HitCountBreakpointsTests extends AbstractDebugTest {
-
-	public HitCountBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testResetHitCountBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createLineBreakpoint(16, typeName);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '2', but was " + iValue, iValue == 2);
-			
-			bp.setHitCount(2);
-			IJavaThread thread2 = resumeToLineBreakpoint(thread, bp);
-			assertTrue("second suspended thread not the same as first", thread == thread2);			
-			
-			frame = (IJavaStackFrame)thread2.getTopStackFrame();
-			var = findVariable(frame, "i");
-			value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '4', but was " + iValue, iValue == 4);
-			
-			resumeAndExit(thread2);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExpiredHitCountBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createLineBreakpoint(16, typeName);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "i");
-			assertNotNull("Could not find variable 'i'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'i' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'i' should be '2', but was " + iValue, iValue == 2);
-			
-			resumeAndExit(thread);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java
deleted file mode 100644
index fc7a221..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceFilterTests.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaFieldVariable;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaObject;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests instance filters on breakpoints.
- * 
- * These tests only "run" on VMs that support instance breakpoints,
- * such as JDK 1.4.1.
- */
-public class InstanceFilterTests extends AbstractDebugTest {
-	
-	public InstanceFilterTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Instance filter on a line breakpoint
-	 * 
-	 * @throws Exception
-	 */
-	public void testLineBreakpoint() throws Exception {
-		String typeName = "InstanceFilterObject";
-		// main
-		IJavaLineBreakpoint mainBreakpoint = createLineBreakpoint(39, typeName);
-		// simpleMethod
-		IJavaLineBreakpoint simpleMethod = createLineBreakpoint(19, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("hit wrong breakpoint", mainBreakpoint, hit);
-			
-			// can only do test if the VM supports instance filters
-			if (supportsInstanceBreakpoints(thread)) {
-				// restrict breakpoint in simpleMethod to object 1
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaVariable var1 = findVariable(frame, "object1");
-				IJavaVariable var2 = findVariable(frame, "object2");
-				assertNotNull(var1);
-				assertNotNull(var2);
-				IJavaObject object1 = (IJavaObject)var1.getValue();
-				IJavaObject object2 = (IJavaObject)var2.getValue();
-				assertNotNull(object1);
-				assertNotNull(object2);
-				
-				simpleMethod.addInstanceFilter(object1);
-				
-				// resume the thread
-				thread= resume(thread);
-				IBreakpoint[] breakpoints = thread.getBreakpoints();
-				assertEquals("should be a breakpoint", 1, breakpoints.length);
-				assertEquals("should be in simpleMethod", simpleMethod, breakpoints[0]);
-				
-				// receiver should be object1
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaObject receiver = frame.getThis();
-				assertEquals("should be in object1 context", object1, receiver);
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Instance filter on a method entry breakpoint
-	 * 
-	 * @throws Exception
-	 */
-	public void testMethodEntryBreakpoint() throws Exception {
-		String typeName = "InstanceFilterObject";
-		// main
-		IJavaLineBreakpoint mainBreakpoint = createLineBreakpoint(39, typeName);
-		// simpleMethod
-		IJavaMethodBreakpoint simpleMethod = createMethodBreakpoint(typeName, "simpleMethod", "()V", true, false);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("hit wrong breakpoint", mainBreakpoint, hit);
-			
-			// can only do test if the VM supports instance filters
-			if (supportsInstanceBreakpoints(thread)) {
-				// restrict breakpoint in simpleMethod to object 1
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaVariable var1 = findVariable(frame, "object1");
-				IJavaVariable var2 = findVariable(frame, "object2");
-				assertNotNull(var1);
-				assertNotNull(var2);
-				IJavaObject object1 = (IJavaObject)var1.getValue();
-				IJavaObject object2 = (IJavaObject)var2.getValue();
-				assertNotNull(object1);
-				assertNotNull(object2);
-				
-				simpleMethod.addInstanceFilter(object1);
-				
-				// resume the thread
-				thread= resume(thread);
-				IBreakpoint[] breakpoints = thread.getBreakpoints();
-				assertEquals("should be a breakpoint", 1, breakpoints.length);
-				assertEquals("should be in simpleMethod", simpleMethod, breakpoints[0]);
-				
-				// receiver should be object1
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaObject receiver = frame.getThis();
-				assertEquals("should be in object1 context", object1, receiver);
-				// method should not have executed yet
-				IJavaFieldVariable boolVar = receiver.getField("executedSimpleMethod",false);
-				assertNotNull(boolVar);
-				IValue value = boolVar.getValue();
-				assertEquals("method should not have executed", ((IJavaDebugTarget)frame.getDebugTarget()).newValue(false), value);
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Instance filter on a method exit breakpoint
-	 * 
-	 * @throws Exception
-	 */
-	public void testMethodExitBreakpoint() throws Exception {
-		String typeName = "InstanceFilterObject";
-		// main
-		IJavaLineBreakpoint mainBreakpoint = createLineBreakpoint(39, typeName);
-		// simpleMethod
-		IJavaMethodBreakpoint simpleMethod = createMethodBreakpoint(typeName, "simpleMethod", "()V", false, true);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("hit wrong breakpoint", mainBreakpoint, hit);
-			
-			// can only do test if the VM supports instance filters
-			if (supportsInstanceBreakpoints(thread)) {
-				// restrict breakpoint in simpleMethod to object 1
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaVariable var1 = findVariable(frame, "object1");
-				IJavaVariable var2 = findVariable(frame, "object2");
-				assertNotNull(var1);
-				assertNotNull(var2);
-				IJavaObject object1 = (IJavaObject)var1.getValue();
-				IJavaObject object2 = (IJavaObject)var2.getValue();
-				assertNotNull(object1);
-				assertNotNull(object2);
-				
-				simpleMethod.addInstanceFilter(object1);
-				
-				// resume the thread
-				thread= resume(thread);
-				IBreakpoint[] breakpoints = thread.getBreakpoints();
-				assertEquals("should be a breakpoint", 1, breakpoints.length);
-				assertEquals("should be in simpleMethod", simpleMethod, breakpoints[0]);
-				
-				// receiver should be object1
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaObject receiver = frame.getThis();
-				assertEquals("should be in object1 context", object1, receiver);
-				// method should have executed
-				IJavaFieldVariable boolVar = receiver.getField("executedSimpleMethod",false);
-				assertNotNull(boolVar);
-				IValue value = boolVar.getValue();
-				assertEquals("method should have executed", ((IJavaDebugTarget)frame.getDebugTarget()).newValue(true), value);
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-
-	/**
-	 * Instance filter on an exception breakpoint
-	 * 
-	 * @throws Exception
-	 */
-	public void testExceptionBreakpoint() throws Exception {
-		String typeName = "InstanceFilterObject";
-		// main
-		IJavaLineBreakpoint mainBreakpoint = createLineBreakpoint(39, typeName);
-		// exception breakpoint
-		IJavaExceptionBreakpoint npe = createExceptionBreakpoint("java.lang.NullPointerException", true, true);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("hit wrong breakpoint", mainBreakpoint, hit);
-			
-			// can only do test if the VM supports instance filters
-			if (supportsInstanceBreakpoints(thread)) {
-				// restrict breakpoint in simpleMethod to object 1
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaVariable var1 = findVariable(frame, "object1");
-				IJavaVariable var2 = findVariable(frame, "object2");
-				assertNotNull(var1);
-				assertNotNull(var2);
-				IJavaObject object1 = (IJavaObject)var1.getValue();
-				IJavaObject object2 = (IJavaObject)var2.getValue();
-				assertNotNull(object1);
-				assertNotNull(object2);
-				
-				npe.addInstanceFilter(object1);
-				
-				// resume the thread
-				thread= resume(thread);
-				IBreakpoint[] breakpoints = thread.getBreakpoints();
-				assertEquals("should be a breakpoint", 1, breakpoints.length);
-				assertEquals("should be in throwNPE", npe, breakpoints[0]);
-				
-				// receiver should be object1
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaObject receiver = frame.getThis();
-				assertEquals("should be in object1 context", object1, receiver);
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Instance filter on an access watchpoint
-	 * 
-	 * @throws Exception
-	 */
-	public void testAccessWatchpoint() throws Exception {
-		String typeName = "InstanceFilterObject";
-		// main
-		IJavaLineBreakpoint mainBreakpoint = createLineBreakpoint(39, typeName);
-		// exception breakpoint
-		IJavaWatchpoint watchpoint = createWatchpoint(typeName, "field", true, false);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("hit wrong breakpoint", mainBreakpoint, hit);
-			
-			// can only do test if the VM supports instance filters
-			if (supportsInstanceBreakpoints(thread)) {
-				// restrict breakpoint in simpleMethod to object 1
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaVariable var1 = findVariable(frame, "object1");
-				IJavaVariable var2 = findVariable(frame, "object2");
-				assertNotNull(var1);
-				assertNotNull(var2);
-				IJavaObject object1 = (IJavaObject)var1.getValue();
-				IJavaObject object2 = (IJavaObject)var2.getValue();
-				assertNotNull(object1);
-				assertNotNull(object2);
-				
-				watchpoint.addInstanceFilter(object1);
-				
-				// resume the thread
-				thread= resume(thread);
-				IBreakpoint[] breakpoints = thread.getBreakpoints();
-				assertEquals("should be a breakpoint", 1, breakpoints.length);
-				assertEquals("should be in access method", watchpoint, breakpoints[0]);
-				
-				// in "accessField" 
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				assertEquals("should be in access method", "accessField", frame.getMethodName());
-				
-				// receiver should be object1
-				IJavaObject receiver = frame.getThis();
-				assertEquals("should be in object1 context", object1, receiver);
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Instance filter on an modification watchpoint
-	 * 
-	 * @throws Exception
-	 */
-	public void testModificationWatchpoint() throws Exception {
-		String typeName = "InstanceFilterObject";
-		// main
-		IJavaLineBreakpoint mainBreakpoint = createLineBreakpoint(39, typeName);
-		// exception breakpoint
-		IJavaWatchpoint watchpoint = createWatchpoint(typeName, "field", false, true);
-		// disable to avoid variable initializer
-		watchpoint.setEnabled(false);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("hit wrong breakpoint", mainBreakpoint, hit);
-			
-			// can only do test if the VM supports instance filters
-			if (supportsInstanceBreakpoints(thread)) {
-				// restrict breakpoint in simpleMethod to object 1
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				IJavaVariable var1 = findVariable(frame, "object1");
-				IJavaVariable var2 = findVariable(frame, "object2");
-				assertNotNull(var1);
-				assertNotNull(var2);
-				IJavaObject object1 = (IJavaObject)var1.getValue();
-				IJavaObject object2 = (IJavaObject)var2.getValue();
-				assertNotNull(object1);
-				assertNotNull(object2);
-				
-				watchpoint.addInstanceFilter(object1);
-				
-				// enable watchpoint
-				watchpoint.setEnabled(true);
-				
-				// resume the thread
-				thread= resume(thread);
-				IBreakpoint[] breakpoints = thread.getBreakpoints();
-				assertEquals("should be a breakpoint", 1, breakpoints.length);
-				assertEquals("should be in modification method", watchpoint, breakpoints[0]);
-				
-				// in "modifyField" 
-				frame = (IJavaStackFrame)thread.getTopStackFrame();
-				assertNotNull(frame);
-				assertEquals("should be in modify method", "modifyField", frame.getMethodName());
-				
-				// receiver should be object1
-				IJavaObject receiver = frame.getThis();
-				assertEquals("should be in object1 context", object1, receiver);
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-	
-	/**
-	 * Returns whether the associated target supports instance breakpoints
-	 * 
-	 * @param thread
-	 * @return boolean
-	 */
-	private boolean supportsInstanceBreakpoints(IJavaThread thread) {
-		IJavaDebugTarget target = (IJavaDebugTarget)thread.getDebugTarget();
-		return target.supportsInstanceBreakpoints();
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
deleted file mode 100644
index 7ba86f1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaObject;
-import org.eclipse.jdt.debug.core.IJavaReferenceType;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class InstanceVariableTests extends AbstractDebugTest {
-	
-	public InstanceVariableTests(String name) {
-		super(name);
-	}
-
-	public void testGetField() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(30, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable ivt = findVariable(frame, "ivt");
-			assertNotNull("Could not find variable 'ivt'", ivt);
-			
-			// retrieve an instance var
-			IJavaObject value = (IJavaObject)ivt.getValue();
-			assertNotNull(value);
-			IJavaVariable pubStr = value.getField("pubStr", false);
-			assertNotNull(pubStr);
-			assertEquals("value should be 'redefined public'", pubStr.getValue().getValueString(), "redefined public");
-			
-			// retrieve an instance var in superclass
-			IJavaVariable privStr = value.getField("privStr", false);
-			assertNotNull(privStr);
-			assertEquals("value should be 'private'", privStr.getValue().getValueString(), "private");			
-			
-			// retrieve an instance var in super class with same name
-			pubStr = value.getField("pubStr", true);
-			assertNotNull(pubStr);
-			assertEquals("value should be 'public'", pubStr.getValue().getValueString(), "public");			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testGetDeclaredFieldNames() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(28, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-	
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IJavaObject object = frame.getThis();
-			assertNotNull("'this' is null", object);
-			
-			String[] names = ((IJavaReferenceType)object.getJavaType()).getDeclaredFieldNames();
-			assertEquals("Should be 7 declared fields", 7, names.length);
-			List fields = new ArrayList();
-			for (int i = 0; i < names.length; i++) {
-				String string = names[i];
-				fields.add(string);
-			}
-			assertTrue("Missing 'pubStr'", fields.indexOf("pubStr") >= 0);
-			assertTrue("Missing 'protStr'", fields.indexOf("protStr") >= 0);
-			assertTrue("Missing 'defStr'", fields.indexOf("defStr") >= 0);
-			assertTrue("Missing 'privStr'", fields.indexOf("privStr") >= 0);
-			assertTrue("Missing 'nullStr'", fields.indexOf("nullStr") >= 0);
-			assertTrue("Missing 'date'", fields.indexOf("date") >= 0);
-			assertTrue("Missing 'nullDate'", fields.indexOf("nullDate") >= 0);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testGetDeclaredFieldNamesInSubclass() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(30, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable ivt = findVariable(frame, "ivt");
-			assertNotNull("Could not find variable 'ivt'", ivt);
-			IJavaObject object = (IJavaObject)ivt.getValue();
-			
-			String[] names = ((IJavaReferenceType)object.getJavaType()).getDeclaredFieldNames();
-			assertEquals("Should be 3 declared fields", 3, names.length);
-			List fields = new ArrayList();
-			for (int i = 0; i < names.length; i++) {
-				String string = names[i];
-				fields.add(string);
-			}
-			assertTrue("Missing 'pubStr'", fields.indexOf("pubStr") >= 0);
-			assertTrue("Missing 'protStr'", fields.indexOf("protStr") >= 0);
-			assertTrue("Missing 'defStr'", fields.indexOf("defStr") >= 0);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testGetAllFieldNamesInSubclass() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(30, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable ivt = findVariable(frame, "ivt");
-			assertNotNull("Could not find variable 'ivt'", ivt);
-			IJavaObject object = (IJavaObject)ivt.getValue();
-			
-			String[] names = ((IJavaReferenceType)object.getJavaType()).getAllFieldNames();
-			assertTrue("Should be at least 10 fields", names.length >= 10);
-			// note: can be > 10 if Object defines any inst vars (depends on class libs)
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-	
-	public void testEvaluationAssignments() throws Exception {
-		String typeName = "InstanceVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(28, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable pubStr = findVariable(frame, "pubStr");
-			assertNotNull("Could not find variable 'pubStr'", pubStr);
-			assertEquals("'pubStr' value should be 'public'", "public", pubStr.getValue().getValueString());
-			
-			evaluate("pubStr = \"hello\";", frame);			
-			// the value should have changed
-			assertEquals("'pubStr' value should be 'hello'", "hello", pubStr.getValue().getValueString());
-			
-			evaluate("pubStr = null;", frame);
-			// the value should have changed
-			assertEquals("'pubStr' value should be 'null'", ((IJavaDebugTarget)frame.getDebugTarget()).nullValue(), pubStr.getValue());
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testValueHasChanged() throws Exception {
-		String typeName = "VariableChanges";
-		
-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable count = findVariable(frame, "count");
-			IVariable i = findVariable(frame, "i");
-			
-			assertNotNull("could not find variable 'count'", count);
-			assertNotNull("could not find variable 'i'", i);
-			
-			// on first suspend, change should be false
-			count.getValue();
-			i.getValue();
-			assertFalse("count should not have changed", count.hasValueChanged());
-			assertFalse("i should not have changed", i.hasValueChanged());
-			
-			// after a step over "count++" it should have changed
-			stepOver(frame);
-			
-			// count should have changed, and i should not
-			count.getValue();
-			i.getValue();			
-			assertTrue("count should have changed value", count.hasValueChanged());
-			assertFalse("i should still be the same", i.hasValueChanged());
-			
-			stepOver(frame);
-			
-			// now count should be the same, and i should have changed
-			count.getValue();
-			i.getValue();
-			assertFalse("count should not have changed", count.hasValueChanged());
-			assertTrue("i should have changd", i.hasValueChanged());
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaBreakpointListenerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaBreakpointListenerTests.java
deleted file mode 100644
index 94efef9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaBreakpointListenerTests.java
+++ /dev/null
@@ -1,641 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.jdt.core.dom.Message;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaBreakpointListener;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaType;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests breakpoint creation/deletion and listener interfaces.
- */
-public class JavaBreakpointListenerTests extends AbstractDebugTest implements IJavaBreakpointListener {
-	
-	public int fAddCallbacks = 0;
-	
-	public int fRemoveCallbacks = 0;
-	
-	public int fInstalledCallbacks = 0;
-	
-	public IJavaBreakpoint fBreakpoint;
-	
-	/**
-	 * Used to test breakpoint install/suspend voting.
-	 */
-	class SuspendVoter implements IJavaBreakpointListener {
-		
-		int fVote;
-		IJavaBreakpoint fTheBreakpoint;
-		
-		public SuspendVoter(int suspendVote, IJavaBreakpoint breakpoint) {
-			fVote = suspendVote;
-			fTheBreakpoint = breakpoint;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-		 */
-		public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
-		 */
-		public void breakpointHasCompilationErrors(IJavaLineBreakpoint breakpoint, Message[] errors) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
-		 */
-		public void breakpointHasRuntimeException(IJavaLineBreakpoint breakpoint, DebugException exception) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-		 */
-		public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
-			if (breakpoint == fTheBreakpoint) {
-				return fVote;
-			}
-			return DONT_CARE;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-		 */
-		public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-		 */
-		public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
-		 */
-		public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
-			return DONT_CARE;
-		}
-
-	}
-	
-	class InstallVoter extends SuspendVoter {
-		
-		public InstallVoter(int installVote, IJavaBreakpoint breakpoint) {
-			super(installVote, breakpoint);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
-		 */
-		public int installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {
-			if (breakpoint.equals(fTheBreakpoint)) {
-				return fVote;
-			}
-			return DONT_CARE;
-		}
-}
-			
-	public JavaBreakpointListenerTests(String name) {
-		super(name);
-	}
-
-	protected void resetCallbacks() {
-		fAddCallbacks = 0;
-	
-		fRemoveCallbacks = 0;
-	
-		fInstalledCallbacks = 0;	
-	}
-	
-	public void testLineBreakpoint() throws Exception {		
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		fBreakpoint = breakpoint;
-		resetCallbacks();
-		
-		IJavaThread thread = null;
-		try {
-			JDIDebugModel.addJavaBreakpointListener(this);		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			// breakpoint should be added & installed
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);	
-
-			// disable and re-enable the breakpoint
-			breakpoint.setEnabled(false);
-			breakpoint.setEnabled(true);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);
-			
-			// change the hit count
-			breakpoint.setHitCount(34);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);
-			
-			// delete the breakpoint
-			breakpoint.delete();
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			
-			// and removed
-			assertEquals("Breakpoint should be removed", 1, fRemoveCallbacks);								
-			
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(this);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}
-		
-	}	
-	
-	public void testExceptionBreakpoint() throws Exception {		
-		IJavaExceptionBreakpoint breakpoint = createExceptionBreakpoint("java.lang.NullPointerException", true, true);
-		fBreakpoint = breakpoint;
-		resetCallbacks();
-		
-		IJavaThread thread = null;
-		try {
-			JDIDebugModel.addJavaBreakpointListener(this);		
-			thread = launchToBreakpoint("ThrowsNPE");
-			assertNotNull(thread);
-			// breakpoint should be added & installed
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);	
-
-			// disable and re-enable the breakpoint
-			breakpoint.setEnabled(false);
-			breakpoint.setEnabled(true);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);
-			
-			// change the hit count
-			breakpoint.setHitCount(34);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);
-			
-			// toggle caught/uncaught
-			breakpoint.setCaught(false);
-			breakpoint.setUncaught(false);
-			breakpoint.setCaught(true);
-			breakpoint.setUncaught(true);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);			
-			
-			// delete the breakpoint
-			breakpoint.delete();
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			
-			// and removed
-			assertEquals("Breakpoint should be removed", 1, fRemoveCallbacks);								
-			
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(this);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}
-		
-	}	
-	
-	public void testMethodBreakpoint() throws Exception {		
-		IJavaMethodBreakpoint breakpoint = createMethodBreakpoint("DropTests", "method4", "()V", true, false);
-		fBreakpoint = breakpoint;
-		resetCallbacks();
-		
-		IJavaThread thread = null;
-		try {
-			JDIDebugModel.addJavaBreakpointListener(this);		
-			thread = launchToBreakpoint("DropTests");
-			assertNotNull(thread);
-			// breakpoint should be added & installed
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);	
-
-			// disable and re-enable the breakpoint
-			breakpoint.setEnabled(false);
-			breakpoint.setEnabled(true);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);
-			
-			// change the hit count
-			breakpoint.setHitCount(34);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);
-			
-			// toggle entry/exit
-			breakpoint.setExit(true);
-			breakpoint.setEntry(false);
-			breakpoint.setExit(false);
-			breakpoint.setEnabled(true);
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			assertEquals("Breakpoint should not be removed", 0, fRemoveCallbacks);			
-			
-			// delete the breakpoint
-			breakpoint.delete();
-			
-			// should still be installed/added once
-			assertEquals("Breakpoint should be added", 1, fAddCallbacks);
-			assertEquals("Breakpoint should be installed", 1, fInstalledCallbacks);
-			
-			// and removed
-			assertEquals("Breakpoint should be removed", 1, fRemoveCallbacks);								
-			
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(this);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}	
-	}
-	
-	/**
-	 * Vote: Install 3, Don't Care 0, Don't Install 0 == INSTALL
-	 */
-	public void testUnanimousInstallVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		InstallVoter v1 = new InstallVoter(SUSPEND, breakpoint);
-		InstallVoter v2 = new InstallVoter(SUSPEND, breakpoint);
-		InstallVoter v3 = new InstallVoter(SUSPEND, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Vote: Install 0, Don't Care 3, Don't Install 0 == INSTALL
-	 */	
-	public void testDontCareInstallVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		InstallVoter v1 = new InstallVoter(DONT_CARE, breakpoint);
-		InstallVoter v2 = new InstallVoter(DONT_CARE, breakpoint);
-		InstallVoter v3 = new InstallVoter(DONT_CARE, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Vote: Install 1, Don't Care 2, Don't Install 0 == INSTALL
-	 */	
-	public void testInstallDontCareVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		InstallVoter v1 = new InstallVoter(SUSPEND, breakpoint);
-		InstallVoter v2 = new InstallVoter(DONT_CARE, breakpoint);
-		InstallVoter v3 = new InstallVoter(DONT_CARE, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-		
-	/**
-	 * Vote: Install 1, Don't Care 0, Don't Install 2 == INSTALL
-	 */
-	public void testInstallDontVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		InstallVoter v1 = new InstallVoter(SUSPEND, breakpoint);
-		InstallVoter v2 = new InstallVoter(DONT_SUSPEND, breakpoint);
-		InstallVoter v3 = new InstallVoter(DONT_SUSPEND, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Vote: Install 0, Don't Care 1, Don't Install 2 = RESUME
-	 */	
-	public void testDontInstallVote() throws Exception {
-		IJavaLineBreakpoint breakpoint1 = createLineBreakpoint(54, "Breakpoints");
-		IJavaLineBreakpoint breakpoint2 = createLineBreakpoint(55, "Breakpoints");
-		InstallVoter v1 = new InstallVoter(DONT_CARE, breakpoint1);
-		InstallVoter v2 = new InstallVoter(DONT_SUSPEND, breakpoint1);
-		InstallVoter v3 = new InstallVoter(DONT_SUSPEND, breakpoint1);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint2, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Vote: Suspend 3, Don't Care 0, Don't Suspend 0 == SUSPEND
-	 */
-	public void testUnanimousSuspendVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		SuspendVoter v1 = new SuspendVoter(SUSPEND, breakpoint);
-		SuspendVoter v2 = new SuspendVoter(SUSPEND, breakpoint);
-		SuspendVoter v3 = new SuspendVoter(SUSPEND, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Vote: Suspend 0, Don't Care 3, Don't Suspend 0 == SUSPEND
-	 */	
-	public void testDontCareSuspendVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		SuspendVoter v1 = new SuspendVoter(DONT_CARE, breakpoint);
-		SuspendVoter v2 = new SuspendVoter(DONT_CARE, breakpoint);
-		SuspendVoter v3 = new SuspendVoter(DONT_CARE, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Vote: Suspend 1, Don't Care 2, Don't Suspend 0 == SUSPEND
-	 */	
-	public void testSuspendDontCareVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		SuspendVoter v1 = new SuspendVoter(SUSPEND, breakpoint);
-		SuspendVoter v2 = new SuspendVoter(DONT_CARE, breakpoint);
-		SuspendVoter v3 = new SuspendVoter(DONT_CARE, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-		
-	/**
-	 * Vote: Suspend 1, Don't Care 0, Don't Suspend 2 == SUSPEND
-	 */
-	public void testSuspendDontVote() throws Exception {
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(54, "Breakpoints");
-		SuspendVoter v1 = new SuspendVoter(SUSPEND, breakpoint);
-		SuspendVoter v2 = new SuspendVoter(DONT_SUSPEND, breakpoint);
-		SuspendVoter v3 = new SuspendVoter(DONT_SUSPEND, breakpoint);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Vote: Suspend 0, Don't Care 1, Don't Suspend 2 = RESUME
-	 */	
-	public void testDontSuspendVote() throws Exception {
-		IJavaLineBreakpoint breakpoint1 = createLineBreakpoint(54, "Breakpoints");
-		IJavaLineBreakpoint breakpoint2 = createLineBreakpoint(55, "Breakpoints");
-		SuspendVoter v1 = new SuspendVoter(DONT_CARE, breakpoint1);
-		SuspendVoter v2 = new SuspendVoter(DONT_SUSPEND, breakpoint1);
-		SuspendVoter v3 = new SuspendVoter(DONT_SUSPEND, breakpoint1);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		JDIDebugModel.addJavaBreakpointListener(v2);
-		JDIDebugModel.addJavaBreakpointListener(v3);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("Breakpoints");
-			assertNotNull(thread);
-			assertEquals(breakpoint2, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			JDIDebugModel.removeJavaBreakpointListener(v2);
-			JDIDebugModel.removeJavaBreakpointListener(v3);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Vote: Suspend 0, Don't Care 1 (java debug options manager), Don't Suspend 1 = RESUME
-	 */	
-	public void testMethodBreakpointDontSuspendVote() throws Exception {
-		IJavaMethodBreakpoint breakpoint1 = createMethodBreakpoint("DropTests", "method2", "()V", true, false);
-		IJavaMethodBreakpoint breakpoint2 = createMethodBreakpoint("DropTests", "method4", "()V", true, false);
-		SuspendVoter v1 = new SuspendVoter(DONT_SUSPEND, breakpoint1);
-		JDIDebugModel.addJavaBreakpointListener(v1);
-		IJavaThread thread = null;
-		try {		
-			thread = launchToBreakpoint("DropTests");
-			assertNotNull(thread);
-			assertEquals(breakpoint2, thread.getBreakpoints()[0]);
-		} finally {
-			JDIDebugModel.removeJavaBreakpointListener(v1);
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasCompilationErrors(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.jdt.core.dom.Message[])
-	 */
-	public void breakpointHasCompilationErrors(
-		IJavaLineBreakpoint breakpoint,
-		Message[] errors) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHasRuntimeException(org.eclipse.jdt.debug.core.IJavaLineBreakpoint, org.eclipse.debug.core.DebugException)
-	 */
-	public void breakpointHasRuntimeException(
-		IJavaLineBreakpoint breakpoint,
-		DebugException exception) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointHit(org.eclipse.jdt.debug.core.IJavaThread, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-	 */
-	public int breakpointHit(
-		IJavaThread thread,
-		IJavaBreakpoint breakpoint) {
-		return DONT_CARE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointInstalled(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-	 */
-	public void breakpointInstalled(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-			if (breakpoint == fBreakpoint) {
-				fInstalledCallbacks++;
-			}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#breakpointRemoved(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-	 */
-	public void breakpointRemoved(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-			if (breakpoint == fBreakpoint) {
-				fRemoveCallbacks++;				
-			}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#installingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint, org.eclipse.jdt.debug.core.IJavaType)
-	 */
-	public int installingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint,
-		IJavaType type) {
-			return DONT_CARE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.debug.core.IJavaBreakpointListener#addingBreakpoint(org.eclipse.jdt.debug.core.IJavaDebugTarget, org.eclipse.jdt.debug.core.IJavaBreakpoint)
-	 */
-	public void addingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-			if (breakpoint == fBreakpoint) {
-				fAddCallbacks++;
-			}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaLibraryPathTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaLibraryPathTests.java
deleted file mode 100644
index 597d3f0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaLibraryPathTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.IValueVariable;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Tests for native classpath entries.
- * 
- * @since 3.1
- */
-public class JavaLibraryPathTests extends AbstractDebugTest {
-	
-	public JavaLibraryPathTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Create test projects "PathTests1/2/3"
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		createProject("PathTests1");
-		createProject("PathTests2");
-	}
-	
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		deleteProject("PathTests1");
-		deleteProject("PathTests2");
-	}
-	
-	private IJavaProject createProject(String name) throws Exception {
-		IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (pro.exists()) {
-			pro.delete(true, true, null);
-		}
-		IJavaProject project = JavaProjectHelper.createJavaProject(name, "bin");
-		return project;
-	}
-	
-	private void deleteProject(String name) throws Exception {
-		IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		if (pro.exists()) {
-			pro.delete(true, true, null);
-		}
-	}
-	
-	private void addToClasspath(IJavaProject jproject, IClasspathEntry cpe) throws JavaModelException {
-		IClasspathEntry[] oldEntries= jproject.getRawClasspath();
-		for (int i= 0; i < oldEntries.length; i++) {
-			if (oldEntries[i].equals(cpe)) {
-				return;
-			}
-		}
-		int nEntries= oldEntries.length;
-		IClasspathEntry[] newEntries= new IClasspathEntry[nEntries + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, nEntries);
-		newEntries[nEntries]= cpe;
-		jproject.setRawClasspath(newEntries, null);
-	}	
-	
-	public void testRequiredProjectExplicitPath() throws Exception {
-		// add required project with one java library path entry
-		IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IClasspathAttribute attribute = JavaRuntime.newLibraryPathsAttribute(new String[] {path.toString()});
-		IClasspathEntry entry = JavaCore.newProjectEntry(new Path("PathTests3").makeAbsolute(), new IAccessRule[0], false, new IClasspathAttribute[]{attribute}, false);
-		addToClasspath(getJavaProject("PathTests2"), entry);
-		entry = JavaCore.newProjectEntry(new Path("PathTests2").makeAbsolute());
-		addToClasspath(getJavaProject("PathTests1"), entry);
-		
-		String[] strings = JavaRuntime.computeJavaLibraryPath(getJavaProject("PathTests1"), true);
-		assertEquals("Wrong number of entries", 1, strings.length);
-		assertEquals("Wrong entry", path.toFile().getCanonicalPath(), new File(strings[0]).getCanonicalPath());
-	}
-	
-	public void testVMArgsForRequiredProjectExplicitPath() throws Exception {
-		// add required project with one java library path entry
-		IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IClasspathAttribute attribute = JavaRuntime.newLibraryPathsAttribute(new String[]{path.toString()});
-		IClasspathEntry entry = JavaCore.newProjectEntry(new Path("PathTests3").makeAbsolute(), new IAccessRule[0], false, new IClasspathAttribute[]{attribute}, false);
-		addToClasspath(getJavaProject("PathTests2"), entry);
-		entry = JavaCore.newProjectEntry(new Path("PathTests2").makeAbsolute());
-		addToClasspath(getJavaProject("PathTests1"), entry);
-		
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "testVMArgsForRequiredProjectExplicitPath");
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "PathTests1");
-		ILaunchConfigurationDelegate delegate = type.getDelegate(ILaunchManager.DEBUG_MODE);
-		assertTrue(delegate instanceof JavaLaunchDelegate);
-		JavaLaunchDelegate launcher = (JavaLaunchDelegate) delegate;
-		String arguments = launcher.getVMArguments(workingCopy);
-		String expect = "-Djava.library.path=\"" + path.toFile().getAbsolutePath() + "\"";
-		assertTrue("wrong VM args", arguments.indexOf(expect) >= 0);
-	}	
-	
-	public void testMultiVMArgsForRequiredProjectExplicitPath() throws Exception {
-		// add required project with one java library path entry
-		IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IPath path2 = ResourcesPlugin.getWorkspace().getRoot().getProject("PathTests1").getLocation();
-		IClasspathAttribute attribute = JavaRuntime.newLibraryPathsAttribute(new String[]{path.toString(), path2.toString()});
-		IClasspathEntry entry = JavaCore.newProjectEntry(new Path("PathTests3").makeAbsolute(), new IAccessRule[0], false, new IClasspathAttribute[]{attribute}, false);
-		addToClasspath(getJavaProject("PathTests2"), entry);
-		entry = JavaCore.newProjectEntry(new Path("PathTests2").makeAbsolute());
-		addToClasspath(getJavaProject("PathTests1"), entry);
-		
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "testVMArgsForRequiredProjectExplicitPath");
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "PathTests1");
-		ILaunchConfigurationDelegate delegate = type.getDelegate(ILaunchManager.DEBUG_MODE);
-		assertTrue(delegate instanceof JavaLaunchDelegate);
-		JavaLaunchDelegate launcher = (JavaLaunchDelegate) delegate;
-		String arguments = launcher.getVMArguments(workingCopy);
-		String expect = "-Djava.library.path=\"" + path.toFile().getAbsolutePath() + File.pathSeparator + path2.toFile().getAbsolutePath() + "\"";
-		assertTrue("wrong VM args", arguments.indexOf(expect) >= 0);
-	}		
-
-	public void testNoRequiredProjectExplicitPath() throws Exception {
-		// add required project with one java library path entry
-		IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IClasspathAttribute attribute = JavaRuntime.newLibraryPathsAttribute(new String[]{ path.toString()});
-		IClasspathEntry entry = JavaCore.newProjectEntry(new Path("PathTests3").makeAbsolute(), new IAccessRule[0], false, new IClasspathAttribute[]{attribute}, false);
-		addToClasspath(getJavaProject("PathTests2"), entry);
-		entry = JavaCore.newProjectEntry(new Path("PathTests2").makeAbsolute());
-		addToClasspath(getJavaProject("PathTests1"), entry);
-		
-		String[] strings = JavaRuntime.computeJavaLibraryPath(getJavaProject("PathTests1"), false);
-		assertEquals("Wrong number of entries", 0, strings.length);
-	}
-	
-	public void testStringVariablePath() throws Exception {
-		//add A.jar
-		File jar = JavaTestPlugin.getDefault().getFileInPlugin(new Path("testjars" + File.separator + "A.jar"));
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IValueVariable variable = manager.newValueVariable("a-path", "testStringVariablePath");
-		IPath rootPath = new Path(jar.getParentFile().getAbsolutePath());
-		variable.setValue(rootPath.toPortableString());
-		manager.addVariables(new IValueVariable[]{variable});
-		try {
-			String path = "${a-path}" + File.separator +"A.jar";
-			IClasspathAttribute attribute = JavaRuntime.newLibraryPathsAttribute(new String[]{path});
-			IClasspathEntry entry = JavaCore.newLibraryEntry(new Path(jar.getAbsolutePath()), null, null, new IAccessRule[0], new IClasspathAttribute[]{attribute}, false);
-			addToClasspath(getJavaProject("PathTests1"), entry);
-		
-			String[] strings = JavaRuntime.computeJavaLibraryPath(getJavaProject("PathTests1"), false);
-			assertEquals("Wrong number of entries", 1, strings.length);
-			assertEquals("Wrong entry", jar.getCanonicalFile().getCanonicalPath(), new File(strings[0]).getCanonicalPath());
-		} finally {
-			manager.removeVariables(new IValueVariable[]{variable});
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaProjectSourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaProjectSourceContainerTests.java
deleted file mode 100644
index 9e1c582..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/JavaProjectSourceContainerTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-import org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer;
-
-/**
- * Tests Java project source containers
- */
-public class JavaProjectSourceContainerTests extends AbstractDebugTest {
-	
-	public JavaProjectSourceContainerTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns a Java project source container
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	protected JavaProjectSourceContainer getContainer(IJavaProject project, boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		JavaProjectSourceContainer container = new JavaProjectSourceContainer(project);
-		director.setSourceContainers(new ISourceContainer[]{container});
-		return container;
-	}
-	
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testSourceContainerMemento() throws Exception {
-		ISourceContainer container = getContainer(getJavaProject(), false);
-		String memento = container.getType().getMemento(container);
-		ISourceContainer restore = container.getType().createSourceContainer(memento);
-		assertEquals("Directory source container memento failed", container, restore);
-	}	
-
-	public void testDefaultPackageLookup() throws Exception {
-		ISourceContainer container = getContainer(getJavaProject(), false);
-		Object[] objects = container.findSourceElements("Breakpoints.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		IFile file = (IFile) objects[0];
-		assertEquals("Wrong file", "Breakpoints.java", file.getName());
-	}
-	
-	public void testQualifiedLookup() throws Exception {
-		ISourceContainer container = getContainer(getJavaProject(), false);
-		Object[] objects = container.findSourceElements("org/eclipse/debug/tests/targets/CallLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		IFile file = (IFile) objects[0];
-		assertEquals("Wrong file", "CallLoop.java", file.getName());		
-	}
-	
-	public void testNonJavaLookup() throws Exception {
-		ISourceContainer container = getContainer(getJavaProject(), false);
-		Object[] objects = container.findSourceElements("debug/non-java.txt");
-		assertEquals("Expected 1 result", 1, objects.length);
-		IFile file = (IFile) objects[0];
-		assertEquals("Wrong file", "non-java.txt", file.getName());		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
deleted file mode 100644
index 7b74d9b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationListener;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests for launch configurations
- */
-public class LaunchConfigurationTests extends AbstractDebugTest implements ILaunchConfigurationListener {
-	
-	/**
-	 * The from/to handles during rename operations
-	 */
-	protected ILaunchConfiguration fFrom;
-	protected ILaunchConfiguration fTo;
-	
-	protected Object fLock = new Object();
-	protected ILaunchConfiguration fAdded;
-	protected ILaunchConfiguration fRemoved;
-	
-	public LaunchConfigurationTests(String name) {
-		super(name);
-	}
-	
-	/** 
-	 * Creates and returns a new launch config the given name, local
-	 * or shared, with 4 attributes:
-	 *  - String1 = "String1"
-	 *  - Int1 = 1
-	 *  - Boolean1 = true
-	 *  - Boolean2 = faslse
-	 */
-	protected ILaunchConfigurationWorkingCopy newConfiguration(IContainer container, String name) throws CoreException {
-		 ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		 assertTrue("Should support debug mode", type.supportsMode(ILaunchManager.DEBUG_MODE));
-		 assertTrue("Should support run mode", type.supportsMode(ILaunchManager.RUN_MODE));
-		 ILaunchConfigurationWorkingCopy wc = type.newInstance(container, name);
-		 wc.setAttribute("String1", "String1");
-		 wc.setAttribute("Int1", 1);
-		 wc.setAttribute("Boolean1", true);
-		 wc.setAttribute("Boolean2", false);
-		 assertTrue("Should need saving", wc.isDirty());
-		 return wc;
-	}
-		
-	/**
-	 * Returns whether the given handle is contained in the specified
-	 * array of handles.
-	 */
-	protected boolean existsIn(ILaunchConfiguration[] configs, ILaunchConfiguration config) {
-		for (int i = 0; i < configs.length; i++) {
-			if (configs[i].equals(config)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 */
-	public void testCreateLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config1");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertEquals("String1 should be String1", handle.getAttribute("String1", "Missing"), "String1");
-		 assertEquals("Int1 should be 1", handle.getAttribute("Int1", 0), 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // ensure new handle is the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle));
-		 
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}
-	
-	/**
-	 * Ensures that a launch configuration returns a complete attribute map
-	 */
-	public void testGetAttributes() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config1");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-
-		 Map attributes = handle.getAttributes();
-		 // retrieve attributes
-		 assertEquals("String1 should be String1", "String1", attributes.get("String1"));
-		 assertEquals("Int1 should be 1", new Integer(1), attributes.get("Int1"));
-		 assertEquals("Boolean1 should be true", Boolean.valueOf(true), attributes.get("Boolean1"));
-		 assertEquals("Boolean2 should be false", Boolean.valueOf(false), attributes.get("Boolean2"));
-
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}	
-	
-	/**
-	 * Ensures that set attributes works
-	 */
-	public void testSetAttributes() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config1");
-		 Map map = new HashMap();
-		 map.put("ATTR1", "ONE");
-		 map.put("ATTR2", "TWO");
-		 wc.setAttributes(map);
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-
-		 Map attributes = handle.getAttributes();
-		 assertEquals("should have two attributes", 2, attributes.size());
-		 // retrieve attributes
-		 assertEquals("ATTR1 should be ONE", "ONE", attributes.get("ATTR1"));
-		 assertEquals("ATTR2 should be TWO", "TWO", attributes.get("ATTR2"));
-
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}	
-	
-	/**
-	 * Ensures that set attributes to <code>null</code> works
-	 */
-	public void testSetNullAttributes() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config1");
-		 wc.setAttributes(null);
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-
-		 Map attributes = handle.getAttributes();
-		 assertEquals("should have no attributes", 0, attributes.size());
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}
-		
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 * Copy the configuration and ensure the original still exists.
-	 */
-	public void testLocalCopy() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "configToCopy");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // ensure new handle is the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle));
-		 
-		 ILaunchConfigurationWorkingCopy softCopy = handle.copy("CopyOf" + handle.getName());
-		 assertNull("Original in copy should be null", softCopy.getOriginal());
-		 ILaunchConfiguration hardCopy = softCopy.doSave();
-
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", hardCopy.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", hardCopy.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", hardCopy.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !hardCopy.getAttribute("Boolean2", true));		 
-		 
-		 assertTrue("Original should still exist", handle.exists());
-		 
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-		 hardCopy.delete();
-		 assertTrue("Config should not exist after deletion", !hardCopy.exists());		 		 
-	}
-		
-	/**
-	 * Create a config and save it tiwce, ensuring it only
-	 * ends up in the index once.
-	 */
-	public void testDoubleSave() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "configDoubleSave");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // ensure new handle is the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle));
-		 
-		String name = wc.getName();
-		wc.rename("newName");
-		wc.rename(name);
-		assertTrue("Should be dirty", wc.isDirty());
-		wc.doSave();
-		
-		ILaunchConfiguration[] newConfigs = getLaunchManager().getLaunchConfigurations();
-		assertTrue("Should be the same number of configs", newConfigs.length == configs.length);
-		
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-		
-	}
-		
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Deletes
-	 * the configuration and ensures it no longer exists.
-	 */
-	public void testDeleteLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config2delete");
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = wc.getLocation().toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // delete 
-		 handle.delete();		 
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // ensure handle is not in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should not exist in project index", !existsIn(configs, handle));		 
-	}	
-	
-	/**
-	 * Creates a local working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Renames
-	 * the configuration and ensures it's old config no longer exists,
-	 * and that attributes are retrievable from the new (renamed) config.
-	 */
-	public void testRenameLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config2rename");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // rename
-		 wc = handle.getWorkingCopy();
-		 wc.rename("config-2-rename");
-		 addConfigListener();
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 removeConfigListener();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 assertEquals("From should be original", handle, fFrom);
-		 assertEquals("To should be new handle", newHandle, fTo);
-		 
-		 // retrieve new attributes
-		 assertTrue("String1 should be String1", newHandle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", newHandle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", newHandle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !newHandle.getAttribute("Boolean2", true));		 
-
-		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Renamed configuration should exist in project index", existsIn(configs, newHandle));		 
-		 assertTrue("Original configuration should NOT exist in project index", !existsIn(configs, handle));	
-		 
-		 // cleanup
-		 newHandle.delete();
-		 assertTrue("Config should not exist after deletion", !newHandle.exists());		 	 
-	}	
-	
-	/**
-	 * Moves a local configuration to a shared location
-	 */
-	public void testMoveLocalToSharedConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(null, "config2share");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-
-		 // move
-		 wc = handle.getWorkingCopy();
-		 wc.setContainer(getJavaProject().getProject());
-		 addConfigListener();
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 removeConfigListener();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 assertEquals("From should be original", handle, fFrom);
-		 assertEquals("To should be new handle", newHandle, fTo);
-
-		 // retrieve new attributes
-		 assertTrue("String1 should be String1", newHandle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", newHandle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", newHandle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !newHandle.getAttribute("Boolean2", true));
-
-		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Renamed configuration should exist in project index", existsIn(configs, newHandle));
-		 assertTrue("Original configuration should NOT exist in project index", !existsIn(configs, handle));
-
-		 // cleanup
-		 newHandle.delete();
-		 assertTrue("Config should not exist after deletion", !newHandle.exists());
-	}	
-	
-	/**
-	 * Moves a local configuration to a shared location
-	 */
-	public void testMoveSharedToLocalConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "config2local");
-		 IPath location = wc.getLocation();
-		 ILaunchConfiguration handle = wc.doSave();
-		 File file = location.toFile();
-		 assertTrue("Configuration file should exist", file.exists());
-
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-
-		 // move
-		 wc = handle.getWorkingCopy();
-		 wc.setContainer(null);
-		 addConfigListener();
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 removeConfigListener();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 assertEquals("From should be original", handle, fFrom);
-		 assertEquals("To should be new handle", newHandle, fTo);
-
-		 // retrieve new attributes
-		 assertTrue("String1 should be String1", newHandle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", newHandle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", newHandle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !newHandle.getAttribute("Boolean2", true));
-
-		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Renamed configuration should exist in project index", existsIn(configs, newHandle));
-		 assertTrue("Original configuration should NOT exist in project index", !existsIn(configs, handle));
-
-		 // cleanup
-		 newHandle.delete();
-		 assertTrue("Config should not exist after deletion", !newHandle.exists());
-	}		
-	
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 */
-	public void testCreateSharedConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "config2");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
- 		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle)); 
-		 
- 		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-	}	
-	
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes.
-	 * Copies the configuration and ensures the original still exists.
-	 */
-	public void testSharedCopy() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "config2Copy");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
- 		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should exist in project index", existsIn(configs, handle)); 
-		 
-		 // copy 
-		 ILaunchConfigurationWorkingCopy softCopy = handle.copy("CopyOf" + handle.getName());
-		 ILaunchConfiguration hardCopy = softCopy.doSave();
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", hardCopy.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", hardCopy.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", hardCopy.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !hardCopy.getAttribute("Boolean2", true));		 
-		 
-		 assertTrue("Original should still exist", handle.exists());
-		 
-		 // cleanup
-		 handle.delete();
-		 assertTrue("Config should not exist after deletion", !handle.exists());
-		 hardCopy.delete();
-		 assertTrue("Config should not exist after deletion", !hardCopy.exists());		 		 		 
-	}		
-	
-
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Deletes
-	 * the configuration and ensures it no longer exists.
-	 */
-	public void testDeleteSharedConfiguration() throws CoreException {
- 		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "shared2delete");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // delete 
-		 handle.delete();		 
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // ensure handle is not in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Configuration should not exist in project index", !existsIn(configs, handle));		 
-	}	
-	
-	/**
-	 * Creates a shared working copy configuration, sets some attributes,
-	 * and saves the working copy, and retrieves the attributes. Renames
-	 * the configuration and ensures it's old config no longer exists,
-	 * and that attributes are retrievable from the new (renamed) config.
-	 */
-	public void testRenameSharedConfiguration() throws CoreException {
-		 ILaunchConfigurationWorkingCopy wc = newConfiguration(getJavaProject().getProject(), "shared2rename");
-		 ILaunchConfiguration handle = wc.doSave();
-		 assertTrue("Configuration should exist", handle.exists());
-		 
-		 // retrieve attributes
-		 assertTrue("String1 should be String1", handle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", handle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", handle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !handle.getAttribute("Boolean2", true));
-		 
-		 // rename
-		 wc = handle.getWorkingCopy();
-		 wc.rename("shared-2-rename");
-		 addConfigListener();
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 removeConfigListener();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 assertEquals("From should be original", handle, fFrom);
-		 assertEquals("To should be new handle", newHandle, fTo);		 
-		 
-		 // retrieve new attributes
-		 assertTrue("String1 should be String1", newHandle.getAttribute("String1", "Missing").equals("String1"));
-		 assertTrue("Int1 should be 1", newHandle.getAttribute("Int1", 0) == 1);
-		 assertTrue("Boolean1 should be true", newHandle.getAttribute("Boolean1", false));
-		 assertTrue("Boolean2 should be false", !newHandle.getAttribute("Boolean2", true));		 
-
-		 // ensure new handle is in the index
-		 ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
-		 assertTrue("Renamed configuration should exist in project index", existsIn(configs, newHandle));		 
-		 assertTrue("Original configuration should NOT exist in project index", !existsIn(configs, handle));		 
-		 
-		 // cleanup
-		 newHandle.delete();
-		 assertTrue("Config should not exist after deletion", !newHandle.exists());		 
-	}
-	
-	/** 
-	 * Creates a few configs, closes the project and re-opens the
-	 * project to ensure the config index is persisted properly
-	 */
-	public void testPersistIndex() throws CoreException {
-		ILaunchConfigurationWorkingCopy wc1 = newConfiguration(null, "persist1local");
-		ILaunchConfigurationWorkingCopy wc2 = newConfiguration(getJavaProject().getProject(), "persist2shared");
-		ILaunchConfiguration lc1 = wc1.doSave();
-		ILaunchConfiguration lc2 = wc2.doSave();
-		
-		IProject project = getJavaProject().getProject();
-		ILaunchConfiguration[] before = getLaunchManager().getLaunchConfigurations();
-		assertTrue("config should be in index", existsIn(before, lc1));
-		assertTrue("config should be in index", existsIn(before, lc2));
-		
-		project.close(null);
-		ILaunchConfiguration[] during = getLaunchManager().getLaunchConfigurations();
-		boolean local = true;
-		for (int i = 0; i < during.length; i++) {
-			local = local && during[i].isLocal();
-		}
-		assertTrue("Should only be local configs when closed", local);
-		
-		project.open(null);
-		ILaunchConfiguration[] after = getLaunchManager().getLaunchConfigurations();
-		assertTrue("Should be same number of configs after openning", after.length == before.length);
-		for (int i = 0; i < before.length; i++) {
-			assertTrue("Config should exist after openning", existsIn(after, before[i]));
-		}
-
-		 // cleanup
-		 lc1.delete();
-		 assertTrue("Config should not exist after deletion", !lc1.exists());
-		 lc2.delete();
-		 assertTrue("Config should not exist after deletion", !lc2.exists());		 
-		 
-		
-	}	
-		
-		
-	/**
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void launchConfigurationAdded(ILaunchConfiguration configuration) {
-		fFrom = getLaunchManager().getMovedFrom(configuration);
-		synchronized (fLock) {
-		    fAdded = configuration;
-		    fLock.notifyAll();
-        }
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void launchConfigurationChanged(ILaunchConfiguration configuration) {
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
-		fTo = getLaunchManager().getMovedTo(configuration);
-		synchronized (fLock) {
-		    fRemoved = configuration;
-		    fLock.notifyAll();
-        }
-	}
-
-	protected void addConfigListener() {
-		getLaunchManager().addLaunchConfigurationListener(this);
-	}
-	
-	protected void removeConfigListener() {
-		getLaunchManager().removeLaunchConfigurationListener(this);
-	}
-	
-	/**
-	 * Ensures that a removal notification is sent for a shared config in a project
-	 * that is deleted.
-	 *  
-	 * @throws Exception
-	 */
-	public void testDeleteProjectWithSharedConfig() throws Exception {
-	   IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("DeleteSharedConfig");
-	   try {
-		   assertFalse("project should not exist yet", project.exists());
-		   project.create(null);
-		   assertTrue("project should now exist", project.exists());
-		   project.open(null);
-		   assertTrue("project should be open", project.isOpen());
-		   ILaunchConfigurationWorkingCopy wc = newConfiguration(project, "ToBeDeleted");
-		   
-		   addConfigListener();
-		   ILaunchConfiguration configuration = wc.doSave();
-		   assertEquals(configuration, fAdded);
-		   
-		   synchronized (fLock) {
-		       fRemoved = null;
-		       project.delete(true, false, null);
-		       if (fRemoved == null) {
-		           fLock.wait(10000);
-		       }
-		   }
-		   assertEquals(configuration, fRemoved);
-	   } finally {
-	       if (project.exists()) {
-	           project.delete(true, false, null);
-	       }
-	       removeConfigListener();
-	   }
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchDelegateTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchDelegateTests.java
deleted file mode 100644
index a3f8ee1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchDelegateTests.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.sourcelookup.ISourcePathComputer;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests for launch delegates
- */
-public class LaunchDelegateTests extends AbstractDebugTest {
-	
-	public LaunchDelegateTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Ensures a launch delegate can provide a launch object for
-	 * a launch.
-	 */
-	public void testProvideLaunch() throws CoreException {
-		ILaunchManager manager = getLaunchManager();
-		ILaunchConfigurationType configurationType = manager.getLaunchConfigurationType("org.eclipse.jdt.debug.tests.testConfigType");
-		assertNotNull("Missing test launch config type", configurationType);
-		ILaunchConfigurationWorkingCopy workingCopy = configurationType.newInstance(null, "provide-launch-object");
-		// delegate will throw exception if test fails
-		ILaunch launch = workingCopy.launch(ILaunchManager.DEBUG_MODE, null);
-		manager.removeLaunch(launch);
-	}
-	
-	/**
-	 * Tests that a delegate extension can provide the source path computer.
-	 * 
-	 * @throws CoreException
-	 */
-	public void testSourcePathComputerExtension() throws CoreException {
-		ILaunchManager manager = getLaunchManager();
-		ILaunchConfigurationType configurationType = manager.getLaunchConfigurationType("org.eclipse.jdt.debug.tests.testConfigType");
-		assertNotNull("Missing test launch config type", configurationType);
-		ISourcePathComputer sourcePathComputer = configurationType.getSourcePathComputer();
-		assertEquals("Wrond source path computer", "org.eclipse.jdt.debug.tests.testSourcePathComputer", sourcePathComputer.getId());
-	}
-	
-	/**
-	 * Tests that a delegate extension can provide the source locator.
-	 * 
-	 * @throws CoreException
-	 */
-	public void testSourceLocatorExtension() throws CoreException {
-		ILaunchManager manager = getLaunchManager();
-		ILaunchConfigurationType configurationType = manager.getLaunchConfigurationType("org.eclipse.jdt.debug.tests.testConfigType");
-		assertNotNull("Missing test launch config type", configurationType);
-		String sourceLocatorId = configurationType.getSourceLocatorId();
-		assertEquals("Wrond source locater id", "org.eclipse.jdt.debug.tests.testSourceLocator", sourceLocatorId);
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchModeTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchModeTests.java
deleted file mode 100644
index 8a547eb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchModeTests.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import junit.framework.AssertionFailedError;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.ILaunchMode;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationPresentationManager;
-import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.testplugin.TestModeLaunchDelegate;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaMainTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.JavaUI;
-
-/**
- * LaunchModeTests
- */
-public class LaunchModeTests extends AbstractDebugTest {
-	
-	private ILaunchConfiguration fConfiguration;
-	private String fMode;
-
-	/**
-	 * @param name
-	 */
-	public LaunchModeTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Called by launch "TestModeLaunchDelegate" delegate when launch method invoked.
-	 * 
-	 * @param configuration
-	 * @param mode
-	 * @param launch
-	 */
-	public synchronized void launch(ILaunchConfiguration configuration, String mode) {
-		fConfiguration = configuration;
-		fMode = mode;
-		notifyAll();
-	}
-
-	/**
-	 * Tests that launch delegate for "TEST_MODE" and Java apps is invoked when
-	 * "TEST_MODE" is used.
-	 * 
-	 * @throws CoreException
-	 * @see TestModeLaunchDelegate
-	 */
-	public void testContributedLaunchMode() throws CoreException {
-		ILaunch launch = null;
-		try {
-			fConfiguration = null;
-			fMode = null;
-			TestModeLaunchDelegate.setTestCase(this);
-			ILaunchConfiguration configuration = getLaunchConfiguration("Breakpoints");
-			assertNotNull(configuration);
-			launch = configuration.launch("TEST_MODE", null);
-			assertEquals("Launch delegate not invoked", configuration, getLaunchConfigurationSetByDelegate());
-			assertEquals("Launch delegate not invoked in correct mode", "TEST_MODE", fMode);
-		} finally {
-			TestModeLaunchDelegate.setTestCase(null);
-			fConfiguration = null;
-			fMode = null;
-			if (launch != null) {
-				getLaunchManager().removeLaunch(launch);
-			}
-		}
-	}
-	
-	/**
-	 * Returns the launch configuration set by the TestModeLaunchDelegate , or <code>null</code>
-	 * if no launch configuration was set (the correct delegate was not called).
-	 * A wait must occur due to the use of Jobs for launching.
-	 */
-	private synchronized Object getLaunchConfigurationSetByDelegate() {
-		if (fConfiguration == null) {
-			try {
-				wait(10000);
-			} catch (InterruptedException ie) {
-				System.err.println("Interrupted waiting for launch configuration");
-			}
-		}
-		
-		return fConfiguration;
-	}
-	
-	/**
-	 * Ensure our contributed launch mode exists.
-	 */
-	public void testLaunchModes() {
-		ILaunchMode[] modes = getLaunchManager().getLaunchModes();
-		String[] ids = new String[modes.length];
-		for (int i = 0; i < modes.length; i++) {
-			ILaunchMode mode = modes[i];
-			ids[i] = mode.getIdentifier();
-		}
-		assertContains("Missing TEST_MODE", ids, "TEST_MODE");
-		assertContains("Missing debug mode", ids, ILaunchManager.DEBUG_MODE);
-		assertContains("Missing run mode", ids, ILaunchManager.RUN_MODE);
-	}
-	
-	/**
-	 * Asserts that the array contains the given object
-	 */
-	static public void assertContains(String message, Object[] array, Object object) {
-		for (int i = 0; i < array.length; i++) {
-			if (array[i].equals(object)) {
-				return;
-			}			
-		}
-		throw new AssertionFailedError(message);
-	}	
-	
-	/**
-	 * Ensure our contributed mode is supported.
-	 *
-	 */
-	public void testSupportsMode() throws CoreException {
-		ILaunchConfiguration configuration = getLaunchConfiguration("Breakpoints");
-		assertNotNull(configuration);
-		assertTrue("Java application configuration should support TEST_MODE", configuration.supportsMode("TEST_MODE"));
-		assertTrue("Java application type should support TEST_MODE", configuration.getType().supportsMode("TEST_MODE"));
-		
-		assertTrue("Java application configuration should support debug mode", configuration.supportsMode(ILaunchManager.DEBUG_MODE));
-		assertTrue("Java application type should support debug mode", configuration.getType().supportsMode(ILaunchManager.DEBUG_MODE));
-		
-		assertTrue("Java application configuration should support run mode", configuration.supportsMode(ILaunchManager.RUN_MODE));
-		assertTrue("Java application type should support run mode", configuration.getType().supportsMode(ILaunchManager.RUN_MODE));		
-	}
-	
-	/**
-	 * Tests that mode specific tab group contributions work.
-	 */
-	public void testModeSpecificTabGroups() throws CoreException {
-		ILaunchConfigurationType javaType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION); 
-		ILaunchConfigurationTabGroup standardGroup = LaunchConfigurationPresentationManager.getDefault().getTabGroup(javaType, ILaunchManager.DEBUG_MODE);
-		ILaunchConfigurationTabGroup testGroup = LaunchConfigurationPresentationManager.getDefault().getTabGroup(javaType, "TEST_MODE");
-		ILaunchConfigurationDialog dialog = new LaunchConfigurationsDialog(null, DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(IDebugUIConstants.ID_DEBUG_LAUNCH_GROUP));
-		standardGroup.createTabs(dialog, ILaunchManager.DEBUG_MODE);
-		testGroup.createTabs(dialog, "TEST_MODE");
-		
-		ILaunchConfigurationTab[] tabs = standardGroup.getTabs();
-		assertEquals("Wrong number of tabs in the standard group", 7, tabs.length);
-		assertTrue("Tab 0 should be 'Main'", tabs[0] instanceof JavaMainTab);
-		assertTrue("Tab 1 should be 'Arguments'", tabs[1] instanceof JavaArgumentsTab);
-		assertTrue("Tab 2 should be 'JRE'", tabs[2] instanceof JavaJRETab);
-		assertTrue("Tab 3 should be 'Classpath'", tabs[3] instanceof JavaClasspathTab);
-		assertTrue("Tab 4 should be 'Sourcepath'", tabs[4] instanceof SourceLookupTab);
-		assertTrue("Tab 5 should be 'Environment'", tabs[5] instanceof EnvironmentTab);
-		assertTrue("Tab 6 should be 'Common'", tabs[6] instanceof CommonTab);
-		
-		tabs = testGroup.getTabs();
-		assertEquals("Wrong number of tabs in the test group", 4, tabs.length);
-		assertTrue("Tab 0 should be 'Main'", tabs[0] instanceof JavaMainTab);
-		assertTrue("Tab 1 should be 'Arguments'", tabs[1] instanceof JavaArgumentsTab);
-		assertTrue("Tab 2 should be 'JRE'", tabs[2] instanceof JavaJRETab);
-		assertTrue("Tab 3 should be 'Classpath'", tabs[3] instanceof JavaClasspathTab);
-		
-		standardGroup.dispose();
-		testGroup.dispose();
-	}
-	
-	/**
-	 * Tests that the default debug persepctive for java apps is debug.
-	 */
-	public void testDefaultDebugLaunchPerspective() {
-		ILaunchConfigurationType javaType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		assertEquals("Java debug persepctive should be debug", IDebugUIConstants.ID_DEBUG_PERSPECTIVE,
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.DEBUG_MODE));
-	}
-	
-	/**
-	 * Tests that the default run persepctive for java apps is none (<code>null</code>).
-	 */
-	public void testDefaultRunLaunchPerspective() {
-		ILaunchConfigurationType javaType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		assertNull("Java run persepctive should be null", 
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.RUN_MODE));
-	}	
-	
-	/**
-	 * Tests that the default debug perspective can be overriden and reset
-	 */
-	public void testResetDebugLaunchPerspective() {
-		ILaunchConfigurationType javaType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		assertEquals("Java debug persepctive should be debug", IDebugUIConstants.ID_DEBUG_PERSPECTIVE,
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.DEBUG_MODE));
-		// set to NONE
-		DebugUITools.setLaunchPerspective(javaType, ILaunchManager.DEBUG_MODE, IDebugUIConstants.PERSPECTIVE_NONE);
-		assertNull("Java debug persepctive should now be null", 
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.DEBUG_MODE));
-		// re-set to default
-		DebugUITools.setLaunchPerspective(javaType, ILaunchManager.DEBUG_MODE, IDebugUIConstants.PERSPECTIVE_DEFAULT);
-		assertEquals("Java debug persepctive should now be debug", IDebugUIConstants.ID_DEBUG_PERSPECTIVE,
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.DEBUG_MODE));
-				
-	}	
-	
-	/**
-	 * Tests that the default run perspective can be overriden and reset
-	 */
-	public void testResetRunLaunchPerspective() {
-		ILaunchConfigurationType javaType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		assertNull("Java run persepctive should be null", 
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.RUN_MODE));
-		// set to Java perspective
-		DebugUITools.setLaunchPerspective(javaType, ILaunchManager.RUN_MODE, JavaUI.ID_PERSPECTIVE);
-		assertEquals("Java run persepctive should now be java", JavaUI.ID_PERSPECTIVE,
-					DebugUITools.getLaunchPerspective(javaType, ILaunchManager.RUN_MODE));
-		// re-set to default
-		DebugUITools.setLaunchPerspective(javaType, ILaunchManager.RUN_MODE, IDebugUIConstants.PERSPECTIVE_DEFAULT);
-		assertNull("Java run persepctive should now be null", 
-			DebugUITools.getLaunchPerspective(javaType, ILaunchManager.RUN_MODE));		
-	}	
-	
-	/**
-	 * Tests a perspective contributed with a launch tab group.
-	 */
-	public void testContributedLaunchPerspective() {
-		ILaunchConfigurationType javaType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		assertEquals("persepctive for TEST_MODE should be 'java'", JavaUI.ID_PERSPECTIVE,
-			DebugUITools.getLaunchPerspective(javaType, "TEST_MODE"));
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchTests.java
deleted file mode 100644
index 5009ca4..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchTests.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchListener;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests launch notification.
- */
-public class LaunchTests extends AbstractDebugTest implements ILaunchListener {
-	
-	private boolean added = false;
-	private boolean removed = false;
-	private boolean terminated = false; 
-	
-	public LaunchTests(String name) {
-		super(name);
-	}
-
-	public void testLaunchNotification() throws CoreException {
-		String typeName = "Breakpoints";		
-
-		ILaunchConfiguration configuration = getLaunchConfiguration(typeName);
-		getLaunchManager().addLaunchListener(this);
-		ILaunch launch = configuration.launch(ILaunchManager.DEBUG_MODE, null);
-		synchronized (this) {
-			if (!added) {
-				try {
-					wait(30000);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-		assertTrue("Launch should have been added", added);
-
-		synchronized (this) {
-			for (int i= 0; i < 300; i++) {
-				if (launch.isTerminated()) {
-					terminated= true;
-					break;
-				}
-				try {
-					Thread.sleep(100);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-		assertTrue("Launch should have been terminated", terminated);
-		
-		getLaunchManager().removeLaunch(launch);
-		
-		synchronized (this) {
-			if (!removed) {
-				try {
-					wait(30000);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-		assertTrue("Launch should have been removed", removed);		
-	}
-	
-	/**
-	 * Tests launching an unregistered launch.
-	 * 
-	 * @throws Exception
-	 */
-	public void testUnregisteredLaunch() throws Exception {
-	   String typeName = "Breakpoints";
-	   createLineBreakpoint(52, typeName);
-	   IJavaThread thread = null;
-       try {
-           thread = launchToBreakpoint(typeName, false);
-           assertNotNull("Breakpoint not hit within timeout period", thread);
-           ILaunch launch = thread.getLaunch();
-           assertFalse("Launch should not be registered", DebugPlugin.getDefault().getLaunchManager().isRegistered(launch));
-       } finally {
-           terminateAndRemove(thread);
-           removeAllBreakpoints();
-       }	   
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch)
-	 */
-	public synchronized void launchRemoved(ILaunch launch) {
-		removed = true;
-		notifyAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch)
-	 */
-	public synchronized void launchAdded(ILaunch launch) {
-		added = true;
-		notifyAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch)
-	 */
-	public synchronized void launchChanged(ILaunch launch) {
-
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchesTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchesTests.java
deleted file mode 100644
index 7fa5085..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchesTests.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.ILaunchesListener2;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests launch notification plural
- */
-public class LaunchesTests extends AbstractDebugTest implements ILaunchesListener2 {
-	
-	private boolean added = false;
-	private boolean removed = false;
-	private boolean terminated = false; 
-	
-	public LaunchesTests(String name) {
-		super(name);
-	}
-
-	public void testDeferredBreakpoints() throws CoreException {
-		String typeName = "Breakpoints";		
-
-		ILaunchConfiguration configuration = getLaunchConfiguration(typeName);
-		getLaunchManager().addLaunchListener(this);
-		ILaunch launch = configuration.launch(ILaunchManager.DEBUG_MODE, null);
-		synchronized (this) {
-			if (!added) {
-				try {
-					wait(30000);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-		assertTrue("Launch should have been added", added);
-
-		synchronized (this) {
-			if (!terminated) {
-				try {
-					wait(30000);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-		assertTrue("Launch should have been terminated", terminated);
-		
-		getLaunchManager().removeLaunch(launch);
-		
-		synchronized (this) {
-			if (!removed) {
-				try {
-					wait(30000);
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-		assertTrue("Launch should have been removed", removed);		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[])
-	 */
-	public synchronized void launchesTerminated(ILaunch[] launches) {
-		terminated = true;
-		notifyAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
-	 */
-	public synchronized void launchesRemoved(ILaunch[] launches) {
-		removed = true;
-		notifyAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
-	 */
-	public synchronized void launchesAdded(ILaunch[] launches) {
-		added = true;
-		notifyAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchChanged(org.eclipse.debug.core.ILaunch[])
-	 */
-	public synchronized void launchesChanged(ILaunch[] launches) {
-
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java
deleted file mode 100644
index 9072714..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LineTrackerTests.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.testplugin.ConsoleLineTracker;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.console.JavaExceptionHyperLink;
-import org.eclipse.jdt.internal.debug.ui.console.JavaStackTraceHyperlink;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.console.IHyperlink;
-import org.eclipse.ui.console.IOConsole;
-
-/**
- * Tests console line tracker.
- */
-public class LineTrackerTests extends AbstractDebugTest implements IConsoleLineTrackerExtension {
-	
-	protected String[] fLines = new String[] {
-		"one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"
-	};
-	
-	protected IJavaDebugTarget fTarget;
-	
-	protected List fLinesRead = new ArrayList();
-	
-	protected boolean fStarted = false;
-	
-	protected boolean fStopped = false;
-	
-	protected IConsole fConsole = null;
-	
-	protected Object fLock = new Object();
-	
-	public LineTrackerTests(String name) {
-		super(name);
-	}
-	
-    protected void setUp() throws Exception {
-        super.setUp();
-        fStarted = false;
-        fStopped = false;
-    }
-	public void testSimpleLineCounter() throws Exception {
-		ConsoleLineTracker.setDelegate(this);
-		fTarget = null;
-		try {
-			fTarget = launchAndTerminate("OneToTen");
-			synchronized (fLock) {
-			    if (!fStopped) {
-			        fLock.wait(30000);
-			    }
-			}
-			assertTrue("Never received 'start' notification", fStarted);
-			assertTrue("Never received 'stopped' notification", fStopped);
-			// there are 10 lines and one "empty line" (i.e. the last "new line")
-			assertEquals("Wrong number of lines output", 11, fLinesRead.size());
-			for (int i = 0; i < 10; i++) {
-				assertEquals("Line " + i + " not equal", fLines[i], fLinesRead.get(i));			
-			}
-			assertEquals("Should be an empty last line", "", fLinesRead.get(10));
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			terminateAndRemove(fTarget);
-		}
-	} 
-	
-	/**
-	 * This program prints the final line without a new line
-	 * @throws Exception
-	 */
-	public void testNoPrintln() throws Exception {
-		ConsoleLineTracker.setDelegate(this);
-		fTarget = null;
-		try {
-			fTarget = launchAndTerminate("OneToTenPrint");
-			synchronized (fLock) {
-			    if (!fStopped) {
-			        fLock.wait(30000);
-			    }
-            }
-			assertTrue("Never received 'start' notification", fStarted);
-			assertTrue("Did not receive 'stopped' notification", fStopped);
-			assertEquals("Wrong number of lines", 10, fLinesRead.size());
-			for (int i = 0; i < 10; i++) {
-				assertEquals("Line " + i + " not equal", fLines[i], fLinesRead.get(i));			
-			}
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			terminateAndRemove(fTarget);
-		}
-	} 
-	
-	/**
-	 * Test 10,000 lines of output.
-	 * 
-	 * @throws Exception
-	 */
-	public void testFlood() throws Exception {
-		ConsoleLineTracker.setDelegate(this);
-		ILaunch launch = null;
-		try {
-			ILaunchConfiguration config = getLaunchConfiguration("FloodConsole");
-			assertNotNull("Could not locate launch configuration", config);
-			launch = config.launch(ILaunchManager.RUN_MODE, null);
-			
-			synchronized (fLock) {
-			    if (!fStopped) {
-			        fLock.wait(480000);
-			    }
-			}
-			assertTrue("Never received 'start' notification", fStarted);
-			assertTrue("Never received 'stopped' notification", fStopped);
-			// Should be 10,000 lines
-			assertEquals("Wrong number of lines", 10000, fLinesRead.size());
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			launch.getProcesses()[0].terminate();
-			DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);
-		}
-	} 	
-	
-	public void testHyperLink() throws Exception {
-	    try {
-			ConsoleLineTracker.setDelegate(this);
-			fTarget = launchAndTerminate("ThrowsNPE");
-			getHyperlink(0, ConsoleLineTracker.getDocument());
-	    } finally {
-	        ConsoleLineTracker.setDelegate(null);
-	        terminateAndRemove(fTarget);
-	    }
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public void init(IConsole console) {
-		fConsole = console;
-		fStarted = true;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		if (fStarted) {
-			try {
-				String text = fConsole.getDocument().get(line.getOffset(), line.getLength());
-				fLinesRead.add(text);
-			} catch (BadLocationException e) {
-			    e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#streamClosed()
-	 */
-	public void consoleClosed() {
-	    synchronized (fLock) {
-			fStopped = true;
-			fLock.notifyAll();
-        }
-	}
-	
-	/**
-	 * Tests that stack traces appear with hyperlinks
-	 */
-	public void testStackTraces() throws Exception {
-		ConsoleLineTracker.setDelegate(this);
-		fTarget = null;
-		IPreferenceStore jdiUIPreferences = JDIDebugUIPlugin.getDefault().getPreferenceStore();
-		boolean suspendOnException = jdiUIPreferences.getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS);
-		jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-		try {
-			fTarget = launchAndTerminate("StackTraces");
-			synchronized (fLock) {
-			    if (!fStopped) {
-			        fLock.wait(30000);
-			    }
-			}
-			assertTrue("Never received 'start' notification", fStarted);
-			assertTrue("Never received 'stopped' notification", fStopped);
-			assertTrue("Console should be an IOCosnole", fConsole instanceof IOConsole);
-			IOConsole console = (IOConsole)fConsole;
-			IHyperlink[] hyperlinks = console.getHyperlinks();
-			// should be 100 exception hyperlinks
-			int total = 0;
-			for (int i = 0; i < hyperlinks.length; i++) {
-                IHyperlink hyperlink = hyperlinks[i];
-                if (hyperlink instanceof JavaExceptionHyperLink) {
-                    total++;
-                    // should be followed by a stack trace hyperlink
-                    assertTrue("Stack trace hyperlink missing", hyperlinks[i + 1] instanceof JavaStackTraceHyperlink);
-                }
-            }
-			assertEquals("Wrong number of exception hyperlinks", 100, total);
-		} finally {
-			ConsoleLineTracker.setDelegate(null);
-			jdiUIPreferences.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, suspendOnException);
-			terminateAndRemove(fTarget);
-		}	    
-	}
-	
-	public void testStringConcatenation() throws Exception {
-	    ConsoleLineTracker.setDelegate(this);
-	    String typeName = "PrintConcatenation";
-	    createConditionalLineBreakpoint(20, typeName, "System.out.println(\"var = \" + foo); return false;", true);
-	    fTarget = null;
-	    try {
-	        fTarget = launchAndTerminate(typeName);
-	        synchronized (fLock) {
-			    if (!fStopped) {
-			        fLock.wait(30000);
-			    }
-			}
-	        assertTrue("Never received 'start' notification", fStarted);
-			assertTrue("Never received 'stopped' notification", fStopped);
-			assertEquals("Wrong number of lines output", 2, fLinesRead.size());
-			assertEquals("Wrong output", "var = foo", fLinesRead.get(0));
-	    } finally {
-	        ConsoleLineTracker.setDelegate(null);
-	        removeAllBreakpoints();
-	        terminateAndRemove(fTarget);
-	    }
-	}
-	
-	public void testIntConcatenation() throws Exception {
-	    ConsoleLineTracker.setDelegate(this);
-	    String typeName = "PrintConcatenation";
-	    createConditionalLineBreakpoint(20, typeName, "System.out.println(\"var = \" + x); return false;", true);
-	    fTarget = null;
-	    try {
-	        fTarget = launchAndTerminate(typeName);
-	        synchronized (fLock) {
-			    if (!fStopped) {
-			        fLock.wait(30000);
-			    }
-			}
-	        assertTrue("Never received 'start' notification", fStarted);
-			assertTrue("Never received 'stopped' notification", fStopped);
-			assertEquals("Wrong number of lines output", 2, fLinesRead.size());
-			assertEquals("Wrong output", "var = 35", fLinesRead.get(0));
-	    } finally {
-	        ConsoleLineTracker.setDelegate(null);
-	        removeAllBreakpoints();
-	        terminateAndRemove(fTarget);
-	    }
-	}	
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
deleted file mode 100644
index 629b3af..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class LocalVariableTests extends AbstractDebugTest {
-	
-	public LocalVariableTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleVisibility() throws Exception {
-		String typeName = "LocalVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(18, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IJavaVariable[] vars = frame.getLocalVariables();
-			assertEquals("Should be no visible locals", 0, vars.length);
-			
-			stepOver(frame);
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			stepOver(frame);
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			
-			vars = frame.getLocalVariables();
-			assertEquals("Should be one visible local", 1, vars.length);			
-			assertEquals("Visible var should be 'i1'", "i1", vars[0].getName());
-			
-			stepOver(frame);
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			stepOver(frame);
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			
-			vars = frame.getLocalVariables();
-			assertEquals("Should be two visible locals", 2, vars.length);			
-			assertEquals("Visible var 1 should be 'i1'", "i1", vars[0].getName());			
-			assertEquals("Visible var 2 should be 'i2'", "i2", vars[1].getName());
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testEvaluationAssignments() throws Exception {
-		String typeName = "LocalVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(22, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IJavaDebugTarget target = (IJavaDebugTarget)frame.getDebugTarget();
-			IVariable i1 = findVariable(frame, "i1");
-			assertNotNull("Could not find variable 'i1'", i1);
-			assertEquals("'i1' value should be '0'", target.newValue(0), i1.getValue());
-			
-			IVariable i2 = findVariable(frame, "i2");
-			assertNotNull("Could not find variable 'i2'", i2);
-			assertEquals("'i2' value should be '1'", target.newValue(1), i2.getValue());
-						
-			evaluate("i1 = 73;", frame);			
-			// the value should have changed
-			assertEquals("'i1' value should be '73'", target.newValue(73), i1.getValue());
-			
-			evaluate("i2 = i1;", frame);
-			// the value should have changed
-			assertEquals("'i2' value should be '73'", target.newValue(73), i2.getValue());
-			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MemoryRenderingTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MemoryRenderingTests.java
deleted file mode 100644
index 18c84ed..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MemoryRenderingTests.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.memory.IMemoryRenderingBindingsListener;
-import org.eclipse.debug.ui.memory.IMemoryRenderingManager;
-import org.eclipse.debug.ui.memory.IMemoryRenderingType;
-import org.eclipse.jdt.debug.testplugin.DynamicRenderingBindings;
-import org.eclipse.jdt.debug.testplugin.MemoryBlockDynamic;
-import org.eclipse.jdt.debug.testplugin.MemoryBlockOne;
-import org.eclipse.jdt.debug.testplugin.MemoryBlockThree;
-import org.eclipse.jdt.debug.testplugin.MemoryBlockTwo;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests memory rendering manager
- */
-public class MemoryRenderingTests extends AbstractDebugTest {
-	
-	public MemoryRenderingTests(String name) {
-		super(name);
-	}
-
-	public void testRenderingTypes() {
-		IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-		IMemoryRenderingType[] types = manager.getRenderingTypes();
-		assertEquals("Wrong number of rendering typess contributed", 7, types.length);
-		assertTrue("Missing type 1", indexOf(manager.getRenderingType("rendering_type_1"), types) >= 0);
-        assertTrue("Missing type 2", indexOf(manager.getRenderingType("rendering_type_2"), types) >= 0);
-        assertTrue("Missing type 3", indexOf(manager.getRenderingType("rendering_type_3"), types) >= 0);
-        assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.raw_memory"), types) >= 0);
-        assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.ascii"), types) >= 0);
-        assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.signedint"), types) >= 0);
-        assertTrue("Missing type", indexOf(manager.getRenderingType("org.eclipse.debug.ui.rendering.unsignedint"), types) >= 0);
-	}
-	
-	public void testRenderingTypeNames() {
-		IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-		IMemoryRenderingType type = manager.getRenderingType("rendering_type_1");
-		assertEquals("Wrong name", "Rendering One", type.getLabel());
-		type = manager.getRenderingType("rendering_type_2");
-		assertEquals("Wrong name", "Rendering Two", type.getLabel());
-	}
-
-	public void testSingleBinding() {
-		IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-		IMemoryBlock block = new MemoryBlockOne();
-		IMemoryRenderingType[] types = manager.getRenderingTypes(block);
-		assertEquals("Wrong number of bindings", 1, types.length);
-		assertEquals("Wrong binding", "rendering_type_1", types[0].getId());
-	}
-	
-	public void testDoubleBinding() {
-		IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-		IMemoryBlock block = new MemoryBlockTwo();
-		IMemoryRenderingType[] types = manager.getRenderingTypes(block);
-		assertEquals("Wrong number of bindings", 2, types.length);
-		assertTrue("Missing binding", indexOf(manager.getRenderingType("rendering_type_1"), types) >= 0);
-		assertTrue("Missing binding", indexOf(manager.getRenderingType("rendering_type_2"), types) >= 0);
-	}	
-    
-    public void testDefaultBinding() {
-        IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-        IMemoryBlock block = new MemoryBlockOne();
-        IMemoryRenderingType[] types = manager.getDefaultRenderingTypes(block);
-        assertEquals("Wrong number of bindings", 1, types.length);
-        assertEquals("Wrong binding", "rendering_type_1", types[0].getId());
-    }
-	
-    public void testNoDefaultBinding() {
-        IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-        IMemoryBlock block = new MemoryBlockTwo();
-        IMemoryRenderingType[] types = manager.getDefaultRenderingTypes(block);
-        assertEquals("Wrong number of bindings", 0, types.length);
-    }
-    
-    public void testPrimaryBinding() {
-        IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-        IMemoryBlock block = new MemoryBlockOne();
-        IMemoryRenderingType type = manager.getPrimaryRenderingType(block);
-        assertEquals("Wrong binding", "rendering_type_1", type.getId());
-    }
-    
-    public void testNoPrimaryBinding() {
-        IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-        IMemoryBlock block = new MemoryBlockTwo();
-        IMemoryRenderingType type = manager.getPrimaryRenderingType(block);
-        assertNull("Wrong binding", type);
-    }
-    
-    public void testDefaultWithoutPrimaryBinding() {
-        IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-        IMemoryBlock block = new MemoryBlockThree();
-        IMemoryRenderingType[] types = manager.getDefaultRenderingTypes(block);
-        assertEquals("Wrong number of bindings", 1, types.length);
-        assertEquals("Wrong binding", "rendering_type_3", types[0].getId());
-    }
-    
-    public void testDynamicBinding() {
-        IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-        IMemoryBlock block = new MemoryBlockDynamic();
-        IMemoryRenderingType[] types = manager.getRenderingTypes(block);
-        assertEquals("Wrong number of bindings", 1, types.length);
-        assertEquals("Wrong binding", "rendering_type_1", types[0].getId());
-        types = manager.getDefaultRenderingTypes(block);
-        assertEquals("Wrong number of bindings", 1, types.length);
-        assertEquals("Wrong binding", "rendering_type_1", types[0].getId());
-        IMemoryRenderingType type = manager.getPrimaryRenderingType(block);
-        assertEquals("Wrong bindings", manager.getRenderingType("rendering_type_1"), type);
-    }
-	
-	public void testBindingChangeNotification() {
-		final boolean[] changed = new boolean[1];
-		IMemoryRenderingBindingsListener listener = new IMemoryRenderingBindingsListener() {
-			public void memoryRenderingBindingsChanged() {
-				changed[0] = true;
-			}		
-			public boolean hasChanged() {
-				return changed[0];
-			}
-		};
-		IMemoryRenderingManager manager = DebugUITools.getMemoryRenderingManager();
-		try {
-			manager.addListener(listener);
-			assertFalse("Renderings should not have changed yet", changed[0]);
-			DynamicRenderingBindings.setBinding("rendering_type_2");
-			assertTrue("Renderings should have changed", changed[0]);
-			IMemoryBlock block = new MemoryBlockDynamic();
-	        IMemoryRenderingType[] types = manager.getRenderingTypes(block);
-			assertEquals("Wrong number of bindings", 1, types.length);
-	        assertEquals("Wrong binding", "rendering_type_2", types[0].getId());
-		} finally {
-			// restore original bindings
-			DynamicRenderingBindings.setBinding("rendering_type_1");
-			manager.removeListener(listener);
-		}
-	}
-    
-	protected int indexOf(Object thing, Object[] list) {
-		for (int i = 0; i < list.length; i++) {
-			Object object2 = list[i];
-			if (object2.equals(thing)) {
-				return i;
-			}
-		}
-		return -1;
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
deleted file mode 100644
index 15a37db..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests method breakpoints.
- */
-public class MethodBreakpointTests extends AbstractDebugTest {
-	
-	public MethodBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testEntryAndExitBreakpoints() throws Exception {
-		String typeName = "DropTests";
-		List bps = new ArrayList();
-		// method 4 - entry
-		bps.add(createMethodBreakpoint(typeName, "method4", "()V", true, false));
-		// method 1 - exit
-		bps.add(createMethodBreakpoint(typeName, "method1", "()V", false, true));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			// onto the next breakpoint			
-			thread = resume(thread);
-			
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit exit breakpoint second", bps.get(1), hit);			
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testStopInMain() throws Exception {
-		String typeName = "DropTests";
-		ILaunchConfiguration config = getLaunchConfiguration(typeName);
-		assertNotNull("Could not find launch config", config);
-		ILaunchConfigurationWorkingCopy wc = config.copy("DropTests - Stop in main");
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, true);
-		config = wc.doSave();		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchAndSuspend(config);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertTrue("Should be in 'main'", frame.getMethodName().equals("main") && frame.isStatic());
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testDisabledEntryAndExitBreakpoints() throws Exception {
-		String typeName = "DropTests";
-		// method 4 - entry
-		IBreakpoint bp1 = createMethodBreakpoint(typeName, "method4", "()V", true, false);
-		bp1.setEnabled(false);
-		// method 1 - exit
-		IBreakpoint bp2 = createMethodBreakpoint(typeName, "method1", "()V", false, true);
-		bp2.setEnabled(false);		
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInnerClassNotHit() throws Exception {
-		String typeNamePattern = "A";
-		List bps = new ArrayList();
-		// method b - entry
-		bps.add(createMethodBreakpoint(typeNamePattern, "b", "()V", true, false));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeNamePattern);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-		
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInnerClassesHit() throws Exception {
-		String typeNamePattern = "A*";
-		List bps = new ArrayList();
-		// method b - entry
-		bps.add(createMethodBreakpoint(typeNamePattern, "b", "()V", true, false));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("A");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			thread= resume(thread);
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			thread= resume(thread);
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-			
-			thread= resume(thread);
-			hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-			
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testHitCountEntryBreakpoint() throws Exception {
-		String typeName = "MethodLoop";
-		IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, "calculateSum", "()V", true, false);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Method entry breakpoint not hit within timeout period", thread);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "sum");
-			assertNotNull("Could not find variable 'sum'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'sum' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'sum' should be '3', but was " + iValue, iValue == 3);			
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testHitCountExitBreakpoint() throws Exception {
-		String typeName = "MethodLoop";
-		IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, "calculateSum", "()V", false, true);
-		bp.setHitCount(3);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Method exit breakpoint not hit within timeout period", thread);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = findVariable(frame, "sum");
-			assertNotNull("Could not find variable 'sum'", var);
-			
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull("variable 'sum' has no value", value);
-			int iValue = value.getIntValue();
-			assertTrue("value of 'sum' should be '6', but was " + iValue, iValue == 6);			
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testThreadFilterInclusive() throws Exception {
-		String typeName = "MethodLoop";
-		IJavaMethodBreakpoint methodBp = createMethodBreakpoint(typeName, "calculateSum", "()V", true, false);
-		createLineBreakpoint(18, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("breakpoint not hit within timeout period", thread);
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			
-			// set a thread filter (to the main thread)
-			methodBp.setThreadFilter(thread);
-			
-			thread = resume(thread);
-			assertNotNull("breakpoint not hit", thread);
-			
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("should be in 'calucateSum'", "calculateSum", frame.getMethodName());
-			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testThreadFilterExclusive() throws Exception {
-		String typeName = "MethodLoop";
-		IJavaMethodBreakpoint methodBp = createMethodBreakpoint(typeName, "calculateSum", "()V", true, false);
-		createLineBreakpoint(18, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("breakpoint not hit within timeout period", thread);
-			
-			thread.getTopStackFrame();
-			
-			// set a thread filter (*not* the main thread)
-			IThread[] threads = thread.getDebugTarget().getThreads();
-			for (int i = 0; i < threads.length; i++) {
-				IThread thread2 = threads[i];
-				if (!thread2.equals(thread)) {
-					methodBp.setThreadFilter((IJavaThread)thread2);
-					break;
-				}
-			}
-			assertNotNull("Did not set thread filter",methodBp.getThreadFilter((IJavaDebugTarget)thread.getDebugTarget()));
-			
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Test for bug 33551
-	 */
-	public void testEntryDefaultPackageReturnType() throws Exception {
-		String typeName = "DefPkgReturnType";
-		IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, "self", "()LDefPkgReturnType;", true, false);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint", bp,hit);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	/**
-	 * Test for bug 43611
-	 */
-	public void testLabelWithoutSignature() throws Exception {
-		IDebugModelPresentation modelPresentation = DebugUITools.newDebugModelPresentation();
-		try {
-			String typeName = "DefPkgReturnType";
-			IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, "self", null, true, false);
-			String label = modelPresentation.getText(bp);
-			assertTrue(label.indexOf("self") >= 0);
-		} finally {
-			removeAllBreakpoints();
-			modelPresentation.dispose();
-		}
-	}
-	
-	/**
-	 * Test for bug 43611
-	 */
-	public void testLabelWithoutMethodName() throws Exception {
-		IDebugModelPresentation modelPresentation = DebugUITools.newDebugModelPresentation();
-		try {
-			String typeName = "DefPkgReturnType";
-			IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, null, "()LDefPkgReturnType;", true, false);
-			String label = modelPresentation.getText(bp);
-			assertTrue(label.indexOf(typeName) >= 0);
-		} finally {
-			removeAllBreakpoints();
-			modelPresentation.dispose();
-		}
-	}	
-	
-	/**
-	 * Test for bug 43611
-	 */
-	public void testLabelWithoutSigOrMethodName() throws Exception {
-		IDebugModelPresentation modelPresentation = DebugUITools.newDebugModelPresentation();
-		try {
-			String typeName = "DefPkgReturnType";
-			IJavaMethodBreakpoint bp = createMethodBreakpoint(typeName, null, null, true, false);
-			String label = modelPresentation.getText(bp);
-			assertTrue(label.indexOf(typeName) >= 0);
-		} finally {
-			removeAllBreakpoints();
-			modelPresentation.dispose();
-		}
-	}		
-	
-	public void testSkipMethodBreakpoint() throws Exception {
-		String typeName = "DropTests";
-		List bps = new ArrayList();
-		// method 4 - entry
-		bps.add(createMethodBreakpoint(typeName, "method4", "()V", true, false));
-		// method 1 - exit
-		bps.add(createMethodBreakpoint(typeName, "method1", "()V", false, true));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("should hit entry breakpoint first", bps.get(0),hit);
-
-			getBreakpointManager().setEnabled(false);			
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			getBreakpointManager().setEnabled(true);
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
deleted file mode 100644
index 3bbd750..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Home for breakpoint tests that don't fit elsewhere
- */
-public class MiscBreakpointsTests extends AbstractDebugTest {
-
-	private static final String COMPILE_ERROR_CONTENTS = 
-	 "public class CompileError {\npublic static void main(String[] args) {\nString foo = \"foo\" + bar;\n}	\n}";
-
-	public MiscBreakpointsTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * This method DEPENDS on the default setting of the 'suspend on uncaught exceptions'
-	 * preference being TRUE.
-	 */
-	public void testSuspendOnUncaughtExceptions() throws Exception {
-		String typeName = "ThrowsNPE";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, true);
-				
-		IJavaThread javaThread = null;
-		try {
-			javaThread= launchAndSuspend(typeName);
-			
-			int stackLine = javaThread.getTopStackFrame().getLineNumber();
-			assertTrue("line number should be '26', but was " + stackLine, stackLine == 26);
-		
-		} finally {
-            getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-			terminateAndRemove(javaThread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	/**
-	 * This method DEPENDS on the default setting of the 'suspend on compilation errors'
-	 * preference being TRUE.
-	 */
-	public void testSuspendOnCompilationErrors() throws Exception {
-		String typeName = "CompileError";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, true);		
-		
-		IType type = fJavaProject.findType(typeName);
-		ICompilationUnit cu = type.getCompilationUnit();
-		IBuffer buffer = cu.getBuffer();
-		buffer.setContents(COMPILE_ERROR_CONTENTS);
-		cu.save(new NullProgressMonitor(), true);
-        waitForAutoBuild();
-		
-		IJavaThread javaThread = null;
-		try {
-			javaThread= launchAndSuspend(typeName);
-			
-			int stackLine = javaThread.getTopStackFrame().getLineNumber();
-			assertTrue("line number should be '3', but was " + stackLine, stackLine == 3);
-		
-		} finally {
-            getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-            getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, false);
-			terminateAndRemove(javaThread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDontSuspendOnCompilationErrors() throws Exception {
-		String typeName = "CompileError";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, false);		
-		
-		IType type = fJavaProject.findType(typeName);
-		ICompilationUnit cu = type.getCompilationUnit();
-		IBuffer buffer = cu.getBuffer();
-		buffer.setContents(COMPILE_ERROR_CONTENTS);
-		cu.save(new NullProgressMonitor(), true);
-        waitForAutoBuild();
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDontSuspendOnUncaughtExceptions() throws Exception {
-		String typeName = "ThrowsNPE";
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, false);		
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget = launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	protected IPreferenceStore getPrefStore() {
-		return JDIDebugUIPlugin.getDefault().getPreferenceStore();		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
deleted file mode 100644
index 4c10aac..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaPatternBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStratumLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests deferred pattern breakpoints.
- */
-public class PatternBreakpointTests extends AbstractDebugTest {
-	
-	public PatternBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testPatternBreakpoints() throws Exception {
-		String sourceName = "Breakpoints.java";
-		String pattern = "Break";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createPatternBreakpoint(43, sourceName, pattern));
-		// blocks
-		bps.add(createPatternBreakpoint(102, sourceName, pattern));
-		// constructor
-		bps.add(createPatternBreakpoint(77, sourceName, pattern));
-		// else
-		bps.add(createPatternBreakpoint(88, sourceName, pattern));
-		//finally after catch
-		bps.add(createPatternBreakpoint(120, sourceName, pattern));
-		//finally after try
-		bps.add(createPatternBreakpoint(128, sourceName, pattern));
-		// for loop
-		bps.add(createPatternBreakpoint(93, sourceName, pattern));
-		// if
-		bps.add(createPatternBreakpoint(81, sourceName, pattern));
-		// initializer
-		bps.add(createPatternBreakpoint(17, sourceName, pattern));
-		// inner class
-		bps.add(createPatternBreakpoint(22, sourceName, pattern));
-		// return true
-		bps.add(createPatternBreakpoint(72, sourceName, pattern));
-		// instance method
-		bps.add(createPatternBreakpoint(107, sourceName, pattern));
-		// static method 
-		bps.add(createPatternBreakpoint(53, sourceName, pattern));
-		// case statement
-		bps.add(createPatternBreakpoint(133, sourceName, pattern));
-		// default statement
-		bps.add(createPatternBreakpoint(140, sourceName, pattern));
-		// synchronized blocks
-		bps.add(createPatternBreakpoint(146, sourceName, pattern));
-		// try
-		bps.add(createPatternBreakpoint(125, sourceName, pattern));
-		//catch
-		bps.add(createPatternBreakpoint(118, sourceName, pattern));
-		// while
-		bps.add(createPatternBreakpoint(97, sourceName, pattern));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("Breakpoints");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				int stackLine = thread.getTopStackFrame().getLineNumber();
-				assertEquals("line numbers of breakpoint and stack frame do not match", lineNumber, stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Bug 74108 - enable/disable a stratum breakpoint that is not yet installed
-	 */
-	public void testToggleStratumBreakpoint() throws Exception {
-		IJavaStratumLineBreakpoint stratumLineBreakpoint = createStratumBreakpoint(3, "date.jsp", "JSP");
-		String typeName = "Breakpoints";
-		createLineBreakpoint(52, typeName);
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-			ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-			int lineNumber = breakpoint.getLineNumber();
-			int stackLine = thread.getTopStackFrame().getLineNumber();
-			assertEquals("line numbers of breakpoint and stack frame do not match", lineNumber, stackLine);
-			breakpoint.delete();
-			assertFalse("stratum breakpoint should not be installed", stratumLineBreakpoint.isInstalled());
-			// toggle
-			stratumLineBreakpoint.setEnabled(false);
-			stratumLineBreakpoint.setEnabled(true);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}
-	
-	/**
-	 * Bug 74108 - enable/disable a pattern breakpoint that is not yet installed
-	 */
-	public void testTogglePatternBreakpoint() throws Exception {
-		IJavaPatternBreakpoint patternBreakpoint = createPatternBreakpoint(3, "date.jsp", "date");
-		String typeName = "Breakpoints";
-		createLineBreakpoint(52, typeName);
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-			ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-			int lineNumber = breakpoint.getLineNumber();
-			int stackLine = thread.getTopStackFrame().getLineNumber();
-			assertEquals("line numbers of breakpoint and stack frame do not match", lineNumber, stackLine);
-			breakpoint.delete();
-			assertFalse("pattern breakpoint should not be installed", patternBreakpoint.isInstalled());
-			// toggle
-			patternBreakpoint.setEnabled(false);
-			patternBreakpoint.setEnabled(true);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}				
-	}	
-	
-	public void testSkipPatternBreakpoint() throws Exception {
-		String sourceName = "Breakpoints.java";
-		String pattern = "Break";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createPatternBreakpoint(43, sourceName, pattern));
-		// blocks
-		bps.add(createPatternBreakpoint(102, sourceName, pattern));
-		// constructor
-		bps.add(createPatternBreakpoint(77, sourceName, pattern));
-		// else
-		bps.add(createPatternBreakpoint(88, sourceName, pattern));
-		//finally after catch
-		bps.add(createPatternBreakpoint(120, sourceName, pattern));
-		//finally after try
-		bps.add(createPatternBreakpoint(128, sourceName, pattern));
-		// for loop
-		bps.add(createPatternBreakpoint(93, sourceName, pattern));
-		// if
-		bps.add(createPatternBreakpoint(81, sourceName, pattern));
-		// initializer
-		bps.add(createPatternBreakpoint(17, sourceName, pattern));
-		// inner class
-		bps.add(createPatternBreakpoint(22, sourceName, pattern));
-		// return true
-		bps.add(createPatternBreakpoint(72, sourceName, pattern));
-		// instance method
-		bps.add(createPatternBreakpoint(107, sourceName, pattern));
-		// static method 
-		bps.add(createPatternBreakpoint(53, sourceName, pattern));
-		// case statement
-		bps.add(createPatternBreakpoint(133, sourceName, pattern));
-		// default statement
-		bps.add(createPatternBreakpoint(140, sourceName, pattern));
-		// synchronized blocks
-		bps.add(createPatternBreakpoint(146, sourceName, pattern));
-		// try
-		bps.add(createPatternBreakpoint(125, sourceName, pattern));
-		//catch
-		bps.add(createPatternBreakpoint(118, sourceName, pattern));
-		// while
-		bps.add(createPatternBreakpoint(97, sourceName, pattern));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("Breakpoints");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			getBreakpointManager().setEnabled(false);
-			resumeAndExit(thread);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			getBreakpointManager().setEnabled(true);
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PreLaunchBreakpointTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PreLaunchBreakpointTest.java
deleted file mode 100644
index 184d91b6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PreLaunchBreakpointTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.ILaunchesListener;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Tests launch notification.
- */
-public class PreLaunchBreakpointTest extends AbstractDebugTest {
-	
-	private boolean debugAdded = false;
-	private boolean runRemoved = false;
-	
-	ILaunchConfiguration configuration;
-	String sourceName;
-	
-	public PreLaunchBreakpointTest(String name) {
-		super(name);
-		sourceName = name;
-	}
-	
-	public void testRunModeLaunchWithBreakpoints() {
-		String typeName = "Breakpoints";		
-		
-		configuration = getLaunchConfiguration(typeName);
-		getLaunchManager().addLaunchListener(new MyListener());
-		
-		IPreferenceStore preferenceStore = DebugUIPlugin.getDefault().getPreferenceStore();
-		preferenceStore.setValue(IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE, MessageDialogWithToggle.ALWAYS);
-		
-		try {
-			createTargetPatternBreakpoint(77, sourceName);
-			
-			DebugUITools.buildAndLaunch(configuration, ILaunchManager.RUN_MODE, new NullProgressMonitor());
-			
-			synchronized (this) {
-				if (!debugAdded) {
-					try {
-						wait();
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-			assertFalse("RUN_MODE Launch should never have been added", runRemoved);
-			assertTrue("DEBUG_MODE Launch should have been added", debugAdded);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			removeAllBreakpoints();
-			//this must get done... other tests might fail.
-			preferenceStore.setValue(IInternalDebugUIConstants.PREF_RELAUNCH_IN_DEBUG_MODE, MessageDialogWithToggle.NEVER);
-		}
-	}
-	
-	private class MyListener implements ILaunchesListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
-		 */
-		public void launchesRemoved(ILaunch[] launches) {
-			synchronized (PreLaunchBreakpointTest.this) {
-				for (int i = 0; i < launches.length; i++) {
-					ILaunchConfiguration goneAway = launches[i].getLaunchConfiguration();
-					if (goneAway.equals(configuration) && launches[i].getLaunchMode().equals(ILaunchManager.RUN_MODE)) {
-						runRemoved = true;
-						PreLaunchBreakpointTest.this.notify();
-					}
-				}
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
-		 */
-		public void launchesAdded(ILaunch[] launches) {
-			synchronized (PreLaunchBreakpointTest.this) {
-				for (int i = 0; i < launches.length; i++) {
-					ILaunchConfiguration newLC = launches[i].getLaunchConfiguration();
-					if (newLC.equals(configuration) && launches[i].getLaunchMode().equals(ILaunchManager.DEBUG_MODE)) {
-						debugAdded = true;
-						PreLaunchBreakpointTest.this.notify();
-					}
-				}
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
-		 */
-		public void launchesChanged(ILaunch[] launches) {
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
deleted file mode 100644
index f2a7f0f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests IProcess.
- */
-public class ProcessTests extends AbstractDebugTest {
-	
-	public ProcessTests(String name) {
-		super(name);
-	}
-
-	public void testExitValueNormal() throws Exception {
-		String typeName = "Breakpoints";
-		ILineBreakpoint bp = createLineBreakpoint(43, typeName);
-				
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IProcess process = thread.getDebugTarget().getProcess();
-			assertNotNull("Missing process", process);
-			int exitValue = -1;
-			try {
-				exitValue = process.getExitValue();
-			} catch (DebugException e) {
-				exit(thread);
-				exitValue = process.getExitValue();
-				assertEquals("Exit value not normal", 0, exitValue);
-				return;
-			}
-			assertTrue("Should not be able to get exit value - process not terminated", false);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProjectSourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProjectSourceContainerTests.java
deleted file mode 100644
index a03ac1d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProjectSourceContainerTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-
-/**
- * Tests project source containers
- */
-public class ProjectSourceContainerTests extends AbstractDebugTest {
-	
-	public ProjectSourceContainerTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns a project source container.
-	 */
-	protected ProjectSourceContainer getContainer(boolean referenced, boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		IProject project = getJavaProject().getProject();
-		ProjectSourceContainer container = new ProjectSourceContainer(project, referenced);		
-		director.setSourceContainers(new ISourceContainer[]{container});
-		return container;
-	}
-	
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testProjectSourceContainerMemento() throws Exception {
-		ProjectSourceContainer container = getContainer(true, true);
-		assertTrue(container.isSearchReferencedProjects());
-		String memento = container.getType().getMemento(container);
-		ProjectSourceContainer restore = (ProjectSourceContainer) container.getType().createSourceContainer(memento);
-		assertEquals("Project source container memento failed", container, restore);
-		assertTrue(restore.isSearchReferencedProjects());
-	}
-	
-	public void testSimpleSourceLookupPositive() throws Exception {
-		ProjectSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("Breakpoints.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", container.getProject().getFile("src/Breakpoints.java"), objects[0]);
-	}
-	
-	public void testSimpleRootSourceLookupPositive() throws Exception {
-		ProjectSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements(".classpath");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", container.getProject().getFile(".classpath"), objects[0]);
-	}	
-	
-	public void testSimpleSourceLookupNegative() throws Exception {
-		ProjectSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-
-	public void testQualifiedSourceLookupPositive() throws Exception {
-		ProjectSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("org/eclipse/debug/tests/targets/InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", container.getProject().getFile("src/org/eclipse/debug/tests/targets/InfiniteLoop.java"), objects[0]);
-	}
-	
-	public void testQualifiedSourceLookupNegative() throws Exception {
-		ProjectSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("a/b/c/InfiniteLoop.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-	
-	public void testCaseSensitiveQualifiedSourceLookup() throws Exception {
-		ProjectSourceContainer container = getContainer(false, false);
-		Object[] objects = container.findSourceElements("oRg/eClIpSe/dEbUg/tEsTs/tArGeTs/INfInItELOop.jaVa");
-		if (isFileSystemCaseSensitive()) {
-			// case sensitive - should not find the file
-			assertEquals("Expected 0 files", 0, objects.length);
-		} else {
-			// case insensitive - should find the file
-			assertEquals("Expected 1 result", 1, objects.length);
-			assertEquals("Wrong file", container.getProject().getFile("src/org/eclipse/debug/tests/targets/InfiniteLoop.java"), objects[0]);
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RefreshTabTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RefreshTabTests.java
deleted file mode 100644
index ab9f174..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RefreshTabTests.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.RefreshTab;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-
-/**
- * Tests the refresh tab.
- */
-public class RefreshTabTests extends AbstractDebugTest {
-	
-	public RefreshTabTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the selected resource in the navigator view.
-	 * 
-	 * @param resource resource to select
-	 */
-	protected void setSelection(final IResource resource) {
-		Runnable r = new Runnable() {
-			public void run() {
-				IWorkbenchPage page = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
-				IViewPart part;
-				try {
-					part = page.showView("org.eclipse.ui.views.ResourceNavigator");
-					part.getSite().getSelectionProvider().setSelection(new StructuredSelection(resource));
-				} catch (PartInitException e) {
-					assertNotNull("Failed to open navigator view", null);
-				}
-				
-			}
-		};
-		DebugUIPlugin.getStandardDisplay().syncExec(r);
-	}
-	
-	/**
-	 * Tests a refresh scope of the selected resource
-	 */
-	public void testSelectedResource() throws CoreException {
-		String scope = "${resource}";
-		IResource resource = getJavaProject().getProject().getFolder("src");
-		setSelection(resource);
-		IResource[] result = RefreshTab.getRefreshResources(scope);
-		assertNotNull(result);
-		assertEquals(1, result.length);
-		assertEquals(resource, result[0]);		
-	}
-	
-	/**
-	 * Tests a refresh scope of the selected resource's container
-	 */
-	public void testSelectionsFolder() throws CoreException {
-		String scope = "${container}";
-		IResource resource = getJavaProject().getProject().getFolder("src");
-		setSelection(resource);
-		IResource[] result = RefreshTab.getRefreshResources(scope);
-		assertNotNull(result);
-		assertEquals(1, result.length);
-		assertEquals(resource.getParent(), result[0]);		
-	}
-	
-	/**
-	 * Tests a refresh scope of the selected resource's project
-	 */
-	public void testSelectionsProject() throws CoreException {
-		String scope = "${project}";
-		IResource resource = getJavaProject().getProject().getFolder("src");
-		setSelection(resource);
-		IResource[] result = RefreshTab.getRefreshResources(scope);
-		assertNotNull(result);
-		assertEquals(1, result.length);
-		assertEquals(resource.getProject(), result[0]);		
-	}	
-	
-	/**
-	 * Tests a refresh scope of the selected resource's project
-	 */
-	public void testWorkspaceScope() throws CoreException {
-		String scope = "${workspace}";
-		IResource[] result = RefreshTab.getRefreshResources(scope);
-		assertNotNull(result);
-		assertEquals(1, result.length);
-		assertEquals(ResourcesPlugin.getWorkspace().getRoot(), result[0]);		
-	}	
-	
-	/**
-	 * Tests a refresh scope for a specific resource (old format)
-	 */
-	public void testSpecificResource() throws CoreException {
-		String scope = "${resource:/DebugTests/.classpath}";
-		IResource resource = getJavaProject().getProject().getFile(".classpath");
-		IResource[] result = RefreshTab.getRefreshResources(scope);
-		assertNotNull(result);
-		assertEquals(1, result.length);
-		assertEquals(resource, result[0]);				
-	}
-	
-	/**
-	 * Tests a refresh scope for a working set
-	 */
-	public void testWorkingSet() throws CoreException {
-		String scope= "${working_set:<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<launchConfigurationWorkingSet factoryID=\"org.eclipse.ui.internal.WorkingSetFactory\" name=\"workingSet\" editPageId=\"org.eclipse.ui.resourceWorkingSetPage\">\n<item factoryID=\"org.eclipse.ui.internal.model.ResourceFactory\" path=\"/DebugTests/.classpath\" type=\"1\"/>\n</launchConfigurationWorkingSet>}";
-		IResource resource = getJavaProject().getProject().getFile(".classpath");
-		IResource[] result = RefreshTab.getRefreshResources(scope);
-		assertNotNull(result);
-		assertEquals(1, result.length);
-		assertEquals(resource, result[0]);			
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RemoteAttachTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RemoteAttachTests.java
deleted file mode 100644
index 4a7ad92..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RemoteAttachTests.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMConnector;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-import com.sun.jdi.connect.Connector;
-
-/**
- * Tests attaching to a remote java application
- */
-public class RemoteAttachTests extends AbstractDebugTest {
-	
-	public RemoteAttachTests(String name) {
-		super(name);
-	}
-
-	public void testAttach() throws Exception {
-		String typeName = "Breakpoints";
-		createLineBreakpoint(52, typeName);
-		
-		// create launch config to launch VM in debug mode waiting for attach
-		ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		ILaunchConfigurationWorkingCopy config = type.newInstance(null, "Launch Remote VM");
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "Breakpoints");
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Djava.compiler=NONE -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,suspend=y,server=y");
-		// use 'java' instead of 'javaw' to launch tests (javaw is problematic on JDK1.4.2)
-		Map map = new HashMap(1);
-		map.put(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, "java");
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, map);		
-		ILaunchConfiguration launchRemoteVMConfig = config.doSave();
-		
-		// create a launch config to do the attach
-		type = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_REMOTE_JAVA_APPLICATION);
-		config = type.newInstance(null, "Remote Breakpoints");
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, getJavaProject().getElementName());
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, true);
-		IVMConnector connector = JavaRuntime.getVMConnector(IJavaLaunchConfigurationConstants.ID_SOCKET_ATTACH_VM_CONNECTOR);
-		Map def = connector.getDefaultArguments();
-		Map argMap = new HashMap(def.size());
-		Iterator iter = connector.getArgumentOrder().iterator();
-		while (iter.hasNext()) {
-			String key = (String)iter.next();
-			Connector.Argument arg = (Connector.Argument)def.get(key);
-			argMap.put(key, arg.toString()); 
-		}
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, argMap);		
-		ILaunchConfiguration attachConfig = config.doSave();		
-			
-		// launch remote VM
-		ILaunch launch = launchRemoteVMConfig.launch(ILaunchManager.RUN_MODE, null);
-		
-		// attach	
-		IJavaThread thread= null;
-		try {
-			CoreException exception = null;
-			int attempts = 0;
-			boolean connected = false;
-			while ((attempts < 2) && !connected) {
-				try {
-					attempts++;
-					exception = null;
-					thread= launchToBreakpoint(attachConfig);
-					connected = true;
-				} catch (CoreException e) {
-					// try again, in case the VM is not yet ready
-					exception = e;
-					Thread.sleep(2000);
-				}
-			}
-			if (exception != null) {
-				throw exception;
-			}
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-			ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-			int lineNumber = breakpoint.getLineNumber();
-			int stackLine = thread.getTopStackFrame().getLineNumber();
-			assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-			breakpoint.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);
-		}		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RunToLineTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RunToLineTests.java
deleted file mode 100644
index f47077d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RunToLineTests.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.actions.IRunToLineTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.testplugin.DebugElementEventWaiter;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveListener2;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Tests run to line debug functionality
- */
-public class RunToLineTests extends AbstractDebugTest {
-	
-	public RunToLineTests(String name) {
-		super(name);
-	}
-
-	private Object fLock = new Object();
-	private IEditorPart fEditor = null;
-	
-	class MyListener implements IPerspectiveListener2 {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
-		 */
-		public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
-            if (partRef.getTitle().equals("Breakpoints.java") && changeId == IWorkbenchPage.CHANGE_EDITOR_OPEN) {
-                synchronized (fLock) {
-                    fEditor = (IEditorPart) partRef.getPart(true);
-                    fLock.notifyAll();
-                }
-            }
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
-		 */
-		public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String)
-		 */
-		public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {			
-		}
-	    
-	}
-
-	/**
-	 * Test a run to line, with no extra breakpoints.
-	 * 
-	 * @throws Exception
-	 */
-	public void testRunToLine() throws Exception {
-	    runToLine(55, 55, true);
-	}
-	
-	/**
-	 * Test a run to line, with an extra breakpoint, and preference to skip
-	 * 
-	 * @throws Exception
-	 */
-	public void testRunToLineSkipBreakpoint() throws Exception {
-	    createLineBreakpoint(53, "Breakpoints");
-	    runToLine(55, 55, true);
-	}	
-	
-	/**
-	 * Test a run to line, with an extra breakpoint, and preference to *not* skip
-	 * 
-	 * @throws Exception
-	 */
-	public void testRunToLineHitBreakpoint() throws Exception {
-	    createLineBreakpoint(53, "Breakpoints");
-	    runToLine(55, 53, false);
-	}	
-
-	/**
-	 * Runs to the given line number in the 'Breakpoints' source file, after stopping at the
-	 * first line in the main method.
-	 * 
-	 * @param lineNumber line number to run to, ONE BASED
-	 * @param expectedLineNumber the line number to be on after run-to-line (may differ from
-	 *  the target line number if the option to skip breakpoints is off).
-	 * @param skipBreakpoints preference value for "skip breakpoints during run to line"
-	 * @throws Exception
-	 */
-	public void runToLine(final int lineNumber, int expectedLineNumber, boolean skipBreakpoints) throws Exception {
-		String typeName = "Breakpoints";
-		IJavaLineBreakpoint breakpoint = createLineBreakpoint(52, typeName);
-		
-		boolean restore = DebugUITools.getPreferenceStore().getBoolean(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE);
-		DebugUITools.getPreferenceStore().setValue(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE, skipBreakpoints);
-		IJavaThread thread= null;
-		final IPerspectiveListener2 listener = new MyListener();
-		try {
-		    // close all editors
-		    Runnable closeAll = new Runnable() {
-                public void run() {
-                    IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-                    activeWorkbenchWindow.getActivePage().closeAllEditors(false);
-                    activeWorkbenchWindow.addPerspectiveListener(listener);
-                }
-            };
-            Display display = DebugUIPlugin.getStandardDisplay();
-            display.syncExec(closeAll);
-            
-			thread= launchToLineBreakpoint(typeName, breakpoint);
-			// wait for editor to open
-			synchronized (fLock) {
-			    if (fEditor == null) {
-			        fLock.wait(30000);
-			    }
-            }
-			if (fEditor == null) {
-				Runnable r = new Runnable() {				
-					public void run() {
-						IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	                    IEditorPart activeEditor = activeWorkbenchWindow.getActivePage().getActiveEditor();
-                        if (activeEditor != null) {
-                            System.out.println("ACTIVE: " + activeEditor.getTitle());    
-                        }
-					}
-				};
-				display.syncExec(r);
-			}
-			assertNotNull("Editor did not open", fEditor);
-			
-			final Exception[] exs = new Exception[1];
-			final IJavaThread suspendee = thread;
-			Runnable r = new Runnable() {
-                public void run() {
-                    ITextEditor editor = (ITextEditor) fEditor;
-                    IRunToLineTarget adapter = (IRunToLineTarget) editor.getAdapter(IRunToLineTarget.class);
-                    assertNotNull("no run to line adapter", adapter);
-                    IDocumentProvider documentProvider = editor.getDocumentProvider();
-                    try {
-                        // position cursor to line
-                        documentProvider.connect(this);
-                        IDocument document = documentProvider.getDocument(editor.getEditorInput());
-                        int lineOffset = document.getLineOffset(lineNumber - 1); // document is 0 based!
-                        documentProvider.disconnect(this);
-                        editor.selectAndReveal(lineOffset, 0);
-                        // run to line
-                        adapter.runToLine(editor, editor.getSelectionProvider().getSelection(), suspendee);
-                    } catch (CoreException e) {
-                        exs[0] = e;
-                    } catch (BadLocationException e) {
-                        exs[0] = e;
-                    }
-                }
-            };
-            DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-            DebugUIPlugin.getStandardDisplay().syncExec(r);
-            waiter.waitForEvent();
-            IStackFrame topStackFrame = thread.getTopStackFrame();
-            assertEquals("wrong line", expectedLineNumber, topStackFrame.getLineNumber());
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			DebugUITools.getPreferenceStore().setValue(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE, restore);
-		    Runnable cleanup = new Runnable() {
-                public void run() {
-                    IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-                    activeWorkbenchWindow.removePerspectiveListener(listener);
-                }
-            };
-            Display display = DebugUIPlugin.getStandardDisplay();
-            display.asyncExec(cleanup);			
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
deleted file mode 100644
index 01f314b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * Tests runtime classpath entry creation/restoration.
- */
-public class RuntimeClasspathEntryTests extends AbstractDebugTest {
-	
-	public RuntimeClasspathEntryTests(String name) {
-		super(name);
-	}
-
-	public void testProjectEntry() throws Exception {
-		IProject project = getJavaProject().getProject();
-		IRuntimeClasspathEntry entry = JavaRuntime.newProjectRuntimeClasspathEntry(getJavaProject());
-	
-		assertEquals("Paths should be equal", project.getFullPath(), entry.getPath());
-		assertEquals("Resources should be equal", project, entry.getResource());
-		assertEquals("Should be of type project", IRuntimeClasspathEntry.PROJECT, entry.getType());
-		assertEquals("Should be a user entry", IRuntimeClasspathEntry.USER_CLASSES, entry.getClasspathProperty());
-		
-		String memento = entry.getMemento();
-		IRuntimeClasspathEntry restored = JavaRuntime.newRuntimeClasspathEntry(memento);
-		assertEquals("Entries should be equal", entry, restored);
-	}
-	
-	public void testJRELIBVariableEntry() throws Exception {
-		IClasspathEntry[] cp = getJavaProject().getRawClasspath();
-		IClasspathEntry cpe = null;
-		for (int i = 0; i < cp.length; i++) {
-			if (cp[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE && cp[i].getPath().equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-				cpe = cp[i];
-				break;
-			}
-		}
-		assertNotNull("Did not find a variable entry", cpe);
-		IRuntimeClasspathEntry entry = JavaRuntime.newVariableRuntimeClasspathEntry(new Path(JavaRuntime.JRELIB_VARIABLE));
-		entry.setSourceAttachmentPath(cpe.getSourceAttachmentPath());
-		entry.setSourceAttachmentRootPath(cpe.getSourceAttachmentRootPath());
-	
-		assertEquals("Paths should be equal", cpe.getPath(), entry.getPath());
-		assertNull("Resource should be null", entry.getResource());
-		assertEquals("Should be of type varirable", IRuntimeClasspathEntry.VARIABLE, entry.getType());
-		assertEquals("Should be a standard entry", IRuntimeClasspathEntry.STANDARD_CLASSES, entry.getClasspathProperty());
-		
-		String memento = entry.getMemento();
-		IRuntimeClasspathEntry restored = JavaRuntime.newRuntimeClasspathEntry(memento);
-		assertEquals("Entries should be equal", entry, restored);
-		
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		LibraryLocation[] libs = vm.getLibraryLocations();
-		if (libs == null) {
-			libs = vm.getVMInstallType().getDefaultLibraryLocations(vm.getInstallLocation());
-		}
-		assertTrue("there is at least one system lib", libs.length >= 1);
-		
-	}	
-	
-	/**
-	 * Tests that a project can be launched if it contains the JRE_CONTAINER variable
-	 * instead of JRE_LIB
-	 * 
-	 * XXX: test waiting for bug fix in JCORE - unable to bind container if there
-	 * is no corresponding classpath entry.
-	 */
-//	public void testJREContainerEntry() throws Exception {
-//		ILaunchConfiguration lc = getLaunchConfiguration("Breakpoints");
-//		ILaunchConfigurationWorkingCopy wc = lc.copy("Breakpoints_JRE_CONTAINER");
-//		
-//		IRuntimeClasspathEntry[] cp = JavaRuntime.computeRuntimeClasspath(lc);
-//		IRuntimeClasspathEntry removed = null;
-//		List entries = new ArrayList(cp.length);
-//		// replace JRE_LIB with JRE_CONTAINER
-//		for (int i = 0; i < cp.length; i++) {
-//			if (cp[i].getType() == IRuntimeClasspathEntry.VARIABLE) {
-//				removed = cp[i];
-//				cp[i] = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), getJavaProject().getElementName());	
-//			}
-//			entries.add(cp[i].getMemento());
-//		}
-//		
-//		assertNotNull("Did not replace entry", removed);
-//		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-//		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, entries);
-//		lc = wc.doSave();
-//		
-//		createLineBreakpoint(52, "Breakpoints");
-//		IJavaThread thread= null;
-//		try {
-//			thread = launch(lc);
-//			assertNotNull("Launch failed", thread);
-//		} finally {
-//			terminateAndRemove(thread);
-//			removeAllBreakpoints();
-//		}
-//	}	
-	
-	public void testJREContainerEquality() throws Exception {
-		IRuntimeClasspathEntry entry1 = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), IRuntimeClasspathEntry.STANDARD_CLASSES, getJavaProject());
-		IRuntimeClasspathEntry entry2 = JavaRuntime.newRuntimeContainerClasspathEntry(new Path(JavaRuntime.JRE_CONTAINER), IRuntimeClasspathEntry.STANDARD_CLASSES, getJavaProject("MultiOutput"));
-		assertEquals("JRE containers should be equal no matter which project", entry1, entry2);
-	}
-	
-	public void testExampleContainerEqualityNegative() throws Exception {
-		IRuntimeClasspathEntry entry1 = JavaRuntime.newRuntimeContainerClasspathEntry(new Path("org.eclipse.jdt.debug.tests.TestClasspathContainer"), IRuntimeClasspathEntry.USER_CLASSES, getJavaProject());
-		IRuntimeClasspathEntry entry2 = JavaRuntime.newRuntimeContainerClasspathEntry(new Path("org.eclipse.jdt.debug.tests.TestClasspathContainer"), IRuntimeClasspathEntry.USER_CLASSES, getJavaProject("MultiOutput"));
-		assertFalse("Example containers should *not* be equal for different projects", entry1.equals(entry2));
-	}
-	
-	public void testExampleContainerEqualityPositive() throws Exception {
-		IRuntimeClasspathEntry entry1 = JavaRuntime.newRuntimeContainerClasspathEntry(new Path("org.eclipse.jdt.debug.tests.TestClasspathContainer"), IRuntimeClasspathEntry.USER_CLASSES, getJavaProject());
-		IRuntimeClasspathEntry entry2 = JavaRuntime.newRuntimeContainerClasspathEntry(new Path("org.eclipse.jdt.debug.tests.TestClasspathContainer"), IRuntimeClasspathEntry.USER_CLASSES, getJavaProject());
-		assertEquals("Example containers should be equal for same project", entry1, entry2);
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
deleted file mode 100644
index a44cf90..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.debug.ui.JavaUISourceLocator;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.sourcelookup.ArchiveSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.DirectorySourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.JavaProjectSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.JavaSourceLocator;
-import org.eclipse.jdt.launching.sourcelookup.PackageFragmentRootSourceLocation;
-
-/**
- * Tests source location creation/restoration.
- */
-public class SourceLocationTests extends AbstractDebugTest {
-	
-	public SourceLocationTests(String name) {
-		super(name);
-	}
-
-	public void testProjectLocationMemento() throws Exception {
-		IJavaSourceLocation location = new JavaProjectSourceLocation(getJavaProject());
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new JavaProjectSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("project locations should be equal", location, restored);
-	}
-	
-	public void testDirectoryLocationMemento() throws Exception {
-		File dir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
-		IJavaSourceLocation location = new DirectorySourceLocation(dir);
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new DirectorySourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("directory locations should be equal", location, restored);
-	}	
-	
-	public void testArchiveLocationMemento() throws Exception {
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		IJavaSourceLocation location = new ArchiveSourceLocation(JavaRuntime.getLibraryLocations(vm)[0].getSystemLibraryPath().toOSString(), null);
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new ArchiveSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("archive locations should be equal", location, restored);
-	}	
-	
-	public void testJavaSourceLocatorMemento() throws Exception {
-		IJavaSourceLocation location1 = new JavaProjectSourceLocation(getJavaProject());
-		File dir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
-		IJavaSourceLocation location2 = new DirectorySourceLocation(dir);
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		IJavaSourceLocation location3 = new ArchiveSourceLocation(JavaRuntime.getLibraryLocations(vm)[0].getSystemLibraryPath().toOSString(), null);
-		
-		JavaSourceLocator locator = new JavaSourceLocator(new IJavaSourceLocation[] {location1, location2, location3});
-		String memento = locator.getMemento();
-		JavaSourceLocator restored = new JavaSourceLocator();
-		restored.initializeFromMemento(memento);
-		IJavaSourceLocation[] locations = restored.getSourceLocations();
-		
-		assertEquals("wrong number of source locations", 3, locations.length);
-		assertEquals("1st locations not equal", location1, locations[0]);
-		assertEquals("2nd locations not equal", location2, locations[1]);
-		assertEquals("3rd locations not equal", location3, locations[2]);
-	}
-	
-	public void testJavaUISourceLocatorMemento() throws Exception {
-		IJavaSourceLocation location1 = new JavaProjectSourceLocation(getJavaProject());
-		File dir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
-		IJavaSourceLocation location2 = new DirectorySourceLocation(dir);
-		IVMInstall vm = JavaRuntime.getDefaultVMInstall();
-		IJavaSourceLocation location3 = new ArchiveSourceLocation(JavaRuntime.getLibraryLocations(vm)[0].getSystemLibraryPath().toOSString(), null);
-		
-		JavaUISourceLocator locator = new JavaUISourceLocator(getJavaProject());
-		locator.setSourceLocations(new IJavaSourceLocation[] {location1, location2, location3});
-		locator.setFindAllSourceElement(true);
-		
-		String memento = locator.getMemento();
-		JavaUISourceLocator restored = new JavaUISourceLocator();
-		restored.initializeFromMemento(memento);
-		IJavaSourceLocation[] locations = restored.getSourceLocations();
-		
-		assertEquals("wrong number of source locations", 3, locations.length);
-		assertEquals("1st locations not equal", location1, locations[0]);
-		assertEquals("2nd locations not equal", location2, locations[1]);
-		assertEquals("3rd locations not equal", location3, locations[2]);
-		assertTrue("Should find all source locations", locator.isFindAllSourceElements());		
-	}
-	
-	public void testPackageFragmentRootLocationMemento() throws Exception {
-		IResource res = getJavaProject().getProject().getFolder("src");
-		IPackageFragmentRoot root = getJavaProject().getPackageFragmentRoot(res);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new PackageFragmentRootSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("root locations should be equal", location, restored);
-	}
-	
-	public void testEmptyPackageFragmentRootLocationMemento() throws Exception {
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation();
-		String memento = location.getMemento();
-		IJavaSourceLocation restored = new PackageFragmentRootSourceLocation();
-		restored.initializeFrom(memento);
-		assertEquals("root locations should be equal", location, restored);
-	}	
-		
-	public void testPositiveSourceFolderSourceLocation() throws Exception {
-		IResource res = getJavaProject().getProject().getFolder("src");
-		IPackageFragmentRoot root = getJavaProject().getPackageFragmentRoot(res);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		Object source = location.findSourceElement("Breakpoints");
-		assertTrue("Did not find source for 'Breakpoints'", source instanceof ICompilationUnit);
-		ICompilationUnit cu = (ICompilationUnit)source;
-		assertEquals("Did not find source for 'Breakpoints'", cu.getElementName(), "Breakpoints.java");
-		
-		source = location.findSourceElement("org.eclipse.debug.tests.targets.InfiniteLoop");
-		assertTrue("Did not find source for 'InfiniteLoop'", source instanceof ICompilationUnit);
-		cu = (ICompilationUnit)source;
-		assertEquals("Did not find source for 'Breakpoints'", cu.getElementName(), "InfiniteLoop.java");
-	}
-	
-	public void testNegativeSourceFolderSourceLocation() throws Exception {
-		IResource res = getJavaProject().getProject().getFolder("src");
-		IPackageFragmentRoot root = getJavaProject().getPackageFragmentRoot(res);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		Object source = location.findSourceElement("DoesNotExist");
-		assertNull("Should not have found source", source);
-		
-		source = location.findSourceElement("org.eclipse.DoesNotExist");
-		assertNull("Should not have found source", source);
-	}	
-	
-	public void testPositiveSystemLibrarySourceLocation() throws Exception {
-		IClasspathEntry[] cpes = getJavaProject().getRawClasspath();
-		IClasspathEntry lib = null;
-		for (int i = 0; i < cpes.length; i++) {
-			if (cpes[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
-				if (cpes[i].getPath().equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-					lib = cpes[i];
-					break;
-				}
-			}
-		}
-		assertNotNull("Could not find JRE_LIB entry", lib);
-		
-		IPackageFragmentRoot[] roots = getJavaProject().findPackageFragmentRoots(lib);
-		assertEquals("Should be one root for JRE_LIB", roots.length, 1);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(roots[0]);
-		
-		Object source = location.findSourceElement("java.lang.Object");
-		assertTrue("Did not find source for 'Object'", source instanceof IClassFile);
-		IClassFile cf = (IClassFile)source;
-		assertEquals("Did not find source for 'Object'", "Object.class", cf.getElementName());
-		
-		source = location.findSourceElement("java.util.Vector$1");
-		assertTrue("Did not find source for 'Vector$1'", source instanceof IClassFile);
-		cf = (IClassFile)source;
-		assertEquals("Did not find source for 'Vector$1'", "Vector$1.class", cf.getElementName());
-	}
-	
-	public void testNegativeSystemLibrarySourceLocation() throws Exception {
-		IClasspathEntry[] cpes = getJavaProject().getRawClasspath();
-		IClasspathEntry lib = null;
-		for (int i = 0; i < cpes.length; i++) {
-			if (cpes[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
-				if (cpes[i].getPath().equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-					lib = cpes[i];
-					break;
-				}
-			}
-		}
-		assertNotNull("Could not find JRE_LIB entry", lib);
-		
-		IPackageFragmentRoot[] roots = getJavaProject().findPackageFragmentRoots(lib);
-		assertEquals("Should be one root for JRE_LIB", roots.length, 1);
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(roots[0]);
-		
-		Object source = location.findSourceElement("xyz.abc.Object");
-		assertNull("Should not find source", source);
-
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLookupTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLookupTests.java
deleted file mode 100644
index e4eea7a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLookupTests.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.PackageFragmentRootSourceLocation;
-
-/**
- * Tests source lookup in source folders
- */
-public class SourceLookupTests extends AbstractDebugTest {
-	
-	public SourceLookupTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * See Bug 53646
-	 */
-	public void testPackageFragmentRoots() throws Exception {
-		IJavaProject javaProject = getJavaProject();
-		IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
-		IResource resource = javaProject.getProject().getFile("src/A.jar");
-		IPackageFragmentRoot packageFragmentRoot = javaProject.getPackageFragmentRoot(resource);
-		assertTrue("package fragment root should exist", packageFragmentRoot.exists());
-		for (int i = 0; i < roots.length; i++) {
-			IPackageFragmentRoot root = roots[i];
-			if (packageFragmentRoot.equals(root)) {
-				return;
-			}
-		}
-		assertTrue("Failed to locate package fragment root", false);
-	}
-
-	/**
-	 * see Bug 37545
-	 */
-	public void testStackFrameReuse() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.CallStack";
-		createLineBreakpoint(28, "org.eclipse.debug.tests.targets.ClassOne");
-		createLineBreakpoint(28, "org.eclipse.debug.tests.targets.ClassTwo");
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			// get source element for first breakpoint
-			IStackFrame[] frames = thread.getStackFrames();
-			IStackFrame frame = frames[2]; 
-			ISourceLocator sourceLocator = thread.getLaunch().getSourceLocator();
-			Object source1 = sourceLocator.getSourceElement(frame);
-			source1 = ((IAdaptable)source1).getAdapter(IJavaElement.class);
-			
-			IPackageFragment[] fragments = getJavaProject().getPackageFragments();
-			IPackageFragment fragment = null;
-			for (int i = 0; i < fragments.length; i++) {
-				if (fragments[i].getElementName().equals("org.eclipse.debug.tests.targets")) {
-					fragment = fragments[i];
-					break;
-				}
-			}
-			assertNotNull("Did not locate package framgment 'org.eclipse.debug.tests.targets'", fragment);
-			ICompilationUnit unit1 = fragment.getCompilationUnit("ClassOne.java");
-			assertEquals("Source lookup failed for frame1", unit1, source1);
-			
-			// resume to second breakpoint
-			thread = resume(thread);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IStackFrame frame2 = thread.getStackFrames()[2];
-			Object source2 = sourceLocator.getSourceElement(frame2);
-			source2 = ((IAdaptable)source2).getAdapter(IJavaElement.class);
-			ICompilationUnit unit2 = fragment.getCompilationUnit("ClassTwo.java");
-			assertEquals("Source lookup failed for frame2", unit2, source2);
-						
-			// the source elements should not be equal
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Tests source lookup in a top level type, in the default package.
-	 */
-	public void testDefTopLevelType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "", "Breakpoints.java");
-		assertTrue("did not find compilation unit for Breakpoints.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("Breakpoints"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner type, the default package.
-	 */
-	public void testDefInnerType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "", "Breakpoints.java");
-		assertTrue("did not find compilation unit for Breakpoints.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("Breakpoints$InnerRunnable"));
-	}
-	
-	/**
-	 * Tests source lookup in an anonymous inner type, in the default package.
-	 * Must debug since we do not know name of type.
-	 */
-	public void testDefAnonInnerType() throws Exception {
-		String typeName = "Breakpoints";
-		createLineBreakpoint(43, typeName);
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "", "Breakpoints.java");
-		assertTrue("did not find compilation unit for Breakpoints.java", expectedSource.exists());
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			// get source element for top frame
-			IStackFrame frame = thread.getTopStackFrame();
-			ISourceLocator sourceLocator = thread.getLaunch().getSourceLocator();
-			Object source = sourceLocator.getSourceElement(frame);
-			assertEquals("Source lookup failed", expectedSource.getResource(), source);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();			
-		}
-	}	
-	
-	/**
-	 * Tests source lookup in a named local type, in the default package.
-	 * Must debug to test this, since we do no know name of local type.
-	 */
-	public void testDefLocalType() throws Exception {
-		String typeName = "Breakpoints";
-		createLineBreakpoint(30, typeName);
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "", "Breakpoints.java");
-		assertTrue("did not find compilation unit for Breakpoints.java", expectedSource.exists());
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			// get source element for top frame
-			IStackFrame frame = thread.getTopStackFrame();
-			ISourceLocator sourceLocator = thread.getLaunch().getSourceLocator();
-			Object source = sourceLocator.getSourceElement(frame);
-			assertEquals("Source lookup failed", expectedSource.getResource(), source);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();			
-		}
-	}	
-	
-	/**
-	 * Tests source lookup in a top level type.
-	 */
-	public void testTopLevelType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");
-		assertTrue("did not find compilation unit for SourceLookup.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner type.
-	 */
-	public void testInnerType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");
-		assertTrue("did not find compilation unit for SourceLookup.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup$Inner"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner inner type.
-	 */
-	public void testInnerNestedType() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");
-		assertTrue("did not find compilation unit for SourceLookup.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.SourceLookup$Inner$Nested"));
-	}	
-	
-	/**
-	 * Tests source lookup in a top level type, with a $ named class
-	 */
-	public void testTopLevel$Type() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "Source_$_Lookup.java");
-		assertTrue("did not find compilation unit for Source_$_Lookup.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner type in a $ named class.
-	 */
-	public void testInner$Type() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "Source_$_Lookup.java");
-		assertTrue("did not find compilation unit for Source_$_Lookup.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup$Inner"));
-	}
-	
-	/**
-	 * Tests source lookup in an inner inner type in a $ named class.
-	 */
-	public void testInnerNested$Type() throws Exception {
-		IPackageFragmentRoot root = getPackageFragmentRoot(getJavaProject(), "src");
-		IJavaSourceLocation location = new PackageFragmentRootSourceLocation(root);
-		
-		ICompilationUnit expectedSource = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "Source_$_Lookup.java");
-		assertTrue("did not find compilation unit for Source_$_Lookup.java", expectedSource.exists());
-				
-		assertEquals("Source lookup failed", expectedSource, location.findSourceElement("org.eclipse.debug.tests.targets.Source_$_Lookup$Inner$Nested"));
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
deleted file mode 100644
index c47128a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class StaticVariableTests extends AbstractDebugTest {
-	
-	public StaticVariableTests(String name) {
-		super(name);
-	}
-
-	public void testSetValue() throws Exception {
-		String typeName = "StaticVariablesTests";
-		
-		ILineBreakpoint bp = createLineBreakpoint(40, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable pubStr = findVariable(frame, "pubStr");
-			assertNotNull("Could not find variable 'pubStr'", pubStr);
-			
-			assertEquals("Value should be 'public'","public", pubStr.getValue().getValueString());
-			pubStr.setValue(((IJavaDebugTarget)frame.getDebugTarget()).newValue("test"));
-			assertEquals("Value should be 'test'","test", pubStr.getValue().getValueString());
-			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
deleted file mode 100644
index 699195b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Step filtering tests
- * This test forces the UI plugins to load.
- */
-public class StepFilterTests extends AbstractDebugTest {
-
-	private String fOriginalActiveFilters;
-	private String fOriginalInactiveFilters;
-
-	public StepFilterTests(String name) {
-		super(name);
-		fOriginalActiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST);
-		fOriginalInactiveFilters = getPrefStore().getString(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST);		
-	}
-
-	public void testSimpleStepFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepIntoWithFilters(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 22, but was " + lineNumber, lineNumber == 22);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}				
-	}
-	
-	public void testInactiveStepFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo");
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(21, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepIntoWithFilters(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterTwo' but was " + recTypeName, recTypeName.equals("StepFilterTwo"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 25, but was " + lineNumber, lineNumber == 25);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}						
-	}
-	
-	public void testDeepStepFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(22, typeName);
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepIntoWithFilters(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterThree' but was " + recTypeName, recTypeName.equals("StepFilterThree"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 19, but was " + lineNumber, lineNumber == 19);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}				
-	}	
-
-	public void testStepReturnFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(19, "StepFilterThree");
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepReturnWithFilters(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 23, but was " + lineNumber, lineNumber == 23);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}				
-	}
-	
-	public void testStepOverFilter() throws Exception {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo,StepFilterThree," + fOriginalInactiveFilters);
-		String typeName = "StepFilterOne";
-		ILineBreakpoint bp = createLineBreakpoint(19, "StepFilterThree");
-		bp.setEnabled(true);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			thread = stepOverWithFilters(stackFrame);
-			stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
-			String recTypeName = stackFrame.getReceivingTypeName();
-			assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
-			int lineNumber = stackFrame.getLineNumber();
-			assertTrue("Line number should have been 23, but was " + lineNumber, lineNumber == 23);			
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			resetStepFilters();
-		}				
-	}	
-	
-	protected void resetStepFilters() {
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters);
-		getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalInactiveFilters);
-	}
-
-	protected IPreferenceStore getPrefStore() {
-		return JDIDebugUIPlugin.getDefault().getPreferenceStore();		
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepIntoSelectionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepIntoSelectionTests.java
deleted file mode 100644
index db2d910..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepIntoSelectionTests.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.testplugin.DebugElementEventWaiter;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.ui.actions.StepIntoSelectionHandler;
-
-/**
- * Tests 'step into selection'
- */
-public class StepIntoSelectionTests extends AbstractDebugTest {
-	
-	public StepIntoSelectionTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Step into 'new StepIntoSelectionClass()'
-	 * 
-	 * @throws Exception
-	 */
-	public void testStepIntoSourceConstructor() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.StepIntoSelectionClass";
-		createLineBreakpoint(21, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "StepIntoSelectionClass.java");
-			IType type = cu.getType("StepIntoSelectionClass");
-			IMethod method = type.getMethod("StepIntoSelectionClass", new String[0]);
-			assertTrue("Could not find constructor", method.exists());
-			
-			StepIntoSelectionHandler handler = new StepIntoSelectionHandler(thread, (IJavaStackFrame)thread.getTopStackFrame(), method);
-			DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-			handler.step();
-			Object source = waiter.waitForEvent();
-			assertEquals("Step did not complete", thread, source);
-			thread = (IJavaThread)source;
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should be in constructor", "<init>", frame.getMethodName());
-			
-						
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Step into 'step()'
-	 * 
-	 * @throws Exception
-	 */
-	public void testStepIntoSourceMethod() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.StepIntoSelectionClass";
-		createLineBreakpoint(22, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "StepIntoSelectionClass.java");
-			IType type = cu.getType("StepIntoSelectionClass");
-			IMethod method = type.getMethod("step", new String[0]);
-			assertTrue("Could not find method 'step'", method.exists());
-			
-			StepIntoSelectionHandler handler = new StepIntoSelectionHandler(thread, (IJavaStackFrame)thread.getTopStackFrame(), method);
-			DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-			handler.step();
-			Object source = waiter.waitForEvent();
-			assertEquals("Step did not complete", thread, source);
-			thread = (IJavaThread)source;
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should be in method 'step'", "step", frame.getMethodName());
-			
-						
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Step into 'method1(int[], String[])'
-	 * 
-	 * @throws Exception
-	 */
-	public void testStepIntoSourceMethodWithParameters() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.StepIntoSelectionClass";
-		createLineBreakpoint(35, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "StepIntoSelectionClass.java");
-			IType type = cu.getType("StepIntoSelectionClass");
-			IMethod method = type.getMethod("method1", new String[] {"[I", "[QString;"});
-			assertTrue("Could not find method 'method1'", method.exists());
-			
-			StepIntoSelectionHandler handler = new StepIntoSelectionHandler(thread, (IJavaStackFrame)thread.getTopStackFrame(), method);
-			DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-			handler.step();
-			Object source = waiter.waitForEvent();
-			assertEquals("Step did not complete", thread, source);
-			thread = (IJavaThread)source;
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should be in method 'step'", "method1", frame.getMethodName());
-			
-						
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Step into 'Vector.addElement(Object)'
-	 * 
-	 * @throws Exception
-	 */
-	public void testStepIntoBinaryMethod() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.StepIntoSelectionClass";
-		createLineBreakpoint(33, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IType type = getJavaProject().findType("java.util.Vector");
-			IMethod method = type.getMethod("addElement", new String[]{"Ljava.lang.Object;"});
-			assertTrue("Could not find method 'addElement'", method.exists());
-			
-			StepIntoSelectionHandler handler = new StepIntoSelectionHandler(thread, (IJavaStackFrame)thread.getTopStackFrame(), method);
-			DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-			handler.step();
-			Object source = waiter.waitForEvent();
-			assertEquals("Step did not complete", thread, source);
-			thread = (IJavaThread)source;
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should be in method 'addElement'", "addElement", frame.getMethodName());
-			
-						
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	/**
-	 * Step into 'new Integer(i)'
-	 * 
-	 * @throws Exception
-	 */
-	public void testStepIntoBinaryConstructor() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.StepIntoSelectionClass";
-		createLineBreakpoint(33, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IType type = getJavaProject().findType("java.lang.Integer");
-			IMethod method = type.getMethod("Integer", new String[]{"I"});
-			assertTrue("Could not find method constructor", method.exists());
-			
-			StepIntoSelectionHandler handler = new StepIntoSelectionHandler(thread, (IJavaStackFrame)thread.getTopStackFrame(), method);
-			DebugElementEventWaiter waiter = new DebugElementEventWaiter(DebugEvent.SUSPEND, thread);
-			handler.step();
-			Object source = waiter.waitForEvent();
-			assertEquals("Step did not complete", thread, source);
-			thread = (IJavaThread)source;
-			
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			assertEquals("Should be in constructor", "<init>", frame.getMethodName());
-			
-						
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StratumTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StratumTests.java
deleted file mode 100644
index 9a223bc..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StratumTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaReferenceType;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests strata.
- */
-public class StratumTests extends AbstractDebugTest {
-	
-	public StratumTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Test available strata on a type.
-	 * 
-	 * @throws Exception
-	 */
-	public void testAvailableStrata() throws Exception {
-		String typeName = "Breakpoints";
-		createLineBreakpoint(81, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IJavaReferenceType type = ((IJavaStackFrame)thread.getTopStackFrame()).getReferenceType();
-			String[] strata = type.getAvailableStrata();
-			assertEquals("Wrong number of available strata", 1, strata.length);
-			assertEquals("Wrong strata", "Java", strata[0]);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Test default stratum on a type.
-	 * 
-	 * @throws Exception
-	 */
-	public void testDefaultStratum() throws Exception {
-		String typeName = "Breakpoints";
-		createLineBreakpoint(81, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IJavaReferenceType type = ((IJavaStackFrame)thread.getTopStackFrame()).getReferenceType();
-			String stratum = type.getDefaultStratum();
-			assertEquals("Wrong strata", "Java", stratum);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	/**
-	 * Test set / get default stratum on a java debug target.
-	 * 
-	 * @throws Exception
-	 */
-	public void testSetGetDefaultStratum() throws Exception {
-		String typeName = "Breakpoints";
-		createLineBreakpoint(81, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IJavaDebugTarget debugTarget= (IJavaDebugTarget)thread.getDebugTarget();
-			String stratum= debugTarget.getDefaultStratum();
-			assertNull("Default strata should be 'null'", stratum);
-			debugTarget.setDefaultStratum("strataTest");
-			stratum= debugTarget.getDefaultStratum();
-			assertEquals("Wrong strata", "strataTest", stratum);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testGetLineInStratum() throws Exception {
-		String typeName= "Breakpoints";
-		createLineBreakpoint(81, typeName);
-
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IJavaStackFrame stackFrame= (IJavaStackFrame)thread.getTopStackFrame();
-			int lineNumber= stackFrame.getLineNumber("Java");
-			assertEquals("Wrong line number", 81, lineNumber);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}
-	}
-
-	public void testGetSourceNameInStratum() throws Exception {
-		String typeName= "Breakpoints";
-		createLineBreakpoint(81, typeName);
-
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IJavaStackFrame stackFrame= (IJavaStackFrame)thread.getTopStackFrame();
-			String sourceName= stackFrame.getSourceName("Java");
-			assertEquals("Wrong source name", "Breakpoints.java", sourceName);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java
deleted file mode 100644
index 0891e2c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StringSubstitutionTests.java
+++ /dev/null
@@ -1,687 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.internal.variables.StringVariableManager;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.variables.IDynamicVariable;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.IValueVariable;
-import org.eclipse.core.variables.IValueVariableListener;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * Tests string substitutions
- */
-public class StringSubstitutionTests extends AbstractDebugTest implements IValueVariableListener {
-	
-	// change notification
-	public IValueVariable[] fAdded;
-	public IValueVariable[] fChanged;
-	public IValueVariable[] fRemoved;
-	
-	public StringSubstitutionTests(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the value variable with the given name or <code>null</code>
-	 * if none.
-	 * 
-	 * @param name variable name 
-	 * @return value variable with the given name or <code>null</code>
-	 * if none
-	 */
-	protected IValueVariable getValueVariable(String name) {
-		return VariablesPlugin.getDefault().getStringVariableManager().getValueVariable(name);
-	}
-	
-	/**
-	 * Returns the context variable with the given name or <code>null</code>
-	 * if none.
-	 * 
-	 * @param name variable name 
-	 * @return context variable with the given name or <code>null</code>
-	 * if none
-	 */
-	protected IDynamicVariable getContextVariable(String name) {
-		return VariablesPlugin.getDefault().getStringVariableManager().getDynamicVariable(name);
-	}	
-	
-	/**
-	 * Tests value variable initializer
-	 * 
-	 * @throws Exception
-	 */
-	public void testValueInitializer() throws Exception {
-		IValueVariable variable = getValueVariable("VALUE_VAR_WITH_INITIALIZER");
-		assertNotNull("Missing VALUE_VAR_WITH_INITIALIZER", variable);
-		String value = variable.getValue();
-		assertEquals("value should be 'initialized-value'", "initialized-value", value);
-	}	
-	
-	/**
-	 * Tests value variable with an initial value
-	 */
-	public void testValueSupplied() throws Exception {
-		IValueVariable variable = getValueVariable("VALUE_VAR_WITH_VALUE");
-		assertNotNull("Missing VALUE_VAR_WITH_VALUE", variable);
-		String value = variable.getValue();
-		assertEquals("initial-value", value);		
-	}
-	
-	/**
-	 * Tests a context variable with an argument
-	 */
-	public void testContextWithArg() throws CoreException {
-		IDynamicVariable variable = getContextVariable("SAMPLE_DYNAMIC_VAR");
-		assertNotNull("Missing SAMPLE_DYNAMIC_VAR", variable);
-		String value = variable.getValue("ONE");
-		assertEquals("the arg is ONE", value);
-	}
-	
-	/**
-	 * Tests a context variable with no argument
-	 */	
-	public void testContextWithoutArg() throws CoreException {
-		IDynamicVariable variable = getContextVariable("SAMPLE_DYNAMIC_VAR");
-		assertNotNull("Missing SAMPLE_DYNAMIC_VAR", variable);
-		String value = variable.getValue(null);
-		assertEquals("no arg", value);		
-	}
-	
-	/**
-	 * Test an expression with no variable references
-	 */
-	public void testNoReferences() throws CoreException {
-		String expression = "no references";
-		String result = doSubs(expression);
-		assertEquals(expression, result);
-	}
-	
-	/**
-	 * Test an expression with a value variable reference
-	 */
-	public void testValueVarReference() throws CoreException {
-		String expression = "something ${VALUE_VAR_WITH_INITIALIZER} else";
-		String result = doSubs(expression);
-		assertEquals("something initialized-value else", result);
-	}
-	
-	/**
-	 * Test an expression with a context variable reference
-	 */
-	public void testContextVarReferenceNoArgs() throws CoreException {
-		String expression = "something ${SAMPLE_DYNAMIC_VAR} else";
-		String result = doSubs(expression);
-		assertEquals("something no arg else", result);
-	}
-	
-	/**
-	 * Test an expression with a context variable reference and arg
-	 */
-	public void testContextVarReferenceWithArg() throws CoreException {
-		String expression = "something ${SAMPLE_DYNAMIC_VAR:TWO} else";
-		String result = doSubs(expression);
-		assertEquals("something the arg is TWO else", result);
-	}	
-	
-	/**
-	 * Test an expression with multiple references
-	 */
-	public void testMultipleReferences() throws CoreException {
-		String expression = "${SAMPLE_DYNAMIC_VAR:TWO} ${VALUE_VAR_WITH_INITIALIZER} ${VALUE_VAR_WITH_VALUE}";
-		String result = doSubs(expression);
-		assertEquals("the arg is TWO initialized-value initial-value", result);
-	}	
-		
-	/**
-	 * Perfrom substitutions on the given expression.
-	 * 
-	 * @param expression source expression
-	 * @return the result after performing substitutions
-	 */
-	protected String doSubs(String expression) throws CoreException {
-		IStringVariableManager manager = StringVariableManager.getDefault();
-		return manager.performStringSubstitution(expression);
-	}
-
-	/**
-	 * Test nested variables
-	 */
-	public void testNestedReferences() throws CoreException {
-		String expression = "${SAMPLE_DYNAMIC_VAR:${VALUE_VAR_WITH_VALUE}}";
-		String result = doSubs(expression);
-		assertEquals("the arg is initial-value", result);
-	}
-	
-	/**
-	 * Test recursive resolution
-	 */
-	public void testRecursiveReferences() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IValueVariable variable = manager.newValueVariable("my_var", null);
-		try {
-			manager.addVariables(new IValueVariable[]{variable});
-			variable.setValue("${SAMPLE_DYNAMIC_VAR:recurse}");
-			String expression = "something ${my_var} else";
-			String result = doSubs(expression);
-			assertEquals("something the arg is recurse else", result);
-		} finally {
-			manager.removeVariables(new IValueVariable[]{variable});
-		}
-	}
-	
-	/**
-	 * Test for simple cycling references like ${A} -> ${B} -> ${A}
-	 */
-	public void testSimpleReferenceCycle() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IValueVariable var1 = manager.newValueVariable("var_A", null);
-		IValueVariable var2 = manager.newValueVariable("var_B", null);
-		try {
-			manager.addVariables(new IValueVariable[]{var1, var2});
-			var1.setValue("${var_B}");
-			var2.setValue("${var_A}");
-			String expression = "something ${var_A} else";
-			try {
-				doSubs(expression);
-				assertTrue("Expected cycle to cause exception", false);
-			} catch (CoreException ce){
-				IStatus status = ce.getStatus();
-				if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR)
-					throw ce;				
-			}
-		} finally {
-			manager.removeVariables(new IValueVariable[]{var1, var2});
-		}
-	}
-	
-	/**
-	 * Test for cycling references in cases where original expression is never duplicated
-	 * eg. ${A} -> ${B}z -> ${A}z -> ${B}zz
-	 */
-	public void testReferenceCycleWithUniqueExpression() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IValueVariable var1 = manager.newValueVariable("var_A", null);
-		IValueVariable var2 = manager.newValueVariable("var_B", null);
-		try {
-			manager.addVariables(new IValueVariable[]{var1, var2});
-			var1.setValue("${var_B} plus foo");
-			var2.setValue("${var_A}");
-			String expression = "something ${var_A} else";
-			try {
-				doSubs(expression);
-				assertTrue("Expected cycle to cause exception", false);
-			} catch (CoreException ce){
-				IStatus status = ce.getStatus();
-				if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR)
-					throw ce;				
-			}
-		} finally {
-			manager.removeVariables(new IValueVariable[]{var1, var2});
-		}
-	}
-	
-	/**
-	 * Test for proper handling of infinite variable reference cycles in cases where
-	 * resolving two variables results in a third
-	 * eg 	${A} = "${"
-	 * 		${B} = "C}
-	 * 		${C} = ${A}${B}
-	 * 		In this case any references to ${C} or ${A}${B} cannot be resolved 
-	 */
-	public void testDividedRecursiveReferenceCycles() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IValueVariable var1 = manager.newValueVariable("var_A", null);
-		IValueVariable var2 = manager.newValueVariable("var_B", null);
-		IValueVariable var3 = manager.newValueVariable("var_C", null);
-		try {
-			manager.addVariables(new IValueVariable[]{var1, var2, var3});
-			var1.setValue("${");
-			var2.setValue("var_C}");
-			var3.setValue("${var_A}${var_B}");
-			String expression = "${var_A}${var_B}";
-			try {
-				doSubs(expression);
-				assertTrue("Expected cycle to cause exception", false);
-			} catch (CoreException ce){
-				IStatus status = ce.getStatus();
-				if (status.getSeverity() != IStatus.ERROR || status.getCode() != VariablesPlugin.REFERENCE_CYCLE_ERROR)
-					throw ce;				
-			}
-		} finally {
-			manager.removeVariables(new IValueVariable[]{var1, var2, var3});
-		}		
-	}
-	
-	/**
-	 * Test a string with an open ended reference. The open ended expression
-	 * will not be translated.
-	 */
-	public void testOpenEndedBrace() throws CoreException {
-		String expression = "${SAMPLE_DYNAMIC_VAR:${VALUE_VAR_WITH_VALUE}";
-		String result = doSubs(expression);
-		assertEquals("${SAMPLE_DYNAMIC_VAR:initial-value", result);
-	}
-	
-	/**
-	 * Test that we receive proper add notification.
-	 * 
-	 * @throws CoreException
-	 */
-	public void testAddNotificaiton() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		List vars = new ArrayList();
-		IValueVariable one = manager.newValueVariable("var_one", null);
-		IValueVariable two = manager.newValueVariable("var_two", null);
-		vars.add(one);
-		vars.add(two);
-		try {
-			manager.addVariables(new IValueVariable[]{one, two});
-			assertNotNull("no add notifications", fAdded);
-			for (int i = 0; i < fAdded.length; i++) {
-				vars.remove(fAdded[i]);
-			}
-			assertEquals("collection should be empty", 0, vars.size());
-		} finally {
-			manager.removeVariables(new IValueVariable[]{one, two});
-		}
-	}
-	
-	/**
-	 * Test that we receive proper change notification.
-	 * 
-	 * @throws CoreException
-	 */
-	public void testChangeNotificaiton() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IValueVariable one = manager.newValueVariable("var_one", null);
-		IValueVariable two = manager.newValueVariable("var_two", null);
-		try {
-			manager.addVariables(new IValueVariable[]{one, two});
-			one.setValue("1");
-			assertNotNull("no change notifications", fChanged);
-			assertEquals("should be 1 change notification", 1, fChanged.length);
-			assertEquals(one, fChanged[0]);
-			two.setValue("2");
-			assertNotNull("no change notifications", fChanged);
-			assertEquals("should be 1 change notification", 1, fChanged.length);
-			assertEquals(two, fChanged[0]);			
-		} finally {
-			manager.removeVariables(new IValueVariable[]{one, two});
-		}
-	}	
-	
-	/**
-	 * Test that we receive proper remove notification.
-	 * 
-	 * @throws CoreException
-	 */
-	public void testRemoveNotificaiton() throws CoreException {
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		List vars = new ArrayList();
-		IValueVariable one = manager.newValueVariable("var_one", null);
-		IValueVariable two = manager.newValueVariable("var_two", null);
-		vars.add(one);
-		vars.add(two);
-		try {
-			manager.addVariables(new IValueVariable[]{one, two});
-			manager.removeVariables(new IValueVariable[]{one, two});
-			assertNotNull("no remove notifications", fRemoved);
-			for (int i = 0; i < fRemoved.length; i++) {
-				vars.remove(fRemoved[i]);
-			}
-			assertEquals("collection should be empty", 0, vars.size());
-		} finally {
-			manager.removeVariables(new IValueVariable[]{one, two});
-		}
-	}	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		fAdded = null;
-		fChanged = null;
-		fRemoved = null;
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		manager.addValueVariableListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		manager.removeValueVariableListener(this);
-		fAdded = null;
-		fChanged = null;
-		fRemoved = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableListener#variablesAdded(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable[])
-	 */
-	public void variablesAdded(IValueVariable[] variables) {
-		fAdded = variables;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableListener#variablesChanged(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable[])
-	 */
-	public void variablesChanged(IValueVariable[] variables) {
-		fChanged = variables;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.stringsubstitution.IValueVariableListener#variablesRemoved(org.eclipse.debug.internal.core.stringsubstitution.IValueVariable[])
-	 */
-	public void variablesRemoved(IValueVariable[] variables) {
-		fRemoved = variables;
-	}
-	
-	/**
-	 * Test the <code>${workspace_loc}</code> variable.
-	 */
-	public void testWorkspaceLoc() throws CoreException {
-		String expression = "${workspace_loc}";
-		String result = doSubs(expression);
-		assertEquals(ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(), result);
-	}
-
-	/**
-	 * Test the <code>${workspace_loc}</code> variable with an argument
-	 */
-	public void testWorkspaceLocArg() throws CoreException {
-		String expression = "${workspace_loc:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFolder("src").getLocation().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${project_loc}</code> variable with a project name argument
-	 */
-	public void testProjectLocArgProjectName() throws CoreException {
-		String expression = "${project_loc:DebugTests}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getLocation().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${project_loc}</code> variable with a folder path argument
-	 */
-	public void testProjectLocArgFolderPath() throws CoreException {
-		String expression = "${project_loc:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getLocation().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${project_loc}</code> variable with a folder selected
-	 */
-	public void testProjectLocSelectFolder() throws CoreException {
-		String expression = "${project_loc}";
-		IResource resource = getJavaProject().getProject().getFolder("src");
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getProject().getLocation().toOSString(), result);
-	}
-		
-	/**
-	 * Test the <code>${project_path}</code> variable with a project name argument
-	 */
-	public void testProjectPathArgProjectName() throws CoreException {
-		String expression = "${project_path:DebugTests}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFullPath().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${project_path}</code> variable with a file selected
-	 */
-	public void testProjectPathSelectFile() throws CoreException {
-		String expression = "${project_path}";
-		IResource resource = getJavaProject().getProject().getFile(".classpath");
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getProject().getFullPath().toOSString(), result);
-	}				
-	
-	/**
-	 * Test the <code>${project_path}</code> variable with a folder path argument
-	 */
-	public void testProjectPathArgFolderPath() throws CoreException {
-		String expression = "${project_path:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFullPath().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${project_name}</code> variable with a project name argument
-	 */
-	public void testProjectNameArgProjectName() throws CoreException {
-		String expression = "${project_name:DebugTests}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getName(), result);
-	}
-	
-	/**
-	 * Test the <code>${project_name}</code> variable with a project selected
-	 */
-	public void testProjectNameSelectProject() throws CoreException {
-		String expression = "${project_name}";
-		IResource resource = getJavaProject().getProject();
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getProject().getName(), result);
-	}				
-	
-	/**
-	 * Test the <code>${project_name}</code> variable with a folder path argument
-	 */
-	public void testProjectNameArgFolderPath() throws CoreException {
-		String expression = "${project_name:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getName(), result);
-	}
-	
-	/**
-	 * Test the <code>${container_loc}</code> variable with a folder name argument.
-	 * Will resolve to the container of the specified folder.
-	 */
-	public void testContainerLocArgFolderName() throws CoreException {
-		String expression = "${container_loc:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getLocation().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${container_loc}</code> variable with a folder selected.
-	 * Will resolve to the container of the specified folder.
-	 */
-	public void testContainerLocSelectFolder() throws CoreException {
-		String expression = "${container_loc}";
-		IResource resource = getJavaProject().getProject().getFolder("src");
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getParent().getLocation().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${container_path}</code> variable with a folder name argument.
-	 * Will resolve to the container of the specified folder.
-	 */
-	public void testContainerPathArgFolderName() throws CoreException {
-		String expression = "${container_path:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFullPath().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${container_path}</code> variable with a folder selected.
-	 * Will resolve to the container of the specified folder.
-	 */
-	public void testContainerPathSelectFolder() throws CoreException {
-		String expression = "${container_path}";
-		IResource resource = getJavaProject().getProject().getFolder("src"); 
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getParent().getFullPath().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${container_name}</code> variable with a folder name argument.
-	 * Will resolve to the container of the specified folder.
-	 */
-	public void testContainerNameArgFolderName() throws CoreException {
-		String expression = "${container_name:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getName(), result);
-	}
-	
-	/**
-	 * Test the <code>${container_name}</code> variable with a folder selected.
-	 * Will resolve to the container of the specified folder.
-	 */
-	public void testContainerNameSelectFolder() throws CoreException {
-		String expression = "${container_name}";
-		IResource resource = getJavaProject().getProject().getFolder("src"); 
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getParent().getName(), result);
-	}
-	
-	/**
-	 * Test the <code>${resource_loc}</code> variable with a folder name argument.
-	 */
-	public void testResourceLocArgFolderName() throws CoreException {
-		String expression = "${resource_loc:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFolder("src").getLocation().toOSString(), result);
-	}
-	
-	/**
-	 * Test the <code>${resource_loc}</code> variable with a folder selected.
-	 */
-	public void testResourceLocSelectFolder() throws CoreException {
-		String expression = "${resource_loc}";
-		IResource resource = getJavaProject().getProject().getFolder("src");
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getLocation().toOSString(), result);
-	}	
-		
-	/**
-	 * Test the <code>${resource_path}</code> variable with a folder name argument.
-	 */
-	public void testResourcePathArgFolderName() throws CoreException {
-		String expression = "${resource_path:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFolder("src").getFullPath().toOSString(), result);
-	}
-
-	/**
-	 * Test the <code>${resource_path}</code> variable with a file selected.
-	 */
-	public void testResourcePathSelectFile() throws CoreException {
-		String expression = "${resource_path}";
-		IResource resource = getJavaProject().getProject().getFile(".classpath"); 
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getFullPath().toOSString(), result);
-	}	
-	
-	/**
-	 * Test the <code>${resource_name}</code> variable with a folder name argument.
-	 */
-	public void testResourceNameArgFolderName() throws CoreException {
-		String expression = "${resource_name:DebugTests/src}";
-		String result = doSubs(expression);
-		assertEquals(getJavaProject().getProject().getFolder("src").getName(), result);
-	}	
-
-	/**
-	 * Test the <code>${resource_name}</code> variable with a file selected.
-	 */
-	public void testResourceNameSelectFile() throws CoreException {
-		String expression = "${resource_name}";
-		IResource resource = getJavaProject().getProject().getFile(".classpath");
-		setSelection(resource);
-		String result = doSubs(expression);
-		assertEquals(resource.getName(), result);
-	}
-
-	/**
-	 * Tests that variables work as parameters to various fields in local Java
-	 * application configurations.
-	 */
-	public void testLocalJavaApplicationParameters() throws CoreException {
-		IResource resource = getJavaProject().getProject().getFile(".classpath");
-		setSelection(resource);
-		
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "${project_name}");
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "${resource_name}");
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, "${project_loc}");
-		
-		JavaLaunchDelegate delegate = new JavaLaunchDelegate();
-		
-		assertEquals(resource.getProject().getName(), delegate.getProgramArguments(wc));
-		assertEquals(resource.getName(), delegate.getVMArguments(wc));
-		File workingDir = delegate.getWorkingDirectory(wc);
-		assertNotNull(workingDir);
-		assertEquals(resource.getProject().getLocation().toOSString(), workingDir.toString());
-	}
-	
-	/**
-	 * Sets the selected resource in the navigator view.
-	 * 
-	 * @param resource resource to select
-	 */
-	protected void setSelection(final IResource resource) {
-		Runnable r = new Runnable() {
-			public void run() {
-				IWorkbenchPage page = DebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
-				IViewPart part;
-				try {
-					part = page.showView("org.eclipse.ui.views.ResourceNavigator");
-					part.getSite().getSelectionProvider().setSelection(new StructuredSelection(resource));
-				} catch (PartInitException e) {
-					assertNotNull("Failed to open navigator view", null);
-				}
-				
-			}
-		};
-		DebugUIPlugin.getStandardDisplay().syncExec(r);
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
deleted file mode 100644
index 355d1ea..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Test that a SUSPEND_VM breakpoint suspends all threads
- */
-public class SuspendVMBreakpointsTests extends AbstractDebugTest {
-
-	public SuspendVMBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testSuspendVmLineBreakpoint() throws Exception {
-		String typeName = "MultiThreadedLoop";
-		IJavaLineBreakpoint bp = createLineBreakpoint(40, typeName);
-		bp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-			
-			verifyAllThreadsSuspended(thread);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testSuspendVmExceptionBreakpoint() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertEquals("suspended, but not by exception breakpoint", ex ,hit);
-			
-			verifyAllThreadsSuspended(thread);
-			
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testSuspendVmAccessWatchpointBreakpoint() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		wp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			
-			verifyAllThreadsSuspended(thread);
-			
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	public void testSuspendVmModificationWatchpointBreakpoint() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", false, true);
-		wp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			verifyAllThreadsSuspended(thread);
-			
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testSuspendVmMethodEntryBreakpoint() throws Exception {
-		String typeName = "DropTests";
-		IJavaBreakpoint bp = createMethodBreakpoint(typeName, "method4", "()V", true, false);
-		bp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("breakpoint was not a method breakpoint", hit instanceof IJavaMethodBreakpoint);
-
-			verifyAllThreadsSuspended(thread);
-			
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testSuspendVmMethodExitBreakpoint() throws Exception {
-		String typeName = "DropTests";
-		IJavaBreakpoint bp = createMethodBreakpoint(typeName, "method1", "()V", false, true);		
-		bp.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			assertTrue("breakpoint was not a method breakpoint", hit instanceof IJavaMethodBreakpoint);
-
-			verifyAllThreadsSuspended(thread);
-						
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	protected void verifyAllThreadsSuspended(IJavaThread thread) {
-		try {
-			IJavaDebugTarget debugTarget = (IJavaDebugTarget)thread.getDebugTarget();
-			IThread[] threads = debugTarget.getThreads();
-			for (int i = 0; i < threads.length; i++) {
-				assertTrue("Thread wasn't suspended when a SUSPEND_VM breakpoint was hit, thread=" + threads[i].getName(), threads[i].isSuspended());
-			}		
-		} catch (DebugException e) {
-			fail(e.getMessage());
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
deleted file mode 100644
index 689535d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.core.dom.Message;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaBreakpointListener;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaTargetPatternBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaType;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
-
-/**
- * Tests deferred target pattern breakpoints.
- */
-public class TargetPatternBreakpointTests extends AbstractDebugTest implements IJavaBreakpointListener {
-	
-	public TargetPatternBreakpointTests(String name) {
-		super(name);
-	}
-
-	public void testTargetPatternBreakpoints() throws Exception {
-		JDIDebugPlugin.getDefault().addJavaBreakpointListener(this);
-		
-		String sourceName = "Breakpoints.java";
-		List bps = new ArrayList();
-		// anonymous class
-		bps.add(createTargetPatternBreakpoint(43, sourceName));
-		// blocks
-		bps.add(createTargetPatternBreakpoint(102, sourceName));
-		// constructor
-		bps.add(createTargetPatternBreakpoint(77, sourceName));
-		// else
-		bps.add(createTargetPatternBreakpoint(66, sourceName));
-		//finally after catch
-		bps.add(createTargetPatternBreakpoint(120, sourceName));
-		//finally after try
-		bps.add(createTargetPatternBreakpoint(128, sourceName));
-		// for loop
-		bps.add(createTargetPatternBreakpoint(93, sourceName));
-		// if
-		bps.add(createTargetPatternBreakpoint(81, sourceName));
-		// initializer
-		bps.add(createTargetPatternBreakpoint(17, sourceName));
-		// inner class
-		bps.add(createTargetPatternBreakpoint(22, sourceName));
-		// return true
-		bps.add(createTargetPatternBreakpoint(72, sourceName));
-		// instance method
-		bps.add(createTargetPatternBreakpoint(107, sourceName));
-		// static method 
-		bps.add(createTargetPatternBreakpoint(53, sourceName));
-		// case statement
-		bps.add(createTargetPatternBreakpoint(133, sourceName));
-		// default statement
-		bps.add(createTargetPatternBreakpoint(140, sourceName));
-		// synchronized blocks
-		bps.add(createTargetPatternBreakpoint(146, sourceName));
-		// try
-		bps.add(createTargetPatternBreakpoint(125, sourceName));
-		//catch
-		bps.add(createTargetPatternBreakpoint(118, sourceName));
-		// while
-		bps.add(createTargetPatternBreakpoint(97, sourceName));
-		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint("Breakpoints");
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				int stackLine = thread.getTopStackFrame().getLineNumber();
-				assertEquals("line numbers of breakpoint and stack frame do not match", lineNumber, stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			JDIDebugPlugin.getDefault().removeJavaBreakpointListener(this);
-		}		
-	}
-	/**
-	 * @see IJavaBreakpointListener#addingBreakpoint(IJavaDebugTarget, IJavaBreakpoint)
-	 */
-	public void addingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-			if (breakpoint instanceof IJavaTargetPatternBreakpoint) {
-				IJavaTargetPatternBreakpoint bp = (IJavaTargetPatternBreakpoint)breakpoint;
-				try {
-					bp.setPattern(target,"Breakp");
-				} catch (CoreException e) {
-					assertTrue("Failed to set pattern", false);
-				}
-			}
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointHit(IJavaThread, IJavaBreakpoint)
-	 */
-	public int breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
-		return DONT_CARE;
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointInstalled(IJavaDebugTarget, IJavaBreakpoint)
-	 */
-	public void breakpointInstalled(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointRemoved(IJavaDebugTarget, IJavaBreakpoint)
-	 */
-	public void breakpointRemoved(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint) {
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#installingBreakpoint(IJavaDebugTarget, IJavaBreakpoint, IJavaType)
-	 */
-	public int installingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint,
-		IJavaType type) {
-		return DONT_CARE;
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointHasCompilationErrors(IJavaLineBreakpoint, Message[])
-	 */
-	public void breakpointHasCompilationErrors(
-		IJavaLineBreakpoint breakpoint,
-		Message[] errors) {
-	}
-
-	/**
-	 * @see IJavaBreakpointListener#breakpointHasRuntimeException(IJavaLineBreakpoint, DebugException)
-	 */
-	public void breakpointHasRuntimeException(
-		IJavaLineBreakpoint breakpoint,
-		DebugException exception) {
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
deleted file mode 100644
index 5889c09..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests breakpoints with thread filters
- */
-public class ThreadFilterBreakpointsTests extends AbstractDebugTest {
-
-	public ThreadFilterBreakpointsTests(String name) {
-		super(name);
-	}
-
-	public void testSimpleThreadFilterBreakpoint() throws Exception {
-		String typeName = "HitCountLooper";
-		IJavaLineBreakpoint bp = createLineBreakpoint(16, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			bp.setThreadFilter(thread);
-			resumeToLineBreakpoint(thread, bp);
-						
-			bp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testMultiThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedLoop";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(17, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			
-			IJavaLineBreakpoint bp2 = createLineBreakpoint(40, typeName);
-			bp2.setThreadFilter(thread);
-			
-			thread = resumeToLineBreakpoint(thread, bp2);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-						
-			bp1.delete();
-			bp2.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExceptionThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedException";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(17, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			IJavaExceptionBreakpoint ex1 = createExceptionBreakpoint("java.lang.NullPointerException", false, true);
-			ex1.setThreadFilter(thread);
-			
-			thread = resume(thread);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-			
-			bp1.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-			
-	public void testAccessWatchpointThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedList";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(21, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);			
-			wp.setThreadFilter(thread);			
-			
-			thread = resume(thread);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-			
-			bp1.delete();
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-			
-	public void testModificationWatchpointThreadFilterBreakpoint() throws Exception {
-		String typeName = "MultiThreadedList";
-		IJavaLineBreakpoint bp1 = createLineBreakpoint(22, typeName);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp1);
-			IJavaWatchpoint wp = createWatchpoint(typeName, "i", false, true);			
-			wp.setThreadFilter(thread);			
-			
-			thread = resume(thread);
-			assertTrue("Suspended thread should have been '1stThread'", thread.getName().equals("1stThread"));
-			
-			bp1.delete();
-			wp.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java
deleted file mode 100644
index 0023af9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TypeTests.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaObject;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaType;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-/**
- * Tests equality of Java types.
- */
-public class TypeTests extends AbstractDebugTest {
-	
-	public TypeTests(String name) {
-		super(name);
-	}
-
-	public void testDeclaringTypes() throws Exception {
-		IJavaType[] types = new IJavaType[3];
-		int index = 0;
-		String typeName = "Breakpoints";
-		List bps = new ArrayList();
-		// main
-		bps.add(createLineBreakpoint(52, typeName));
-		// threading
-		bps.add(createLineBreakpoint(66, typeName));
-		// InnerRunnable.run
-		bps.add(createLineBreakpoint(61, typeName));		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			while (!bps.isEmpty()) {
-				IBreakpoint hit = getBreakpoint(thread);
-				assertNotNull("suspended, but not by breakpoint", hit);
-				assertTrue("hit un-registered breakpoint", bps.contains(hit));
-				assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-				ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-				int lineNumber = breakpoint.getLineNumber();
-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-				types[index] = frame.getReferenceType();
-				
-				if (index == 1) {
-					assertEquals("First two types should be the same", types[0], types[1]);
-				}
-				
-				if (index == 2) {
-					assertTrue("Last two types should be different", !types[0].equals(types[2]));
-				}
-				
-				index++;
-				int stackLine = frame.getLineNumber();
-				assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-				bps.remove(breakpoint);
-				breakpoint.delete();
-				if (!bps.isEmpty()) {
-					thread = resume(thread);
-				}
-			}
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-    
-    public void testClassLoader() throws Exception {
-        String typeName = "Breakpoints";
-        List bps = new ArrayList();
-        // instance method
-        bps.add(createLineBreakpoint(81, typeName));
-        bps.add(createLineBreakpoint(88, typeName));
-        IJavaObject[] loaders = new IJavaObject[2];
-        int index = 0;
-        
-        IJavaThread thread= null;
-        try {
-            thread= launchToBreakpoint(typeName);
-            assertNotNull("Breakpoint not hit within timeout period", thread);
-            while (!bps.isEmpty()) {
-                IBreakpoint hit = getBreakpoint(thread);
-                assertNotNull("suspended, but not by breakpoint", hit);
-                assertTrue("hit un-registered breakpoint", bps.contains(hit));
-                assertTrue("suspended, but not by line breakpoint", hit instanceof ILineBreakpoint);
-                ILineBreakpoint breakpoint= (ILineBreakpoint) hit;
-                int lineNumber = breakpoint.getLineNumber();
-                IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-                loaders[index] = frame.getReferenceType().getClassLoaderObject();
-                assertNotNull("class loader cannot be null", loaders[index]);
-                
-                if (index == 1) {
-                    assertEquals("First two class loaders should be the same", loaders[0], loaders[1]);
-                }
-                                
-                index++;
-                int stackLine = frame.getLineNumber();
-                assertTrue("line numbers of breakpoint and stack frame do not match", lineNumber == stackLine);
-                bps.remove(breakpoint);
-                breakpoint.delete();
-                if (!bps.isEmpty()) {
-                    thread = resume(thread);
-                }
-            }
-        } finally {
-            terminateAndRemove(thread);
-            removeAllBreakpoints();
-        }               
-    }
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java
deleted file mode 100644
index ed67636..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/VMInstallTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Tests for installed VMs
- */
-public class VMInstallTests extends AbstractDebugTest {
-		
-	public VMInstallTests(String name) {
-		super(name);
-	}
-
-	public void testJavaVersion() throws CoreException {
-		IVMInstall def = JavaRuntime.getDefaultVMInstall();
-		assertTrue("should be an IVMInstall2", def instanceof IVMInstall2);
-		IVMInstall2 vm2 = (IVMInstall2)def;
-        String javaVersion = vm2.getJavaVersion();
-        assertNotNull("default VM is missing java.version", javaVersion);
-	}
-	
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java
deleted file mode 100644
index 3543e1a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchExpressionTests.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IExpressionManager;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IWatchExpression;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaValue;
-import org.eclipse.jdt.debug.testplugin.DebugElementEventWaiter;
-import org.eclipse.jdt.debug.testplugin.ExpressionWaiter;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.WorkbenchException;
-
-
-/**
- * WatchExpressionTests
- */
-public class WatchExpressionTests extends AbstractDebugTest {
-	
-	public WatchExpressionTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Test a watch expression that is created before a program is executed.
-	 */
-	public void testDeferredExpression() throws Exception {
-		IWatchExpression expression = getExpressionManager().newWatchExpression("((Integer)fVector.get(3)).intValue()");
-		getExpressionManager().addExpression(expression);
-		String typeName = "WatchItemTests";
-		createLineBreakpoint(42, typeName);
-		IJavaThread thread= null;
-		try {
-			DebugElementEventWaiter waiter = new ExpressionWaiter(DebugEvent.CHANGE, expression);
-			waiter.setTimeout(60000);
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread); 
-			Object source = waiter.waitForEvent();
-			assertNotNull("Watch expression did not change", source);
-			IValue value = expression.getValue();
-			// create comparison value
-			IJavaDebugTarget target = (IJavaDebugTarget)thread.getDebugTarget();
-			IJavaValue compare = target.newValue(3);
-			assertEquals("Watch expression should be Integer(3)", compare, value);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			removeAllExpressions();
-		}				
-	}
-	
-	/**
-	 * Test a watch expression that is created while a program is suspended.
-     * 
-     * see bug 81519. This test is flawed as expressions added to the manager
-     * are note updated automatically. They are updated by the action that
-     * creates the expression, or when a selection change occurrs in the debug view.
-     * This test can pass as the ordering of expression addition and selection 
-     * change events can vary. However, it it attempting to test behavior that
-     * does not exist, and is removed from the test suite.
-	 */
-	public void REMOVEDtestNonDeferredExpression() throws Exception {
-		String typeName = "WatchItemTests";
-		createLineBreakpoint(42, typeName);
-		IJavaThread thread= null;
-		IWatchExpression expression = null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			
-			// create the expression, waiter, and then add it (to be evaluated)
-			expression = getExpressionManager().newWatchExpression("((Integer)fVector.get(3)).intValue()");
-			DebugElementEventWaiter waiter = new ExpressionWaiter(DebugEvent.CHANGE, expression);
-			getExpressionManager().addExpression(expression);
-			 
-			Object source = waiter.waitForEvent();
-			assertNotNull("Watch expression did not change", source);
-			IValue value = expression.getValue();
-			// create comparison value
-			IJavaDebugTarget target = (IJavaDebugTarget)thread.getDebugTarget();
-			IJavaValue compare = target.newValue(3);
-			assertEquals("Watch expression should be Integer(3)", compare, value);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			removeAllExpressions();
-		}				
-	}
-	
-	/**
-	 * Test a watch expression updates while stepping.
-	 */
-	public void testStepping() throws Exception {
-		IWatchExpression expression = getExpressionManager().newWatchExpression("i");
-		getExpressionManager().addExpression(expression);
-		String typeName = "WatchItemTests";
-		createLineBreakpoint(37, typeName);
-		IJavaThread thread= null;
-		try {
-			DebugElementEventWaiter waiter = new ExpressionWaiter(DebugEvent.CHANGE, expression);
-			waiter.setTimeout(60000);
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread); 
-			Object source = waiter.waitForEvent();
-			assertNotNull("Watch expression did not change", source);
-			IValue value = expression.getValue();
-			// create comparison value
-			IJavaDebugTarget target = (IJavaDebugTarget)thread.getDebugTarget();
-			IJavaValue compare = target.newValue(0);
-			assertEquals("Watch expression should be 0", compare, value);
-			
-			// now step once - should still be 0
-			waiter = new ExpressionWaiter(DebugEvent.CHANGE, expression);
-			stepOver((IJavaStackFrame)thread.getTopStackFrame());
-			source = waiter.waitForEvent();
-			assertNotNull("Watch expression did not change", source);
-			
-			// check for errors
-			dumpErrors(expression);
-			assertFalse("Should not have errors in expression", expression.hasErrors());
-			
-			// now step again - should be 1
-			waiter = new ExpressionWaiter(DebugEvent.CHANGE, expression);
-			stepOver((IJavaStackFrame)thread.getTopStackFrame());
-			source = waiter.waitForEvent();
-			assertNotNull("Watch expression did not change", source);
-			
-			// check for errors
-			dumpErrors(expression);
-			assertFalse("Should not have errors in expression", expression.hasErrors());
-			
-			value = expression.getValue();			
-			// create comparison value
-			compare = target.newValue(1);
-			assertEquals("Watch expression should be 1", compare, value);
-						
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			removeAllExpressions();
-		}				
-	}
-		
-	/**
-	 * Dumps any error messages to the console.
-	 * 
-     * @param expression
-     */
-    private void dumpErrors(IWatchExpression expression) {
-        if (expression.hasErrors()) {
-            String[] errorMessages = expression.getErrorMessages();
-            for (int i = 0; i < errorMessages.length; i++) {
-                String string = errorMessages[i];
-                System.out.println(getName() + ": " + string);
-            }
-        }
-    }
-
-    /**
-	 * Returns the expression manager
-	 * 
-	 * @return expression manager
-	 */
-	protected IExpressionManager getExpressionManager() {
-		return DebugPlugin.getDefault().getExpressionManager();
-	}
-	
-	/**
-	 * Ensure the expression view is visible
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		Display display = DebugUIPlugin.getStandardDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				try {
-					IWorkbench workbench = PlatformUI.getWorkbench();
-					IWorkbenchPage page = workbench.showPerspective(IDebugUIConstants.ID_DEBUG_PERSPECTIVE, DebugUIPlugin.getActiveWorkbenchWindow());
-					page.showView(IDebugUIConstants.ID_EXPRESSION_VIEW);
-                    page.showView(IDebugUIConstants.ID_DEBUG_VIEW);
-				} catch (WorkbenchException e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-	
-	/**
-	 * Removes all expressions from the manager
-	 */
-	protected void removeAllExpressions() {
-		IExpressionManager manager = getExpressionManager();
-		manager.removeExpressions(manager.getExpressions());
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
deleted file mode 100644
index 767e7b1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public class WatchpointTests extends AbstractDebugTest {
-	
-	public WatchpointTests(String name) {
-		super(name);
-	}
-
-	public void testAccessAndModification() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			// should hit access 10 times
-			int count = 10;
-			while (count > 0) {
-				thread = resume(thread);
-				hit = getBreakpoint(thread);
-				frame = thread.getTopStackFrame();
-				assertNotNull("No breakpoint", hit);
-				assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-				assertEquals("Should be line 30", 30, frame.getLineNumber());
-				count--;
-			}
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testModification() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", false, true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testDisabledModification() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", false, true);
-		wp.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget= null;
-		try {
-			debugTarget= launchAndTerminate(typeName);
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testAccess() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			
-			// should hit access 9 more times
-			int count = 9;
-			while (count > 0) {
-				thread = resume(thread);
-				hit = getBreakpoint(thread);
-				frame = thread.getTopStackFrame();
-				assertNotNull("No breakpoint", hit);
-				assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-				assertEquals("Should be line 30", 30, frame.getLineNumber());
-				count--;
-			}
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	public void testDisabledAccess() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			
-			wp.setEnabled(false);
-						
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-
-	public void testHitCountAccess() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, false);
-		wp.setHitCount(4);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-			assertEquals("Should be line 30", 30, frame.getLineNumber());			
-			IVariable var = findVariable(frame, "value");
-			assertNotNull("Could not find variable 'value'", var);
-			
-			// retrieve an instance var
-			IJavaPrimitiveValue value = (IJavaPrimitiveValue)var.getValue();
-			assertNotNull(value);
-			int varValue = value.getIntValue();
-			assertTrue("'value' should be 7", varValue == 7);			
-			
-			wp.setHitCount(0);
-			
-			// should hit access 6 more times
-			int count = 6;
-			while (count > 0) {
-				thread = resume(thread);
-				hit = getBreakpoint(thread);
-				frame = (IJavaStackFrame) thread.getTopStackFrame();
-				assertNotNull("No breakpoint", hit);
-				assertTrue("Should be an access", wp.isAccessSuspend(thread.getDebugTarget()));
-				assertEquals("Should be line 30", 30, frame.getLineNumber());
-				count--;
-			}
-			
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}	
-	
-	public void testSkipWatchpoint() throws Exception {
-		String typeName = "org.eclipse.debug.tests.targets.Watchpoint";
-		
-		IJavaWatchpoint wp = createWatchpoint(typeName, "list", true, true);
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-
-			IBreakpoint hit = getBreakpoint(thread);
-			IStackFrame frame = thread.getTopStackFrame();
-			assertNotNull("No breakpoint", hit);
-			
-			// should be modification
-			assertTrue("First hit should be modification", !wp.isAccessSuspend(thread.getDebugTarget()));
-			// line 27
-			assertEquals("Should be on line 27", 27, frame.getLineNumber());
-			
-			getBreakpointManager().setEnabled(false);
-			resumeAndExit(thread);
-
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			getBreakpointManager().setEnabled(true);
-		}		
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkingDirectoryTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkingDirectoryTests.java
deleted file mode 100644
index 20ebaa5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkingDirectoryTests.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests working directories.
- */
-public class WorkingDirectoryTests extends AbstractDebugTest {
-	
-	public WorkingDirectoryTests(String name) {
-		super(name);
-	}
-
-	public void testDefaultWorkingDirectory() throws Exception {
-		String typeName = "WorkingDirectoryTest";
-		createLineBreakpoint(16, typeName);		
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			IVariable var = thread.findVariable("dir");
-			String dir = var.getValue().getValueString();
-			IPath path = new Path(dir);
-			assertEquals("default working dir should be the project directory.", getJavaProject().getProject().getLocation(), path); 
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	/**
-	 * Sets the working directory attribute of the test launch config 
-	 * @param path
-	 */
-	protected void setWorkingDirectory(IPath path) throws CoreException {
-		ILaunchConfiguration configuration = getLaunchConfiguration("WorkingDirectoryTest");
-		ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy();
-		String dir = null;
-		if (path != null) {
-			dir = path.toString();
-		}
-		workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, dir);
-		workingCopy.doSave();
-	}
-
-
-	public void removedTestWorkspaceRelativeWorkingDirectory() throws Exception {
-		String typeName = "WorkingDirectoryTest";
-		createLineBreakpoint(16, typeName);
-		IPath wd = getJavaProject().getProject().getFolder("src").getFullPath().makeRelative();
-		setWorkingDirectory(wd);
-
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			IVariable var = thread.findVariable("dir");
-			String dir = var.getValue().getValueString();
-			IPath path = new Path(dir);
-			assertEquals("working dir should be the src directory.", getJavaProject().getProject().getFolder("src").getLocation(), path);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			setWorkingDirectory(null);
-		}
-	}
-	
-	public void testAbsoluteWorkingDirectory() throws Exception {
-		String typeName = "WorkingDirectoryTest";
-		createLineBreakpoint(16, typeName);
-		IPath wd = getJavaProject().getProject().getFolder("src").getLocation();
-		setWorkingDirectory(wd);
-
-		IJavaThread thread= null;
-		try {
-			thread= launchToBreakpoint(typeName);
-			assertNotNull("Breakpoint not hit within timeout period", thread);
-			IBreakpoint hit = getBreakpoint(thread);
-			assertNotNull("suspended, but not by breakpoint", hit);
-			IVariable var = thread.findVariable("dir");
-			String dir = var.getValue().getValueString();
-			IPath path = new Path(dir);
-			assertEquals("working dir should be the src directory.", getJavaProject().getProject().getFolder("src").getLocation(), path);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-			setWorkingDirectory(null);
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkspaceSourceContainerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkspaceSourceContainerTests.java
deleted file mode 100644
index 2146c2e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WorkspaceSourceContainerTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.core;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.WorkspaceSourceContainer;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-
-/**
- * Tests source containers
- */
-public class WorkspaceSourceContainerTests extends AbstractDebugTest {
-	
-	public WorkspaceSourceContainerTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Returns a workspace source container.
-	 */
-	protected WorkspaceSourceContainer getContainer(boolean duplicates) throws Exception {
-		ISourceLookupDirector director = new JavaSourceLookupDirector();
-		director.initializeParticipants();
-		director.setFindDuplicates(duplicates);
-		WorkspaceSourceContainer container = new WorkspaceSourceContainer();
-		director.setSourceContainers(new ISourceContainer[]{container});
-		return container;
-	}	
-	/**
-	 * Tests creation and restoring from a memento.
-	 * 
-	 * @throws Exception
-	 */
-	public void testWorkspaceSourceContainerMemento() throws Exception {
-		WorkspaceSourceContainer container = getContainer(true);
-		String memento = container.getType().getMemento(container);
-		ISourceContainer restore = container.getType().createSourceContainer(memento);
-		assertEquals("Workspace source container memento failed", container, restore);
-	}		
-
-	public void testSimpleSourceLookupPositive() throws Exception {
-		IFolder folder = getJavaProject().getProject().getFolder("src");
-		WorkspaceSourceContainer container = getContainer(false);
-		Object[] objects = container.findSourceElements("Breakpoints.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", folder.getFile("Breakpoints.java"), objects[0]);
-	}
-	
-	public void testSimpleSourceLookupNegative() throws Exception {
-		WorkspaceSourceContainer container = getContainer(false);
-		Object[] objects = container.findSourceElements("FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-	
-	public void testQualifiedSourceLookupPositive() throws Exception {
-		IFolder folder = getJavaProject().getProject().getFolder("src");
-		WorkspaceSourceContainer container = getContainer(false);
-		Object[] objects = container.findSourceElements("org/eclipse/debug/tests/targets/InfiniteLoop.java");
-		assertEquals("Expected 1 result", 1, objects.length);
-		assertEquals("Wrong file", folder.getFile("org/eclipse/debug/tests/targets/InfiniteLoop.java"), objects[0]);
-	}
-	
-	public void testQualifiedSourceLookupNegative() throws Exception {
-		WorkspaceSourceContainer container = getContainer(false);
-		Object[] objects = container.findSourceElements("a/b/c/FileNotFound.java");
-		assertEquals("Expected 0 files", 0, objects.length);
-	}	
-	
-	public void testCaseSensitiveQualifiedSourceLookup() throws Exception {
-		IFolder folder = getJavaProject().getProject().getFolder("src");
-		WorkspaceSourceContainer container = getContainer(false);
-		Object[] objects = container.findSourceElements("oRg/eClIpSe/dEbUg/tEsTs/tArGeTs/INfInItELOop.jaVa");
-		if (isFileSystemCaseSensitive()) {
-			// case sensitive - should not find the file
-			assertEquals("Expected 0 files", 0, objects.length);
-		} else {
-			// case insensitive - should find the file
-			assertEquals("Expected 1 result", 1, objects.length);
-			assertEquals("Wrong file", folder.getFile("org/eclipse/debug/tests/targets/InfiniteLoop.java"), objects[0]);
-		}
-	}		
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
deleted file mode 100644
index f7ca16e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class ArrayAllocationTests extends Tests {
-
-	public ArrayAllocationTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + equalOp + "new byte[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayByte + equalOp + "new byte[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		value = eval(yArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + equalOp + "new char[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayChar + equalOp + "new char[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		value = eval(yArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + equalOp + "new short[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayShort + equalOp + "new short[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		value = eval(yArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + equalOp + "new int[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayInt + equalOp + "new int[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + equalOp + "new long[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayLong + equalOp + "new long[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		value = eval(yArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + equalOp + "new float[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayFloat + equalOp + "new float[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		value = eval(yArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + equalOp + "new double[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayDouble + equalOp + "new double[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		value = eval(yArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + equalOp + "new java.lang.String[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayString + equalOp + "new java.lang.String[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + equalOp + "new boolean[" + xChar + "]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", xCharValue, intValue);
-
-		value = eval(yArrayBoolean + equalOp + "new boolean[" + yChar + "]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		value = eval(yArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignmentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignmentTests.java
deleted file mode 100644
index 08223e1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignmentTests.java
+++ /dev/null
@@ -1,689 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ArrayAssignmentTests extends Tests {
-
-	public ArrayAssignmentTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + "[0]" + equalOp +xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(xArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(xArrayByte + "[1]" + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(xArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(xArrayByte + "[2]" + equalOp +xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(xArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(yArrayByte + "[0]" + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(yArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(yArrayByte + "[1]" + equalOp +xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(yArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(yArrayByte + "[2]" + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(yArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + "[0]" + equalOp +xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", xCharValue, charValue);
-		value = eval(xArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-
-		value = eval(xArrayChar + "[1]" + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", yCharValue, charValue);
-		value = eval(xArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-
-		value = eval(xArrayChar + "[2]" + equalOp +xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", xCharValue, charValue);
-		value = eval(xArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-
-		value = eval(yArrayChar + "[0]" + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", yCharValue, charValue);
-		value = eval(yArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-
-		value = eval(yArrayChar + "[1]" + equalOp +xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", xCharValue, charValue);
-		value = eval(yArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-
-		value = eval(yArrayChar + "[2]" + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array assignment : wrong result : ", yCharValue, charValue);
-		value = eval(yArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + "[0]" + equalOp +xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(xArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(xArrayShort + "[1]" + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(xArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(xArrayShort + "[2]" + equalOp +xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(xArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(yArrayShort + "[0]" + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(yArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(yArrayShort + "[1]" + equalOp +xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(yArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(yArrayShort + "[2]" + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(yArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]" + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xArrayInt + "[1]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(xArrayInt + "[2]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[0]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + "[1]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[2]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + "[0]" + equalOp +xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", xLongValue, longValue);
-		value = eval(xArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-
-		value = eval(xArrayLong + "[1]" + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", yLongValue, longValue);
-		value = eval(xArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-
-		value = eval(xArrayLong + "[2]" + equalOp +xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", xLongValue, longValue);
-		value = eval(xArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-
-		value = eval(yArrayLong + "[0]" + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", yLongValue, longValue);
-		value = eval(yArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-
-		value = eval(yArrayLong + "[1]" + equalOp +xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", xLongValue, longValue);
-		value = eval(yArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-
-		value = eval(yArrayLong + "[2]" + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array assignment : wrong result : ", yLongValue, longValue);
-		value = eval(yArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + "[0]" + equalOp +xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(xArrayFloat + "[1]" + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(xArrayFloat + "[2]" + equalOp +xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + "[0]" + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + "[1]" + equalOp +xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + "[2]" + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + "[0]" + equalOp +xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(xArrayDouble + "[1]" + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(xArrayDouble + "[2]" + equalOp +xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + "[0]" + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + "[1]" + equalOp +xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + "[2]" + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]" + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xArrayString + "[1]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(xArrayString + "[2]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[0]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + "[1]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[2]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + "[0]" + equalOp +xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(xArrayBoolean + "[1]" + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(xArrayBoolean + "[2]" + equalOp +xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + "[0]" + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + "[1]" + equalOp +xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + "[2]" + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
deleted file mode 100644
index c96799f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ArrayInitializationTests extends Tests {
-
-	public ArrayInitializationTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + equalOp + "new byte[]{" + xByte + ", " + yByte + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		int intValue = 0;
-		byte byteValue = yByteValue;
-		value = eval(xArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", 2, intValue);
-		value = eval(xArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-		value = eval(xArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(yArrayByte + equalOp + "new byte[]{" + xByte + ", " + yByte + ", " + xByte + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array assignment : wrong type : ", "byte[]", typeName);
-		value = eval(yArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", 3, intValue);
-		value = eval(yArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-		value = eval(yArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yByteValue, byteValue);
-		value = eval(yArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + equalOp + "new char[]{" + xChar + ", " + yChar + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		int intValue = 0;
-		char charValue = yCharValue;
-		value = eval(xArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", 2, intValue);
-		value = eval(xArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-		value = eval(xArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-
-		value = eval(yArrayChar + equalOp + "new char[]{" + xChar + ", " + yChar + ", " + xChar + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array assignment : wrong type : ", "char[]", typeName);
-		value = eval(yArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", 3, intValue);
-		value = eval(yArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-		value = eval(yArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yCharValue, charValue);
-		value = eval(yArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + equalOp + "new short[]{" + xShort + ", " + yShort + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		int intValue = 0;
-		short shortValue = yShortValue;
-		value = eval(xArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", 2, intValue);
-		value = eval(xArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-		value = eval(xArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(yArrayShort + equalOp + "new short[]{" + xShort + ", " + yShort + ", " + xShort + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array assignment : wrong type : ", "short[]", typeName);
-		value = eval(yArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", 3, intValue);
-		value = eval(yArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-		value = eval(yArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yShortValue, shortValue);
-		value = eval(yArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 2, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + ", " + xInt + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 3, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + equalOp + "new long[]{" + xLong + ", " + yLong + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		int intValue = 0;
-		long longValue = yLongValue;
-		value = eval(xArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", 2, intValue);
-		value = eval(xArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-		value = eval(xArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-
-		value = eval(yArrayLong + equalOp + "new long[]{" + xLong + ", " + yLong + ", " + xLong + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array assignment : wrong type : ", "long[]", typeName);
-		value = eval(yArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", 3, intValue);
-		value = eval(yArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-		value = eval(yArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yLongValue, longValue);
-		value = eval(yArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + equalOp + "new float[]{" + xFloat + ", " + yFloat + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		int intValue = 0;
-		float floatValue = yFloatValue;
-		value = eval(xArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", 2, intValue);
-		value = eval(xArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(yArrayFloat + equalOp + "new float[]{" + xFloat + ", " + yFloat + ", " + xFloat + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array assignment : wrong type : ", "float[]", typeName);
-		value = eval(yArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", 3, intValue);
-		value = eval(yArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + equalOp + "new double[]{" + xDouble + ", " + yDouble + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		int intValue = 0;
-		double doubleValue = yDoubleValue;
-		value = eval(xArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", 2, intValue);
-		value = eval(xArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(yArrayDouble + equalOp + "new double[]{" + xDouble + ", " + yDouble + ", " + xDouble + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array assignment : wrong type : ", "double[]", typeName);
-		value = eval(yArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", 3, intValue);
-		value = eval(yArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		int intValue = 0;
-		java.lang.String stringValue = yStringValue;
-		value = eval(xArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 2, intValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + ", " + xString + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 3, intValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + equalOp + "new boolean[]{" + xBoolean + ", " + yBoolean + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		int intValue = 0;
-		boolean booleanValue = yBooleanValue;
-		value = eval(xArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", 2, intValue);
-		value = eval(xArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(yArrayBoolean + equalOp + "new boolean[]{" + xBoolean + ", " + yBoolean + ", " + xBoolean + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array assignment : wrong type : ", "boolean[]", typeName);
-		value = eval(yArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", 3, intValue);
-		value = eval(yArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
deleted file mode 100644
index 5b53ae3..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ArrayValueTests extends Tests {
-
-	public ArrayValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalArrayTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", xArrayByteValue.length, intValue);
-
-		value = eval(yArrayByte + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte array length : wrong result : ", yArrayByteValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", xArrayCharValue.length, intValue);
-
-		value = eval(yArrayChar + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char array length : wrong result : ", yArrayCharValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", xArrayShortValue.length, intValue);
-
-		value = eval(yArrayShort + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short array length : wrong result : ", yArrayShortValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", xArrayIntValue.length, intValue);
-
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", yArrayIntValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", xArrayLongValue.length, intValue);
-
-		value = eval(yArrayLong + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("long array length : wrong result : ", yArrayLongValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", xArrayFloatValue.length, intValue);
-
-		value = eval(yArrayFloat + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("float array length : wrong result : ", yArrayFloatValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", xArrayDoubleValue.length, intValue);
-
-		value = eval(yArrayDouble + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("double array length : wrong result : ", yArrayDoubleValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", xArrayStringValue.length, intValue);
-
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", yArrayStringValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", xArrayBooleanValue.length, intValue);
-
-		value = eval(yArrayBoolean + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("boolean array length : wrong result : ", yArrayBooleanValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayByte + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xArrayByteValue[0], byteValue);
-
-		value = eval(xArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xArrayByteValue[1], byteValue);
-
-		value = eval(xArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", xArrayByteValue[2], byteValue);
-
-		value = eval(yArrayByte + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yArrayByteValue[0], byteValue);
-
-		value = eval(yArrayByte + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yArrayByteValue[1], byteValue);
-
-		value = eval(yArrayByte + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte array value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte array value : wrong result : ", yArrayByteValue[2], byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayChar + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xArrayCharValue[0], charValue);
-
-		value = eval(xArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xArrayCharValue[1], charValue);
-
-		value = eval(xArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", xArrayCharValue[2], charValue);
-
-		value = eval(yArrayChar + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yArrayCharValue[0], charValue);
-
-		value = eval(yArrayChar + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yArrayCharValue[1], charValue);
-
-		value = eval(yArrayChar + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("char array value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char array value : wrong result : ", yArrayCharValue[2], charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayShort + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xArrayShortValue[0], shortValue);
-
-		value = eval(xArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xArrayShortValue[1], shortValue);
-
-		value = eval(xArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", xArrayShortValue[2], shortValue);
-
-		value = eval(yArrayShort + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yArrayShortValue[0], shortValue);
-
-		value = eval(yArrayShort + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yArrayShortValue[1], shortValue);
-
-		value = eval(yArrayShort + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("short array value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short array value : wrong result : ", yArrayShortValue[2], shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[0], intValue);
-
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[1], intValue);
-
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[2], intValue);
-
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[0], intValue);
-
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[1], intValue);
-
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[2], intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayLong + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xArrayLongValue[0], longValue);
-
-		value = eval(xArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xArrayLongValue[1], longValue);
-
-		value = eval(xArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", xArrayLongValue[2], longValue);
-
-		value = eval(yArrayLong + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yArrayLongValue[0], longValue);
-
-		value = eval(yArrayLong + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yArrayLongValue[1], longValue);
-
-		value = eval(yArrayLong + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("long array value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long array value : wrong result : ", yArrayLongValue[2], longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayFloat + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xArrayFloatValue[0], floatValue, 0);
-
-		value = eval(xArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xArrayFloatValue[1], floatValue, 0);
-
-		value = eval(xArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", xArrayFloatValue[2], floatValue, 0);
-
-		value = eval(yArrayFloat + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yArrayFloatValue[0], floatValue, 0);
-
-		value = eval(yArrayFloat + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yArrayFloatValue[1], floatValue, 0);
-
-		value = eval(yArrayFloat + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("float array value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float array value : wrong result : ", yArrayFloatValue[2], floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayDouble + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xArrayDoubleValue[0], doubleValue, 0);
-
-		value = eval(xArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xArrayDoubleValue[1], doubleValue, 0);
-
-		value = eval(xArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", xArrayDoubleValue[2], doubleValue, 0);
-
-		value = eval(yArrayDouble + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yArrayDoubleValue[0], doubleValue, 0);
-
-		value = eval(yArrayDouble + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yArrayDoubleValue[1], doubleValue, 0);
-
-		value = eval(yArrayDouble + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("double array value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double array value : wrong result : ", yArrayDoubleValue[2], doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[0], stringValue);
-
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[1], stringValue);
-
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[2], stringValue);
-
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[0], stringValue);
-
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[1], stringValue);
-
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[2], stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayBoolean + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xArrayBooleanValue[0], booleanValue);
-
-		value = eval(xArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xArrayBooleanValue[1], booleanValue);
-
-		value = eval(xArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", xArrayBooleanValue[2], booleanValue);
-
-		value = eval(yArrayBoolean + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yArrayBooleanValue[0], booleanValue);
-
-		value = eval(yArrayBoolean + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yArrayBooleanValue[1], booleanValue);
-
-		value = eval(yArrayBoolean + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean array value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean array value : wrong result : ", yArrayBooleanValue[2], booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
deleted file mode 100644
index a0c237a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class BooleanAssignmentOperatorsTests extends Tests {
-
-	public BooleanAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// boolean |= boolean
-
-	public void testBooleanOrAssignmentBoolean() throws Throwable {
-		try {
-		init();
-		boolean tmpxVar = xVarBooleanValue;
-		tmpxVar |= xBooleanValue;
-		IValue value = eval(xVarBoolean + orAssignmentOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		tmpxVar |= yBooleanValue;
-		value = eval(xVarBoolean + orAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		boolean tmpyVar = yVarBooleanValue;
-		tmpyVar |= xBooleanValue;
-		value = eval(yVarBoolean + orAssignmentOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-
-		tmpyVar |= yBooleanValue;
-		value = eval(yVarBoolean + orAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean orAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean orAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// boolean &= boolean
-
-	public void testBooleanAndAssignmentBoolean() throws Throwable {
-		try {
-		init();
-		boolean tmpxVar = xVarBooleanValue;
-		tmpxVar &= xBooleanValue;
-		IValue value = eval(xVarBoolean + andAssignmentOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		tmpxVar &= yBooleanValue;
-		value = eval(xVarBoolean + andAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		boolean tmpyVar = yVarBooleanValue;
-		tmpyVar &= xBooleanValue;
-		value = eval(yVarBoolean + andAssignmentOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-
-		tmpyVar &= yBooleanValue;
-		value = eval(yVarBoolean + andAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean andAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean andAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// boolean ^= boolean
-
-	public void testBooleanXorAssignmentBoolean() throws Throwable {
-		try {
-		init();
-		boolean tmpxVar = xVarBooleanValue;
-		tmpxVar ^= xBooleanValue;
-		IValue value = eval(xVarBoolean + xorAssignmentOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		tmpxVar ^= yBooleanValue;
-		value = eval(xVarBoolean + xorAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpxVar, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpxVar, booleanValue);
-
-		boolean tmpyVar = yVarBooleanValue;
-		tmpyVar ^= xBooleanValue;
-		value = eval(yVarBoolean + xorAssignmentOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-
-		tmpyVar ^= yBooleanValue;
-		value = eval(yVarBoolean + xorAssignmentOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xorAssignment boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xorAssignment boolean : wrong result : ", tmpyVar, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", tmpyVar, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
deleted file mode 100644
index e7190bc..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class BooleanOperatorsTests extends Tests {
-
-	public BooleanOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// boolean | boolean
-
-	public void testBooleanOrBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xBoolean + orOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", xBooleanValue | xBooleanValue, booleanValue);
-
-		value = eval(xBoolean + orOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", xBooleanValue | yBooleanValue, booleanValue);
-
-		value = eval(yBoolean + orOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", yBooleanValue | xBooleanValue, booleanValue);
-
-		value = eval(yBoolean + orOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean or boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean or boolean : wrong result : ", yBooleanValue | yBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// boolean & boolean
-
-	public void testBooleanAndBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xBoolean + andOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", xBooleanValue & xBooleanValue, booleanValue);
-
-		value = eval(xBoolean + andOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", xBooleanValue & yBooleanValue, booleanValue);
-
-		value = eval(yBoolean + andOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", yBooleanValue & xBooleanValue, booleanValue);
-
-		value = eval(yBoolean + andOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean and boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean and boolean : wrong result : ", yBooleanValue & yBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// boolean ^ boolean
-
-	public void testBooleanXorBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xBoolean + xorOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", xBooleanValue ^ xBooleanValue, booleanValue);
-
-		value = eval(xBoolean + xorOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", xBooleanValue ^ yBooleanValue, booleanValue);
-
-		value = eval(yBoolean + xorOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", yBooleanValue ^ xBooleanValue, booleanValue);
-
-		value = eval(yBoolean + xorOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean xor boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean xor boolean : wrong result : ", yBooleanValue ^ yBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// ! boolean
-
-	public void testNotBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(notOp + xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("not boolean : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("not boolean : wrong result : ", ! xBooleanValue, booleanValue);
-
-		value = eval(notOp + yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("not boolean : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("not boolean : wrong result : ", ! yBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
deleted file mode 100644
index 9013e8a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3758 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class ByteAssignmentOperatorsTests extends Tests {
-
-	public ByteAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// byte += {byte, char, short, int, long, float, double}
-
-	public void testBytePlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarByte + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarByte + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarByte + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarByte + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarByte + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarByte + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarByte + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarByte + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarByte + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarByte + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarByte + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarByte + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarByte + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarByte + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarByte + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarByte + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarByte + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarByte + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarByte + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarByte + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarByte + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarByte + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte plusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte -= {byte, char, short, int, long, float, double}
-
-	public void testByteMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarByte + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarByte + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarByte + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarByte + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarByte + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarByte + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarByte + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarByte + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarByte + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarByte + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarByte + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarByte + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarByte + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarByte + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarByte + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarByte + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarByte + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarByte + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarByte + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarByte + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarByte + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarByte + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minusAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte minusAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte *= {byte, char, short, int, long, float, double}
-
-	public void testByteMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarByte + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarByte + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarByte + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarByte + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiplyAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte multiplyAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte /= {byte, char, short, int, long, float, double}
-
-	public void testByteDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarByte + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarByte + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarByte + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarByte + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarByte + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarByte + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarByte + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarByte + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarByte + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarByte + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarByte + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarByte + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarByte + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarByte + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarByte + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarByte + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarByte + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarByte + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarByte + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarByte + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarByte + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarByte + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divideAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte divideAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte %= {byte, char, short, int, long, float, double}
-
-	public void testByteRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarByte + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarByte + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarByte + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarByte + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarByte + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarByte + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarByte + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarByte + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarByte + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarByte + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarByte + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarByte + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarByte + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarByte + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarByte + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarByte + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarByte + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarByte + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment float : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarByte + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarByte + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarByte + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarByte + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainderAssignment double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte remainderAssignment double : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte <<= {byte, char, short, int, long, float, double}
-
-	public void testByteLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarByte + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarByte + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarByte + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte leftShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte >>= {byte, char, short, int, long, float, double}
-
-	public void testByteRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarByte + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarByte + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarByte + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte rightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte >>>= {byte, char, short, int, long, float, double}
-
-	public void testByteUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarByte + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarByte + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarByte + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte unsignedRightShiftAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte |= {byte, char, short, int, long, float, double}
-
-	public void testByteOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarByte + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarByte + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarByte + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarByte + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarByte + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarByte + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarByte + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarByte + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarByte + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarByte + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarByte + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarByte + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarByte + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarByte + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarByte + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarByte + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte orAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte orAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte &= {byte, char, short, int, long, float, double}
-
-	public void testByteAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarByte + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarByte + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarByte + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarByte + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarByte + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarByte + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarByte + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarByte + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarByte + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarByte + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarByte + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarByte + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarByte + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarByte + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarByte + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarByte + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte andAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte andAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte ^= {byte, char, short, int, long, float, double}
-
-	public void testByteXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarByte + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarByte + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarByte + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment byte : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarByte + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarByte + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarByte + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment char : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarByte + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarByte + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarByte + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment short : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarByte + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarByte + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarByte + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment int : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarByte + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarByte + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarByte + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarByte + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xorAssignment long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte xorAssignment long : wrong result : ", tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
deleted file mode 100644
index 64a01ba..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
+++ /dev/null
@@ -1,2433 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ByteOperatorsTests extends Tests {
-
-	public ByteOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// byte + {byte, char, short, int, long, float, double}
-
-	public void testBytePlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus byte : wrong result : ", xByteValue + yByteValue, intValue);
-
-		value = eval(yByte + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus byte : wrong result : ", yByteValue + xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus char : wrong result : ", xByteValue + yCharValue, intValue);
-
-		value = eval(yByte + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus char : wrong result : ", yByteValue + xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus short : wrong result : ", xByteValue + yShortValue, intValue);
-
-		value = eval(yByte + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus short : wrong result : ", yByteValue + xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus int : wrong result : ", xByteValue + yIntValue, intValue);
-
-		value = eval(yByte + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte plus int : wrong result : ", yByteValue + xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte plus long : wrong result : ", xByteValue + yLongValue, longValue);
-
-		value = eval(yByte + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte plus long : wrong result : ", yByteValue + xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte plus float : wrong result : ", xByteValue + yFloatValue, floatValue, 0);
-
-		value = eval(yByte + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte plus float : wrong result : ", yByteValue + xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte plus double : wrong result : ", xByteValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte plus double : wrong result : ", yByteValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBytePlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("byte plus java.lang.String : wrong result : ", xByteValue + yStringValue, stringValue);
-
-		value = eval(yByte + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("byte plus java.lang.String : wrong result : ", yByteValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte - {byte, char, short, int, long, float, double}
-
-	public void testByteMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus byte : wrong result : ", xByteValue - yByteValue, intValue);
-
-		value = eval(yByte + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus byte : wrong result : ", yByteValue - xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus char : wrong result : ", xByteValue - yCharValue, intValue);
-
-		value = eval(yByte + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus char : wrong result : ", yByteValue - xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus short : wrong result : ", xByteValue - yShortValue, intValue);
-
-		value = eval(yByte + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus short : wrong result : ", yByteValue - xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus int : wrong result : ", xByteValue - yIntValue, intValue);
-
-		value = eval(yByte + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte minus int : wrong result : ", yByteValue - xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte minus long : wrong result : ", xByteValue - yLongValue, longValue);
-
-		value = eval(yByte + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte minus long : wrong result : ", yByteValue - xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte minus float : wrong result : ", xByteValue - yFloatValue, floatValue, 0);
-
-		value = eval(yByte + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte minus float : wrong result : ", yByteValue - xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte minus double : wrong result : ", xByteValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte minus double : wrong result : ", yByteValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// byte * {byte, char, short, int, long, float, double}
-
-	public void testByteMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply byte : wrong result : ", xByteValue * yByteValue, intValue);
-
-		value = eval(yByte + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply byte : wrong result : ", yByteValue * xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply char : wrong result : ", xByteValue * yCharValue, intValue);
-
-		value = eval(yByte + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply char : wrong result : ", yByteValue * xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply short : wrong result : ", xByteValue * yShortValue, intValue);
-
-		value = eval(yByte + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply short : wrong result : ", yByteValue * xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply int : wrong result : ", xByteValue * yIntValue, intValue);
-
-		value = eval(yByte + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte multiply int : wrong result : ", yByteValue * xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte multiply long : wrong result : ", xByteValue * yLongValue, longValue);
-
-		value = eval(yByte + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte multiply long : wrong result : ", yByteValue * xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte multiply float : wrong result : ", xByteValue * yFloatValue, floatValue, 0);
-
-		value = eval(yByte + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte multiply float : wrong result : ", yByteValue * xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte multiply double : wrong result : ", xByteValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte multiply double : wrong result : ", yByteValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// byte / {byte, char, short, int, long, float, double}
-
-	public void testByteDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide byte : wrong result : ", xByteValue / yByteValue, intValue);
-
-		value = eval(yByte + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide byte : wrong result : ", yByteValue / xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide char : wrong result : ", xByteValue / yCharValue, intValue);
-
-		value = eval(yByte + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide char : wrong result : ", yByteValue / xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide short : wrong result : ", xByteValue / yShortValue, intValue);
-
-		value = eval(yByte + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide short : wrong result : ", yByteValue / xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide int : wrong result : ", xByteValue / yIntValue, intValue);
-
-		value = eval(yByte + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte divide int : wrong result : ", yByteValue / xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte divide long : wrong result : ", xByteValue / yLongValue, longValue);
-
-		value = eval(yByte + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte divide long : wrong result : ", yByteValue / xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte divide float : wrong result : ", xByteValue / yFloatValue, floatValue, 0);
-
-		value = eval(yByte + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte divide float : wrong result : ", yByteValue / xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte divide double : wrong result : ", xByteValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte divide double : wrong result : ", yByteValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// byte % {byte, char, short, int, long, float, double}
-
-	public void testByteRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder byte : wrong result : ", xByteValue % yByteValue, intValue);
-
-		value = eval(yByte + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder byte : wrong result : ", yByteValue % xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder char : wrong result : ", xByteValue % yCharValue, intValue);
-
-		value = eval(yByte + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder char : wrong result : ", yByteValue % xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder short : wrong result : ", xByteValue % yShortValue, intValue);
-
-		value = eval(yByte + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder short : wrong result : ", yByteValue % xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder int : wrong result : ", xByteValue % yIntValue, intValue);
-
-		value = eval(yByte + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte remainder int : wrong result : ", yByteValue % xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte remainder long : wrong result : ", xByteValue % yLongValue, longValue);
-
-		value = eval(yByte + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte remainder long : wrong result : ", yByteValue % xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte remainder float : wrong result : ", xByteValue % yFloatValue, floatValue, 0);
-
-		value = eval(yByte + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("byte remainder float : wrong result : ", yByteValue % xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte remainder double : wrong result : ", xByteValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yByte + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("byte remainder double : wrong result : ", yByteValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// byte > {byte, char, short, int, long, float, double}
-
-	public void testByteGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater byte : wrong result : ", xByteValue > yByteValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater byte : wrong result : ", yByteValue > xByteValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater byte : wrong result : ", xByteValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater char : wrong result : ", xByteValue > yCharValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater char : wrong result : ", yByteValue > xCharValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater char : wrong result : ", xByteValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater short : wrong result : ", xByteValue > yShortValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater short : wrong result : ", yByteValue > xShortValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater short : wrong result : ", xByteValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater int : wrong result : ", xByteValue > yIntValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater int : wrong result : ", yByteValue > xIntValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater int : wrong result : ", xByteValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater long : wrong result : ", xByteValue > yLongValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater long : wrong result : ", yByteValue > xLongValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater long : wrong result : ", xByteValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater float : wrong result : ", xByteValue > yFloatValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater float : wrong result : ", yByteValue > xFloatValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater float : wrong result : ", xByteValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater double : wrong result : ", xByteValue > yDoubleValue, booleanValue);
-
-		value = eval(yByte + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater double : wrong result : ", yByteValue > xDoubleValue, booleanValue);
-
-		value = eval(xByte + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greater double : wrong result : ", xByteValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte >= {byte, char, short, int, long, float, double}
-
-	public void testByteGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual byte : wrong result : ", xByteValue >= yByteValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual byte : wrong result : ", yByteValue >= xByteValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual byte : wrong result : ", xByteValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual char : wrong result : ", xByteValue >= yCharValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual char : wrong result : ", yByteValue >= xCharValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual char : wrong result : ", xByteValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual short : wrong result : ", xByteValue >= yShortValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual short : wrong result : ", yByteValue >= xShortValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual short : wrong result : ", xByteValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual int : wrong result : ", xByteValue >= yIntValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual int : wrong result : ", yByteValue >= xIntValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual int : wrong result : ", xByteValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual long : wrong result : ", xByteValue >= yLongValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual long : wrong result : ", yByteValue >= xLongValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual long : wrong result : ", xByteValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual float : wrong result : ", xByteValue >= yFloatValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual float : wrong result : ", yByteValue >= xFloatValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual float : wrong result : ", xByteValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual double : wrong result : ", xByteValue >= yDoubleValue, booleanValue);
-
-		value = eval(yByte + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual double : wrong result : ", yByteValue >= xDoubleValue, booleanValue);
-
-		value = eval(xByte + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte greaterEqual double : wrong result : ", xByteValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte < {byte, char, short, int, long, float, double}
-
-	public void testByteLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less byte : wrong result : ", xByteValue < yByteValue, booleanValue);
-
-		value = eval(yByte + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less byte : wrong result : ", yByteValue < xByteValue, booleanValue);
-
-		value = eval(xByte + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less byte : wrong result : ", xByteValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less char : wrong result : ", xByteValue < yCharValue, booleanValue);
-
-		value = eval(yByte + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less char : wrong result : ", yByteValue < xCharValue, booleanValue);
-
-		value = eval(xByte + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less char : wrong result : ", xByteValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less short : wrong result : ", xByteValue < yShortValue, booleanValue);
-
-		value = eval(yByte + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less short : wrong result : ", yByteValue < xShortValue, booleanValue);
-
-		value = eval(xByte + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less short : wrong result : ", xByteValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less int : wrong result : ", xByteValue < yIntValue, booleanValue);
-
-		value = eval(yByte + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less int : wrong result : ", yByteValue < xIntValue, booleanValue);
-
-		value = eval(xByte + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less int : wrong result : ", xByteValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less long : wrong result : ", xByteValue < yLongValue, booleanValue);
-
-		value = eval(yByte + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less long : wrong result : ", yByteValue < xLongValue, booleanValue);
-
-		value = eval(xByte + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less long : wrong result : ", xByteValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less float : wrong result : ", xByteValue < yFloatValue, booleanValue);
-
-		value = eval(yByte + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less float : wrong result : ", yByteValue < xFloatValue, booleanValue);
-
-		value = eval(xByte + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less float : wrong result : ", xByteValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less double : wrong result : ", xByteValue < yDoubleValue, booleanValue);
-
-		value = eval(yByte + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less double : wrong result : ", yByteValue < xDoubleValue, booleanValue);
-
-		value = eval(xByte + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte less double : wrong result : ", xByteValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte <= {byte, char, short, int, long, float, double}
-
-	public void testByteLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual byte : wrong result : ", xByteValue <= yByteValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual byte : wrong result : ", yByteValue <= xByteValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual byte : wrong result : ", xByteValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual char : wrong result : ", xByteValue <= yCharValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual char : wrong result : ", yByteValue <= xCharValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual char : wrong result : ", xByteValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual short : wrong result : ", xByteValue <= yShortValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual short : wrong result : ", yByteValue <= xShortValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual short : wrong result : ", xByteValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual int : wrong result : ", xByteValue <= yIntValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual int : wrong result : ", yByteValue <= xIntValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual int : wrong result : ", xByteValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual long : wrong result : ", xByteValue <= yLongValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual long : wrong result : ", yByteValue <= xLongValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual long : wrong result : ", xByteValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual float : wrong result : ", xByteValue <= yFloatValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual float : wrong result : ", yByteValue <= xFloatValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual float : wrong result : ", xByteValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual double : wrong result : ", xByteValue <= yDoubleValue, booleanValue);
-
-		value = eval(yByte + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual double : wrong result : ", yByteValue <= xDoubleValue, booleanValue);
-
-		value = eval(xByte + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte lessEqual double : wrong result : ", xByteValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte == {byte, char, short, int, long, float, double}
-
-	public void testByteEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual byte : wrong result : ", xByteValue == yByteValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual byte : wrong result : ", yByteValue == xByteValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual byte : wrong result : ", xByteValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual char : wrong result : ", xByteValue == yCharValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual char : wrong result : ", yByteValue == xCharValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual char : wrong result : ", xByteValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual short : wrong result : ", xByteValue == yShortValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual short : wrong result : ", yByteValue == xShortValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual short : wrong result : ", xByteValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual int : wrong result : ", xByteValue == yIntValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual int : wrong result : ", yByteValue == xIntValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual int : wrong result : ", xByteValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual long : wrong result : ", xByteValue == yLongValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual long : wrong result : ", yByteValue == xLongValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual long : wrong result : ", xByteValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual float : wrong result : ", xByteValue == yFloatValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual float : wrong result : ", yByteValue == xFloatValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual float : wrong result : ", xByteValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual double : wrong result : ", xByteValue == yDoubleValue, booleanValue);
-
-		value = eval(yByte + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual double : wrong result : ", yByteValue == xDoubleValue, booleanValue);
-
-		value = eval(xByte + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte equalEqual double : wrong result : ", xByteValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte != {byte, char, short, int, long, float, double}
-
-	public void testByteNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual byte : wrong result : ", xByteValue != yByteValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual byte : wrong result : ", yByteValue != xByteValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual byte : wrong result : ", xByteValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual char : wrong result : ", xByteValue != yCharValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual char : wrong result : ", yByteValue != xCharValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual char : wrong result : ", xByteValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual short : wrong result : ", xByteValue != yShortValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual short : wrong result : ", yByteValue != xShortValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual short : wrong result : ", xByteValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual int : wrong result : ", xByteValue != yIntValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual int : wrong result : ", yByteValue != xIntValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual int : wrong result : ", xByteValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual long : wrong result : ", xByteValue != yLongValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual long : wrong result : ", yByteValue != xLongValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual long : wrong result : ", xByteValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual float : wrong result : ", xByteValue != yFloatValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual float : wrong result : ", yByteValue != xFloatValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual float : wrong result : ", xByteValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual double : wrong result : ", xByteValue != yDoubleValue, booleanValue);
-
-		value = eval(yByte + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual double : wrong result : ", yByteValue != xDoubleValue, booleanValue);
-
-		value = eval(xByte + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("byte notEqual double : wrong result : ", xByteValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte << {byte, char, short, int, long}
-
-	public void testByteLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift byte : wrong result : ", xByteValue << yByteValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift byte : wrong result : ", yByteValue << xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift char : wrong result : ", xByteValue << yCharValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift char : wrong result : ", yByteValue << xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift short : wrong result : ", xByteValue << yShortValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift short : wrong result : ", yByteValue << xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift int : wrong result : ", xByteValue << yIntValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift int : wrong result : ", yByteValue << xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift long : wrong result : ", xByteValue << yLongValue, intValue);
-
-		value = eval(yByte + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte leftShift long : wrong result : ", yByteValue << xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte >> {byte, char, short, int, long}
-
-	public void testByteRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift byte : wrong result : ", xByteValue >> yByteValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift byte : wrong result : ", yByteValue >> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift char : wrong result : ", xByteValue >> yCharValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift char : wrong result : ", yByteValue >> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift short : wrong result : ", xByteValue >> yShortValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift short : wrong result : ", yByteValue >> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift int : wrong result : ", xByteValue >> yIntValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift int : wrong result : ", yByteValue >> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift long : wrong result : ", xByteValue >> yLongValue, intValue);
-
-		value = eval(yByte + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte rightShift long : wrong result : ", yByteValue >> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte >>> {byte, char, short, int, long}
-
-	public void testByteUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift byte : wrong result : ", xByteValue >>> yByteValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift byte : wrong result : ", yByteValue >>> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift char : wrong result : ", xByteValue >>> yCharValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift char : wrong result : ", yByteValue >>> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift short : wrong result : ", xByteValue >>> yShortValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift short : wrong result : ", yByteValue >>> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift int : wrong result : ", xByteValue >>> yIntValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift int : wrong result : ", yByteValue >>> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift long : wrong result : ", xByteValue >>> yLongValue, intValue);
-
-		value = eval(yByte + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte unsignedRightShift long : wrong result : ", yByteValue >>> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte | {byte, char, short, int, long}
-
-	public void testByteOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or byte : wrong result : ", xByteValue | yByteValue, intValue);
-
-		value = eval(yByte + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or byte : wrong result : ", yByteValue | xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or char : wrong result : ", xByteValue | yCharValue, intValue);
-
-		value = eval(yByte + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or char : wrong result : ", yByteValue | xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or short : wrong result : ", xByteValue | yShortValue, intValue);
-
-		value = eval(yByte + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or short : wrong result : ", yByteValue | xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or int : wrong result : ", xByteValue | yIntValue, intValue);
-
-		value = eval(yByte + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte or int : wrong result : ", yByteValue | xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte or long : wrong result : ", xByteValue | yLongValue, longValue);
-
-		value = eval(yByte + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte or long : wrong result : ", yByteValue | xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte & {byte, char, short, int, long}
-
-	public void testByteAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and byte : wrong result : ", xByteValue & yByteValue, intValue);
-
-		value = eval(yByte + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and byte : wrong result : ", yByteValue & xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and char : wrong result : ", xByteValue & yCharValue, intValue);
-
-		value = eval(yByte + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and char : wrong result : ", yByteValue & xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and short : wrong result : ", xByteValue & yShortValue, intValue);
-
-		value = eval(yByte + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and short : wrong result : ", yByteValue & xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and int : wrong result : ", xByteValue & yIntValue, intValue);
-
-		value = eval(yByte + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte and int : wrong result : ", yByteValue & xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte and long : wrong result : ", xByteValue & yLongValue, longValue);
-
-		value = eval(yByte + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte and long : wrong result : ", yByteValue & xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// byte ^ {byte, char, short, int, long}
-
-	public void testByteXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor byte : wrong result : ", xByteValue ^ yByteValue, intValue);
-
-		value = eval(yByte + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor byte : wrong result : ", yByteValue ^ xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor char : wrong result : ", xByteValue ^ yCharValue, intValue);
-
-		value = eval(yByte + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor char : wrong result : ", yByteValue ^ xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor short : wrong result : ", xByteValue ^ yShortValue, intValue);
-
-		value = eval(yByte + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor short : wrong result : ", yByteValue ^ xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor int : wrong result : ", xByteValue ^ yIntValue, intValue);
-
-		value = eval(yByte + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("byte xor int : wrong result : ", yByteValue ^ xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xByte + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte xor long : wrong result : ", xByteValue ^ yLongValue, longValue);
-
-		value = eval(yByte + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("byte xor long : wrong result : ", yByteValue ^ xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + byte
-
-	public void testPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus byte : wrong result : ", + xByteValue, intValue);
-
-		value = eval(plusOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus byte : wrong result : ", + yByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// - byte
-
-	public void testMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus byte : wrong result : ", - xByteValue, intValue);
-
-		value = eval(minusOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus byte : wrong result : ", - yByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// ~ byte
-
-	public void testTwiddleByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle byte : wrong result : ", ~ xByteValue, intValue);
-
-		value = eval(twiddleOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle byte : wrong result : ", ~ yByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
deleted file mode 100644
index 085d478..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3758 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class CharAssignmentOperatorsTests extends Tests {
-
-	public CharAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// char += {byte, char, short, int, long, float, double}
-
-	public void testCharPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarChar + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarChar + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarChar + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarChar + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarChar + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarChar + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarChar + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarChar + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarChar + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarChar + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarChar + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarChar + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarChar + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarChar + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarChar + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarChar + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarChar + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarChar + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarChar + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarChar + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarChar + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarChar + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char plusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char -= {byte, char, short, int, long, float, double}
-
-	public void testCharMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarChar + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarChar + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarChar + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarChar + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarChar + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarChar + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarChar + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarChar + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarChar + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarChar + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarChar + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarChar + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarChar + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarChar + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarChar + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarChar + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarChar + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarChar + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarChar + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarChar + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarChar + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarChar + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minusAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char minusAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char *= {byte, char, short, int, long, float, double}
-
-	public void testCharMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarChar + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarChar + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarChar + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarChar + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiplyAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char multiplyAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char /= {byte, char, short, int, long, float, double}
-
-	public void testCharDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarChar + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarChar + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarChar + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarChar + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarChar + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarChar + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarChar + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarChar + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarChar + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarChar + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarChar + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarChar + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarChar + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarChar + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarChar + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarChar + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarChar + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarChar + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarChar + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarChar + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarChar + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarChar + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divideAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char divideAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char %= {byte, char, short, int, long, float, double}
-
-	public void testCharRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarChar + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarChar + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarChar + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarChar + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarChar + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarChar + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarChar + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarChar + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarChar + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarChar + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarChar + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarChar + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarChar + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarChar + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarChar + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarChar + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarChar + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarChar + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment float : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarChar + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarChar + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarChar + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarChar + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainderAssignment double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char remainderAssignment double : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char <<= {byte, char, short, int, long, float, double}
-
-	public void testCharLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarChar + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarChar + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarChar + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char leftShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char >>= {byte, char, short, int, long, float, double}
-
-	public void testCharRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarChar + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarChar + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarChar + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char rightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char >>>= {byte, char, short, int, long, float, double}
-
-	public void testCharUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarChar + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarChar + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarChar + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShiftAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char unsignedRightShiftAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char |= {byte, char, short, int, long, float, double}
-
-	public void testCharOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarChar + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarChar + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarChar + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarChar + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarChar + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarChar + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarChar + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarChar + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarChar + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarChar + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarChar + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarChar + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarChar + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarChar + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarChar + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarChar + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char orAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char orAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char &= {byte, char, short, int, long, float, double}
-
-	public void testCharAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarChar + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarChar + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarChar + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarChar + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarChar + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarChar + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarChar + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarChar + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarChar + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarChar + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarChar + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarChar + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarChar + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarChar + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarChar + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarChar + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char andAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char andAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char ^= {byte, char, short, int, long, float, double}
-
-	public void testCharXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarChar + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarChar + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarChar + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment byte : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarChar + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarChar + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarChar + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment char : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarChar + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarChar + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarChar + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment short : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarChar + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarChar + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarChar + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment int : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarChar + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarChar + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarChar + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarChar + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xorAssignment long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char xorAssignment long : wrong result : ", tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
deleted file mode 100644
index 3bc34b0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
+++ /dev/null
@@ -1,2433 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class CharOperatorsTests extends Tests {
-
-	public CharOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// char + {byte, char, short, int, long, float, double}
-
-	public void testCharPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus byte : wrong result : ", xCharValue + yByteValue, intValue);
-
-		value = eval(yChar + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus byte : wrong result : ", yCharValue + xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus char : wrong result : ", xCharValue + yCharValue, intValue);
-
-		value = eval(yChar + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus char : wrong result : ", yCharValue + xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus short : wrong result : ", xCharValue + yShortValue, intValue);
-
-		value = eval(yChar + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus short : wrong result : ", yCharValue + xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus int : wrong result : ", xCharValue + yIntValue, intValue);
-
-		value = eval(yChar + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char plus int : wrong result : ", yCharValue + xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char plus long : wrong result : ", xCharValue + yLongValue, longValue);
-
-		value = eval(yChar + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char plus long : wrong result : ", yCharValue + xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char plus float : wrong result : ", xCharValue + yFloatValue, floatValue, 0);
-
-		value = eval(yChar + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char plus float : wrong result : ", yCharValue + xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char plus double : wrong result : ", xCharValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char plus double : wrong result : ", yCharValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("char plus java.lang.String : wrong result : ", xCharValue + yStringValue, stringValue);
-
-		value = eval(yChar + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("char plus java.lang.String : wrong result : ", yCharValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char - {byte, char, short, int, long, float, double}
-
-	public void testCharMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus byte : wrong result : ", xCharValue - yByteValue, intValue);
-
-		value = eval(yChar + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus byte : wrong result : ", yCharValue - xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus char : wrong result : ", xCharValue - yCharValue, intValue);
-
-		value = eval(yChar + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus char : wrong result : ", yCharValue - xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus short : wrong result : ", xCharValue - yShortValue, intValue);
-
-		value = eval(yChar + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus short : wrong result : ", yCharValue - xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus int : wrong result : ", xCharValue - yIntValue, intValue);
-
-		value = eval(yChar + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char minus int : wrong result : ", yCharValue - xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char minus long : wrong result : ", xCharValue - yLongValue, longValue);
-
-		value = eval(yChar + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char minus long : wrong result : ", yCharValue - xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char minus float : wrong result : ", xCharValue - yFloatValue, floatValue, 0);
-
-		value = eval(yChar + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char minus float : wrong result : ", yCharValue - xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char minus double : wrong result : ", xCharValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char minus double : wrong result : ", yCharValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// char * {byte, char, short, int, long, float, double}
-
-	public void testCharMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply byte : wrong result : ", xCharValue * yByteValue, intValue);
-
-		value = eval(yChar + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply byte : wrong result : ", yCharValue * xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply char : wrong result : ", xCharValue * yCharValue, intValue);
-
-		value = eval(yChar + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply char : wrong result : ", yCharValue * xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply short : wrong result : ", xCharValue * yShortValue, intValue);
-
-		value = eval(yChar + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply short : wrong result : ", yCharValue * xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply int : wrong result : ", xCharValue * yIntValue, intValue);
-
-		value = eval(yChar + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char multiply int : wrong result : ", yCharValue * xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char multiply long : wrong result : ", xCharValue * yLongValue, longValue);
-
-		value = eval(yChar + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char multiply long : wrong result : ", yCharValue * xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char multiply float : wrong result : ", xCharValue * yFloatValue, floatValue, 0);
-
-		value = eval(yChar + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char multiply float : wrong result : ", yCharValue * xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char multiply double : wrong result : ", xCharValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char multiply double : wrong result : ", yCharValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// char / {byte, char, short, int, long, float, double}
-
-	public void testCharDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide byte : wrong result : ", xCharValue / yByteValue, intValue);
-
-		value = eval(yChar + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide byte : wrong result : ", yCharValue / xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide char : wrong result : ", xCharValue / yCharValue, intValue);
-
-		value = eval(yChar + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide char : wrong result : ", yCharValue / xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide short : wrong result : ", xCharValue / yShortValue, intValue);
-
-		value = eval(yChar + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide short : wrong result : ", yCharValue / xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide int : wrong result : ", xCharValue / yIntValue, intValue);
-
-		value = eval(yChar + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char divide int : wrong result : ", yCharValue / xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char divide long : wrong result : ", xCharValue / yLongValue, longValue);
-
-		value = eval(yChar + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char divide long : wrong result : ", yCharValue / xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char divide float : wrong result : ", xCharValue / yFloatValue, floatValue, 0);
-
-		value = eval(yChar + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char divide float : wrong result : ", yCharValue / xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char divide double : wrong result : ", xCharValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char divide double : wrong result : ", yCharValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// char % {byte, char, short, int, long, float, double}
-
-	public void testCharRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder byte : wrong result : ", xCharValue % yByteValue, intValue);
-
-		value = eval(yChar + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder byte : wrong result : ", yCharValue % xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder char : wrong result : ", xCharValue % yCharValue, intValue);
-
-		value = eval(yChar + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder char : wrong result : ", yCharValue % xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder short : wrong result : ", xCharValue % yShortValue, intValue);
-
-		value = eval(yChar + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder short : wrong result : ", yCharValue % xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder int : wrong result : ", xCharValue % yIntValue, intValue);
-
-		value = eval(yChar + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char remainder int : wrong result : ", yCharValue % xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char remainder long : wrong result : ", xCharValue % yLongValue, longValue);
-
-		value = eval(yChar + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char remainder long : wrong result : ", yCharValue % xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char remainder float : wrong result : ", xCharValue % yFloatValue, floatValue, 0);
-
-		value = eval(yChar + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("char remainder float : wrong result : ", yCharValue % xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char remainder double : wrong result : ", xCharValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yChar + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("char remainder double : wrong result : ", yCharValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// char > {byte, char, short, int, long, float, double}
-
-	public void testCharGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater byte : wrong result : ", xCharValue > yByteValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater byte : wrong result : ", yCharValue > xByteValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater byte : wrong result : ", xCharValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater char : wrong result : ", xCharValue > yCharValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater char : wrong result : ", yCharValue > xCharValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater char : wrong result : ", xCharValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater short : wrong result : ", xCharValue > yShortValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater short : wrong result : ", yCharValue > xShortValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater short : wrong result : ", xCharValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater int : wrong result : ", xCharValue > yIntValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater int : wrong result : ", yCharValue > xIntValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater int : wrong result : ", xCharValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater long : wrong result : ", xCharValue > yLongValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater long : wrong result : ", yCharValue > xLongValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater long : wrong result : ", xCharValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater float : wrong result : ", xCharValue > yFloatValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater float : wrong result : ", yCharValue > xFloatValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater float : wrong result : ", xCharValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater double : wrong result : ", xCharValue > yDoubleValue, booleanValue);
-
-		value = eval(yChar + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater double : wrong result : ", yCharValue > xDoubleValue, booleanValue);
-
-		value = eval(xChar + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greater double : wrong result : ", xCharValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char >= {byte, char, short, int, long, float, double}
-
-	public void testCharGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual byte : wrong result : ", xCharValue >= yByteValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual byte : wrong result : ", yCharValue >= xByteValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual byte : wrong result : ", xCharValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual char : wrong result : ", xCharValue >= yCharValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual char : wrong result : ", yCharValue >= xCharValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual char : wrong result : ", xCharValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual short : wrong result : ", xCharValue >= yShortValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual short : wrong result : ", yCharValue >= xShortValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual short : wrong result : ", xCharValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual int : wrong result : ", xCharValue >= yIntValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual int : wrong result : ", yCharValue >= xIntValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual int : wrong result : ", xCharValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual long : wrong result : ", xCharValue >= yLongValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual long : wrong result : ", yCharValue >= xLongValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual long : wrong result : ", xCharValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual float : wrong result : ", xCharValue >= yFloatValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual float : wrong result : ", yCharValue >= xFloatValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual float : wrong result : ", xCharValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual double : wrong result : ", xCharValue >= yDoubleValue, booleanValue);
-
-		value = eval(yChar + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual double : wrong result : ", yCharValue >= xDoubleValue, booleanValue);
-
-		value = eval(xChar + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char greaterEqual double : wrong result : ", xCharValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char < {byte, char, short, int, long, float, double}
-
-	public void testCharLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less byte : wrong result : ", xCharValue < yByteValue, booleanValue);
-
-		value = eval(yChar + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less byte : wrong result : ", yCharValue < xByteValue, booleanValue);
-
-		value = eval(xChar + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less byte : wrong result : ", xCharValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less char : wrong result : ", xCharValue < yCharValue, booleanValue);
-
-		value = eval(yChar + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less char : wrong result : ", yCharValue < xCharValue, booleanValue);
-
-		value = eval(xChar + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less char : wrong result : ", xCharValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less short : wrong result : ", xCharValue < yShortValue, booleanValue);
-
-		value = eval(yChar + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less short : wrong result : ", yCharValue < xShortValue, booleanValue);
-
-		value = eval(xChar + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less short : wrong result : ", xCharValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less int : wrong result : ", xCharValue < yIntValue, booleanValue);
-
-		value = eval(yChar + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less int : wrong result : ", yCharValue < xIntValue, booleanValue);
-
-		value = eval(xChar + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less int : wrong result : ", xCharValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less long : wrong result : ", xCharValue < yLongValue, booleanValue);
-
-		value = eval(yChar + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less long : wrong result : ", yCharValue < xLongValue, booleanValue);
-
-		value = eval(xChar + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less long : wrong result : ", xCharValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less float : wrong result : ", xCharValue < yFloatValue, booleanValue);
-
-		value = eval(yChar + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less float : wrong result : ", yCharValue < xFloatValue, booleanValue);
-
-		value = eval(xChar + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less float : wrong result : ", xCharValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less double : wrong result : ", xCharValue < yDoubleValue, booleanValue);
-
-		value = eval(yChar + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less double : wrong result : ", yCharValue < xDoubleValue, booleanValue);
-
-		value = eval(xChar + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char less double : wrong result : ", xCharValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char <= {byte, char, short, int, long, float, double}
-
-	public void testCharLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual byte : wrong result : ", xCharValue <= yByteValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual byte : wrong result : ", yCharValue <= xByteValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual byte : wrong result : ", xCharValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual char : wrong result : ", xCharValue <= yCharValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual char : wrong result : ", yCharValue <= xCharValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual char : wrong result : ", xCharValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual short : wrong result : ", xCharValue <= yShortValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual short : wrong result : ", yCharValue <= xShortValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual short : wrong result : ", xCharValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual int : wrong result : ", xCharValue <= yIntValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual int : wrong result : ", yCharValue <= xIntValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual int : wrong result : ", xCharValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual long : wrong result : ", xCharValue <= yLongValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual long : wrong result : ", yCharValue <= xLongValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual long : wrong result : ", xCharValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual float : wrong result : ", xCharValue <= yFloatValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual float : wrong result : ", yCharValue <= xFloatValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual float : wrong result : ", xCharValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual double : wrong result : ", xCharValue <= yDoubleValue, booleanValue);
-
-		value = eval(yChar + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual double : wrong result : ", yCharValue <= xDoubleValue, booleanValue);
-
-		value = eval(xChar + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char lessEqual double : wrong result : ", xCharValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char == {byte, char, short, int, long, float, double}
-
-	public void testCharEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual byte : wrong result : ", xCharValue == yByteValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual byte : wrong result : ", yCharValue == xByteValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual byte : wrong result : ", xCharValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual char : wrong result : ", xCharValue == yCharValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual char : wrong result : ", yCharValue == xCharValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual char : wrong result : ", xCharValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual short : wrong result : ", xCharValue == yShortValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual short : wrong result : ", yCharValue == xShortValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual short : wrong result : ", xCharValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual int : wrong result : ", xCharValue == yIntValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual int : wrong result : ", yCharValue == xIntValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual int : wrong result : ", xCharValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual long : wrong result : ", xCharValue == yLongValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual long : wrong result : ", yCharValue == xLongValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual long : wrong result : ", xCharValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual float : wrong result : ", xCharValue == yFloatValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual float : wrong result : ", yCharValue == xFloatValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual float : wrong result : ", xCharValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual double : wrong result : ", xCharValue == yDoubleValue, booleanValue);
-
-		value = eval(yChar + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual double : wrong result : ", yCharValue == xDoubleValue, booleanValue);
-
-		value = eval(xChar + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char equalEqual double : wrong result : ", xCharValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char != {byte, char, short, int, long, float, double}
-
-	public void testCharNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual byte : wrong result : ", xCharValue != yByteValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual byte : wrong result : ", yCharValue != xByteValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual byte : wrong result : ", xCharValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual char : wrong result : ", xCharValue != yCharValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual char : wrong result : ", yCharValue != xCharValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual char : wrong result : ", xCharValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual short : wrong result : ", xCharValue != yShortValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual short : wrong result : ", yCharValue != xShortValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual short : wrong result : ", xCharValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual int : wrong result : ", xCharValue != yIntValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual int : wrong result : ", yCharValue != xIntValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual int : wrong result : ", xCharValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual long : wrong result : ", xCharValue != yLongValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual long : wrong result : ", yCharValue != xLongValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual long : wrong result : ", xCharValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual float : wrong result : ", xCharValue != yFloatValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual float : wrong result : ", yCharValue != xFloatValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual float : wrong result : ", xCharValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual double : wrong result : ", xCharValue != yDoubleValue, booleanValue);
-
-		value = eval(yChar + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual double : wrong result : ", yCharValue != xDoubleValue, booleanValue);
-
-		value = eval(xChar + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("char notEqual double : wrong result : ", xCharValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char << {byte, char, short, int, long}
-
-	public void testCharLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift byte : wrong result : ", xCharValue << yByteValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift byte : wrong result : ", yCharValue << xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift char : wrong result : ", xCharValue << yCharValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift char : wrong result : ", yCharValue << xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift short : wrong result : ", xCharValue << yShortValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift short : wrong result : ", yCharValue << xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift int : wrong result : ", xCharValue << yIntValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift int : wrong result : ", yCharValue << xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift long : wrong result : ", xCharValue << yLongValue, intValue);
-
-		value = eval(yChar + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char leftShift long : wrong result : ", yCharValue << xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char >> {byte, char, short, int, long}
-
-	public void testCharRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift byte : wrong result : ", xCharValue >> yByteValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift byte : wrong result : ", yCharValue >> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift char : wrong result : ", xCharValue >> yCharValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift char : wrong result : ", yCharValue >> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift short : wrong result : ", xCharValue >> yShortValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift short : wrong result : ", yCharValue >> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift int : wrong result : ", xCharValue >> yIntValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift int : wrong result : ", yCharValue >> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift long : wrong result : ", xCharValue >> yLongValue, intValue);
-
-		value = eval(yChar + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char rightShift long : wrong result : ", yCharValue >> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char >>> {byte, char, short, int, long}
-
-	public void testCharUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift byte : wrong result : ", xCharValue >>> yByteValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift byte : wrong result : ", yCharValue >>> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift char : wrong result : ", xCharValue >>> yCharValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift char : wrong result : ", yCharValue >>> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift short : wrong result : ", xCharValue >>> yShortValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift short : wrong result : ", yCharValue >>> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift int : wrong result : ", xCharValue >>> yIntValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift int : wrong result : ", yCharValue >>> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift long : wrong result : ", xCharValue >>> yLongValue, intValue);
-
-		value = eval(yChar + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char unsignedRightShift long : wrong result : ", yCharValue >>> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char | {byte, char, short, int, long}
-
-	public void testCharOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or byte : wrong result : ", xCharValue | yByteValue, intValue);
-
-		value = eval(yChar + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or byte : wrong result : ", yCharValue | xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or char : wrong result : ", xCharValue | yCharValue, intValue);
-
-		value = eval(yChar + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or char : wrong result : ", yCharValue | xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or short : wrong result : ", xCharValue | yShortValue, intValue);
-
-		value = eval(yChar + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or short : wrong result : ", yCharValue | xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or int : wrong result : ", xCharValue | yIntValue, intValue);
-
-		value = eval(yChar + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char or int : wrong result : ", yCharValue | xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char or long : wrong result : ", xCharValue | yLongValue, longValue);
-
-		value = eval(yChar + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char or long : wrong result : ", yCharValue | xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char & {byte, char, short, int, long}
-
-	public void testCharAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and byte : wrong result : ", xCharValue & yByteValue, intValue);
-
-		value = eval(yChar + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and byte : wrong result : ", yCharValue & xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and char : wrong result : ", xCharValue & yCharValue, intValue);
-
-		value = eval(yChar + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and char : wrong result : ", yCharValue & xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and short : wrong result : ", xCharValue & yShortValue, intValue);
-
-		value = eval(yChar + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and short : wrong result : ", yCharValue & xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and int : wrong result : ", xCharValue & yIntValue, intValue);
-
-		value = eval(yChar + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char and int : wrong result : ", yCharValue & xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char and long : wrong result : ", xCharValue & yLongValue, longValue);
-
-		value = eval(yChar + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char and long : wrong result : ", yCharValue & xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// char ^ {byte, char, short, int, long}
-
-	public void testCharXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor byte : wrong result : ", xCharValue ^ yByteValue, intValue);
-
-		value = eval(yChar + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor byte : wrong result : ", yCharValue ^ xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor char : wrong result : ", xCharValue ^ yCharValue, intValue);
-
-		value = eval(yChar + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor char : wrong result : ", yCharValue ^ xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor short : wrong result : ", xCharValue ^ yShortValue, intValue);
-
-		value = eval(yChar + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor short : wrong result : ", yCharValue ^ xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor int : wrong result : ", xCharValue ^ yIntValue, intValue);
-
-		value = eval(yChar + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("char xor int : wrong result : ", yCharValue ^ xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xChar + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char xor long : wrong result : ", xCharValue ^ yLongValue, longValue);
-
-		value = eval(yChar + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("char xor long : wrong result : ", yCharValue ^ xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + char
-
-	public void testPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus char : wrong result : ", + xCharValue, intValue);
-
-		value = eval(plusOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus char : wrong result : ", + yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// - char
-
-	public void testMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus char : wrong result : ", - xCharValue, intValue);
-
-		value = eval(minusOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus char : wrong result : ", - yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// ~ char
-
-	public void testTwiddleChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle char : wrong result : ", ~ xCharValue, intValue);
-
-		value = eval(twiddleOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle char : wrong result : ", ~ yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
deleted file mode 100644
index 9a1f714..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,2036 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class DoubleAssignmentOperatorsTests extends Tests {
-
-	public DoubleAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// double += {byte, char, short, int, long, float, double}
-
-	public void testDoublePlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarDouble + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarDouble + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarDouble + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarDouble + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarDouble + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarDouble + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarDouble + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarDouble + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarDouble + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarDouble + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarDouble + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarDouble + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarDouble + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarDouble + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarDouble + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarDouble + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarDouble + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarDouble + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarDouble + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarDouble + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarDouble + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarDouble + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double -= {byte, char, short, int, long, float, double}
-
-	public void testDoubleMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarDouble + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarDouble + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarDouble + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarDouble + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarDouble + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarDouble + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarDouble + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarDouble + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarDouble + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarDouble + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarDouble + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarDouble + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarDouble + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarDouble + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarDouble + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarDouble + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarDouble + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarDouble + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarDouble + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarDouble + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarDouble + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarDouble + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minusAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minusAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double *= {byte, char, short, int, long, float, double}
-
-	public void testDoubleMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarDouble + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarDouble + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarDouble + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiplyAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiplyAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double /= {byte, char, short, int, long, float, double}
-
-	public void testDoubleDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarDouble + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarDouble + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarDouble + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarDouble + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarDouble + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarDouble + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarDouble + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarDouble + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarDouble + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarDouble + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarDouble + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarDouble + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarDouble + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarDouble + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarDouble + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarDouble + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarDouble + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarDouble + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarDouble + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarDouble + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarDouble + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarDouble + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divideAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divideAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double %= {byte, char, short, int, long, float, double}
-
-	public void testDoubleRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment byte : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment char : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment short : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment int : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment long : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment float : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarDouble + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarDouble + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarDouble + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarDouble + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainderAssignment double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainderAssignment double : wrong result : ", tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
deleted file mode 100644
index 00a0f8b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
+++ /dev/null
@@ -1,1830 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class DoubleOperatorsTests extends Tests {
-
-	public DoubleOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// double + {byte, char, short, int, long, float, double}
-
-	public void testDoublePlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus byte : wrong result : ", xDoubleValue + yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus byte : wrong result : ", yDoubleValue + xByteValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus char : wrong result : ", xDoubleValue + yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus char : wrong result : ", yDoubleValue + xCharValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus short : wrong result : ", xDoubleValue + yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus short : wrong result : ", yDoubleValue + xShortValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus int : wrong result : ", xDoubleValue + yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus int : wrong result : ", yDoubleValue + xIntValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus long : wrong result : ", xDoubleValue + yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus long : wrong result : ", yDoubleValue + xLongValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus float : wrong result : ", xDoubleValue + yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus float : wrong result : ", yDoubleValue + xFloatValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus double : wrong result : ", xDoubleValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double plus double : wrong result : ", yDoubleValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoublePlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("double plus java.lang.String : wrong result : ", xDoubleValue + yStringValue, stringValue);
-
-		value = eval(yDouble + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("double plus java.lang.String : wrong result : ", yDoubleValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// double - {byte, char, short, int, long, float, double}
-
-	public void testDoubleMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus byte : wrong result : ", xDoubleValue - yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus byte : wrong result : ", yDoubleValue - xByteValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus char : wrong result : ", xDoubleValue - yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus char : wrong result : ", yDoubleValue - xCharValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus short : wrong result : ", xDoubleValue - yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus short : wrong result : ", yDoubleValue - xShortValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus int : wrong result : ", xDoubleValue - yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus int : wrong result : ", yDoubleValue - xIntValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus long : wrong result : ", xDoubleValue - yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus long : wrong result : ", yDoubleValue - xLongValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus float : wrong result : ", xDoubleValue - yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus float : wrong result : ", yDoubleValue - xFloatValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus double : wrong result : ", xDoubleValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double minus double : wrong result : ", yDoubleValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double * {byte, char, short, int, long, float, double}
-
-	public void testDoubleMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply byte : wrong result : ", xDoubleValue * yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply byte : wrong result : ", yDoubleValue * xByteValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply char : wrong result : ", xDoubleValue * yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply char : wrong result : ", yDoubleValue * xCharValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply short : wrong result : ", xDoubleValue * yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply short : wrong result : ", yDoubleValue * xShortValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply int : wrong result : ", xDoubleValue * yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply int : wrong result : ", yDoubleValue * xIntValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply long : wrong result : ", xDoubleValue * yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply long : wrong result : ", yDoubleValue * xLongValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply float : wrong result : ", xDoubleValue * yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply float : wrong result : ", yDoubleValue * xFloatValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply double : wrong result : ", xDoubleValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double multiply double : wrong result : ", yDoubleValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double / {byte, char, short, int, long, float, double}
-
-	public void testDoubleDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide byte : wrong result : ", xDoubleValue / yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide byte : wrong result : ", yDoubleValue / xByteValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide char : wrong result : ", xDoubleValue / yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide char : wrong result : ", yDoubleValue / xCharValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide short : wrong result : ", xDoubleValue / yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide short : wrong result : ", yDoubleValue / xShortValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide int : wrong result : ", xDoubleValue / yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide int : wrong result : ", yDoubleValue / xIntValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide long : wrong result : ", xDoubleValue / yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide long : wrong result : ", yDoubleValue / xLongValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide float : wrong result : ", xDoubleValue / yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide float : wrong result : ", yDoubleValue / xFloatValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide double : wrong result : ", xDoubleValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double divide double : wrong result : ", yDoubleValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double % {byte, char, short, int, long, float, double}
-
-	public void testDoubleRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder byte : wrong result : ", xDoubleValue % yByteValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder byte : wrong result : ", yDoubleValue % xByteValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder char : wrong result : ", xDoubleValue % yCharValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder char : wrong result : ", yDoubleValue % xCharValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder short : wrong result : ", xDoubleValue % yShortValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder short : wrong result : ", yDoubleValue % xShortValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder int : wrong result : ", xDoubleValue % yIntValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder int : wrong result : ", yDoubleValue % xIntValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder long : wrong result : ", xDoubleValue % yLongValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder long : wrong result : ", yDoubleValue % xLongValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder float : wrong result : ", xDoubleValue % yFloatValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder float : wrong result : ", yDoubleValue % xFloatValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder double : wrong result : ", xDoubleValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yDouble + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double remainder double : wrong result : ", yDoubleValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// double > {byte, char, short, int, long, float, double}
-
-	public void testDoubleGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater byte : wrong result : ", xDoubleValue > yByteValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater byte : wrong result : ", yDoubleValue > xByteValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater byte : wrong result : ", xDoubleValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater char : wrong result : ", xDoubleValue > yCharValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater char : wrong result : ", yDoubleValue > xCharValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater char : wrong result : ", xDoubleValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater short : wrong result : ", xDoubleValue > yShortValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater short : wrong result : ", yDoubleValue > xShortValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater short : wrong result : ", xDoubleValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater int : wrong result : ", xDoubleValue > yIntValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater int : wrong result : ", yDoubleValue > xIntValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater int : wrong result : ", xDoubleValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater long : wrong result : ", xDoubleValue > yLongValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater long : wrong result : ", yDoubleValue > xLongValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater long : wrong result : ", xDoubleValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater float : wrong result : ", xDoubleValue > yFloatValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater float : wrong result : ", yDoubleValue > xFloatValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater float : wrong result : ", xDoubleValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater double : wrong result : ", xDoubleValue > yDoubleValue, booleanValue);
-
-		value = eval(yDouble + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater double : wrong result : ", yDoubleValue > xDoubleValue, booleanValue);
-
-		value = eval(xDouble + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greater double : wrong result : ", xDoubleValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// double >= {byte, char, short, int, long, float, double}
-
-	public void testDoubleGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual byte : wrong result : ", xDoubleValue >= yByteValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual byte : wrong result : ", yDoubleValue >= xByteValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual byte : wrong result : ", xDoubleValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual char : wrong result : ", xDoubleValue >= yCharValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual char : wrong result : ", yDoubleValue >= xCharValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual char : wrong result : ", xDoubleValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual short : wrong result : ", xDoubleValue >= yShortValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual short : wrong result : ", yDoubleValue >= xShortValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual short : wrong result : ", xDoubleValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual int : wrong result : ", xDoubleValue >= yIntValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual int : wrong result : ", yDoubleValue >= xIntValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual int : wrong result : ", xDoubleValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual long : wrong result : ", xDoubleValue >= yLongValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual long : wrong result : ", yDoubleValue >= xLongValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual long : wrong result : ", xDoubleValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual float : wrong result : ", xDoubleValue >= yFloatValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual float : wrong result : ", yDoubleValue >= xFloatValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual float : wrong result : ", xDoubleValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual double : wrong result : ", xDoubleValue >= yDoubleValue, booleanValue);
-
-		value = eval(yDouble + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual double : wrong result : ", yDoubleValue >= xDoubleValue, booleanValue);
-
-		value = eval(xDouble + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double greaterEqual double : wrong result : ", xDoubleValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// double < {byte, char, short, int, long, float, double}
-
-	public void testDoubleLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less byte : wrong result : ", xDoubleValue < yByteValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less byte : wrong result : ", yDoubleValue < xByteValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less byte : wrong result : ", xDoubleValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less char : wrong result : ", xDoubleValue < yCharValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less char : wrong result : ", yDoubleValue < xCharValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less char : wrong result : ", xDoubleValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less short : wrong result : ", xDoubleValue < yShortValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less short : wrong result : ", yDoubleValue < xShortValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less short : wrong result : ", xDoubleValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less int : wrong result : ", xDoubleValue < yIntValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less int : wrong result : ", yDoubleValue < xIntValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less int : wrong result : ", xDoubleValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less long : wrong result : ", xDoubleValue < yLongValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less long : wrong result : ", yDoubleValue < xLongValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less long : wrong result : ", xDoubleValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less float : wrong result : ", xDoubleValue < yFloatValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less float : wrong result : ", yDoubleValue < xFloatValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less float : wrong result : ", xDoubleValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less double : wrong result : ", xDoubleValue < yDoubleValue, booleanValue);
-
-		value = eval(yDouble + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less double : wrong result : ", yDoubleValue < xDoubleValue, booleanValue);
-
-		value = eval(xDouble + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double less double : wrong result : ", xDoubleValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// double <= {byte, char, short, int, long, float, double}
-
-	public void testDoubleLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual byte : wrong result : ", xDoubleValue <= yByteValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual byte : wrong result : ", yDoubleValue <= xByteValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual byte : wrong result : ", xDoubleValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual char : wrong result : ", xDoubleValue <= yCharValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual char : wrong result : ", yDoubleValue <= xCharValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual char : wrong result : ", xDoubleValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual short : wrong result : ", xDoubleValue <= yShortValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual short : wrong result : ", yDoubleValue <= xShortValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual short : wrong result : ", xDoubleValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual int : wrong result : ", xDoubleValue <= yIntValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual int : wrong result : ", yDoubleValue <= xIntValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual int : wrong result : ", xDoubleValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual long : wrong result : ", xDoubleValue <= yLongValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual long : wrong result : ", yDoubleValue <= xLongValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual long : wrong result : ", xDoubleValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual float : wrong result : ", xDoubleValue <= yFloatValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual float : wrong result : ", yDoubleValue <= xFloatValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual float : wrong result : ", xDoubleValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual double : wrong result : ", xDoubleValue <= yDoubleValue, booleanValue);
-
-		value = eval(yDouble + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual double : wrong result : ", yDoubleValue <= xDoubleValue, booleanValue);
-
-		value = eval(xDouble + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double lessEqual double : wrong result : ", xDoubleValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// double == {byte, char, short, int, long, float, double}
-
-	public void testDoubleEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual byte : wrong result : ", xDoubleValue == yByteValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual byte : wrong result : ", yDoubleValue == xByteValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual byte : wrong result : ", xDoubleValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual char : wrong result : ", xDoubleValue == yCharValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual char : wrong result : ", yDoubleValue == xCharValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual char : wrong result : ", xDoubleValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual short : wrong result : ", xDoubleValue == yShortValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual short : wrong result : ", yDoubleValue == xShortValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual short : wrong result : ", xDoubleValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual int : wrong result : ", xDoubleValue == yIntValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual int : wrong result : ", yDoubleValue == xIntValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual int : wrong result : ", xDoubleValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual long : wrong result : ", xDoubleValue == yLongValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual long : wrong result : ", yDoubleValue == xLongValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual long : wrong result : ", xDoubleValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual float : wrong result : ", xDoubleValue == yFloatValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual float : wrong result : ", yDoubleValue == xFloatValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual float : wrong result : ", xDoubleValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual double : wrong result : ", xDoubleValue == yDoubleValue, booleanValue);
-
-		value = eval(yDouble + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual double : wrong result : ", yDoubleValue == xDoubleValue, booleanValue);
-
-		value = eval(xDouble + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double equalEqual double : wrong result : ", xDoubleValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// double != {byte, char, short, int, long, float, double}
-
-	public void testDoubleNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual byte : wrong result : ", xDoubleValue != yByteValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual byte : wrong result : ", yDoubleValue != xByteValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual byte : wrong result : ", xDoubleValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual char : wrong result : ", xDoubleValue != yCharValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual char : wrong result : ", yDoubleValue != xCharValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual char : wrong result : ", xDoubleValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual short : wrong result : ", xDoubleValue != yShortValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual short : wrong result : ", yDoubleValue != xShortValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual short : wrong result : ", xDoubleValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual int : wrong result : ", xDoubleValue != yIntValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual int : wrong result : ", yDoubleValue != xIntValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual int : wrong result : ", xDoubleValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual long : wrong result : ", xDoubleValue != yLongValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual long : wrong result : ", yDoubleValue != xLongValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual long : wrong result : ", xDoubleValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual float : wrong result : ", xDoubleValue != yFloatValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual float : wrong result : ", yDoubleValue != xFloatValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual float : wrong result : ", xDoubleValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xDouble + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual double : wrong result : ", xDoubleValue != yDoubleValue, booleanValue);
-
-		value = eval(yDouble + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual double : wrong result : ", yDoubleValue != xDoubleValue, booleanValue);
-
-		value = eval(xDouble + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("double notEqual double : wrong result : ", xDoubleValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + double
-
-	public void testPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("plus double : wrong result : ", + xDoubleValue, doubleValue, 0);
-
-		value = eval(plusOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("plus double : wrong result : ", + yDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// - double
-
-	public void testMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("minus double : wrong result : ", - xDoubleValue, doubleValue, 0);
-
-		value = eval(minusOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("minus double : wrong result : ", - yDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
deleted file mode 100644
index 47121d5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class FieldValueTests extends Tests {
-
-	public FieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",63,2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xFieldByteValue, byteValue);
-
-		value = eval("" + yFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yFieldByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xFieldCharValue, charValue);
-
-		value = eval("" + yFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yFieldCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xFieldShortValue, shortValue);
-
-		value = eval("" + yFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yFieldShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xFieldIntValue, intValue);
-
-		value = eval("" + yFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yFieldIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xFieldLongValue, longValue);
-
-		value = eval("" + yFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yFieldLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xFieldFloatValue, floatValue, 0);
-
-		value = eval("" + yFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yFieldFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xFieldDoubleValue, doubleValue, 0);
-
-		value = eval("" + yFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yFieldDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xFieldStringValue, stringValue);
-
-		value = eval("" + yFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yFieldStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xFieldBooleanValue, booleanValue);
-
-		value = eval("" + yFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yFieldBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
deleted file mode 100644
index aa38415..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,2036 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class FloatAssignmentOperatorsTests extends Tests {
-
-	public FloatAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// float += {byte, char, short, int, long, float, double}
-
-	public void testFloatPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarFloat + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarFloat + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarFloat + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarFloat + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarFloat + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarFloat + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarFloat + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarFloat + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarFloat + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarFloat + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarFloat + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarFloat + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarFloat + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarFloat + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarFloat + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarFloat + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarFloat + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarFloat + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarFloat + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarFloat + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarFloat + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarFloat + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float -= {byte, char, short, int, long, float, double}
-
-	public void testFloatMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarFloat + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarFloat + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarFloat + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarFloat + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarFloat + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarFloat + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarFloat + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarFloat + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarFloat + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarFloat + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarFloat + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarFloat + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarFloat + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarFloat + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarFloat + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarFloat + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarFloat + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarFloat + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarFloat + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarFloat + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarFloat + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarFloat + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minusAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minusAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float *= {byte, char, short, int, long, float, double}
-
-	public void testFloatMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarFloat + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarFloat + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarFloat + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiplyAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiplyAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float /= {byte, char, short, int, long, float, double}
-
-	public void testFloatDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarFloat + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarFloat + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarFloat + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarFloat + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarFloat + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarFloat + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarFloat + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarFloat + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarFloat + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarFloat + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarFloat + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarFloat + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarFloat + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarFloat + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarFloat + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarFloat + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarFloat + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarFloat + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarFloat + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarFloat + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarFloat + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarFloat + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divideAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divideAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float %= {byte, char, short, int, long, float, double}
-
-	public void testFloatRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment byte : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment char : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment short : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment int : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment long : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment float : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarFloat + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarFloat + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarFloat + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarFloat + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainderAssignment double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainderAssignment double : wrong result : ", tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
deleted file mode 100644
index 7706978..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
+++ /dev/null
@@ -1,1830 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class FloatOperatorsTests extends Tests {
-
-	public FloatOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// float + {byte, char, short, int, long, float, double}
-
-	public void testFloatPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus byte : wrong result : ", xFloatValue + yByteValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus byte : wrong result : ", yFloatValue + xByteValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus char : wrong result : ", xFloatValue + yCharValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus char : wrong result : ", yFloatValue + xCharValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus short : wrong result : ", xFloatValue + yShortValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus short : wrong result : ", yFloatValue + xShortValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus int : wrong result : ", xFloatValue + yIntValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus int : wrong result : ", yFloatValue + xIntValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus long : wrong result : ", xFloatValue + yLongValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus long : wrong result : ", yFloatValue + xLongValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus float : wrong result : ", xFloatValue + yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float plus float : wrong result : ", yFloatValue + xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float plus double : wrong result : ", xFloatValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float plus double : wrong result : ", yFloatValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("float plus java.lang.String : wrong result : ", xFloatValue + yStringValue, stringValue);
-
-		value = eval(yFloat + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("float plus java.lang.String : wrong result : ", yFloatValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// float - {byte, char, short, int, long, float, double}
-
-	public void testFloatMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus byte : wrong result : ", xFloatValue - yByteValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus byte : wrong result : ", yFloatValue - xByteValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus char : wrong result : ", xFloatValue - yCharValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus char : wrong result : ", yFloatValue - xCharValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus short : wrong result : ", xFloatValue - yShortValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus short : wrong result : ", yFloatValue - xShortValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus int : wrong result : ", xFloatValue - yIntValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus int : wrong result : ", yFloatValue - xIntValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus long : wrong result : ", xFloatValue - yLongValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus long : wrong result : ", yFloatValue - xLongValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus float : wrong result : ", xFloatValue - yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float minus float : wrong result : ", yFloatValue - xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float minus double : wrong result : ", xFloatValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float minus double : wrong result : ", yFloatValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float * {byte, char, short, int, long, float, double}
-
-	public void testFloatMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply byte : wrong result : ", xFloatValue * yByteValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply byte : wrong result : ", yFloatValue * xByteValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply char : wrong result : ", xFloatValue * yCharValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply char : wrong result : ", yFloatValue * xCharValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply short : wrong result : ", xFloatValue * yShortValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply short : wrong result : ", yFloatValue * xShortValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply int : wrong result : ", xFloatValue * yIntValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply int : wrong result : ", yFloatValue * xIntValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply long : wrong result : ", xFloatValue * yLongValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply long : wrong result : ", yFloatValue * xLongValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply float : wrong result : ", xFloatValue * yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float multiply float : wrong result : ", yFloatValue * xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float multiply double : wrong result : ", xFloatValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float multiply double : wrong result : ", yFloatValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float / {byte, char, short, int, long, float, double}
-
-	public void testFloatDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide byte : wrong result : ", xFloatValue / yByteValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide byte : wrong result : ", yFloatValue / xByteValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide char : wrong result : ", xFloatValue / yCharValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide char : wrong result : ", yFloatValue / xCharValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide short : wrong result : ", xFloatValue / yShortValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide short : wrong result : ", yFloatValue / xShortValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide int : wrong result : ", xFloatValue / yIntValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide int : wrong result : ", yFloatValue / xIntValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide long : wrong result : ", xFloatValue / yLongValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide long : wrong result : ", yFloatValue / xLongValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide float : wrong result : ", xFloatValue / yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float divide float : wrong result : ", yFloatValue / xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float divide double : wrong result : ", xFloatValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float divide double : wrong result : ", yFloatValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float % {byte, char, short, int, long, float, double}
-
-	public void testFloatRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder byte : wrong result : ", xFloatValue % yByteValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder byte : wrong result : ", yFloatValue % xByteValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder char : wrong result : ", xFloatValue % yCharValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder char : wrong result : ", yFloatValue % xCharValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder short : wrong result : ", xFloatValue % yShortValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder short : wrong result : ", yFloatValue % xShortValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder int : wrong result : ", xFloatValue % yIntValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder int : wrong result : ", yFloatValue % xIntValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder long : wrong result : ", xFloatValue % yLongValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder long : wrong result : ", yFloatValue % xLongValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder float : wrong result : ", xFloatValue % yFloatValue, floatValue, 0);
-
-		value = eval(yFloat + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float remainder float : wrong result : ", yFloatValue % xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float remainder double : wrong result : ", xFloatValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yFloat + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("float remainder double : wrong result : ", yFloatValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// float > {byte, char, short, int, long, float, double}
-
-	public void testFloatGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater byte : wrong result : ", xFloatValue > yByteValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater byte : wrong result : ", yFloatValue > xByteValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater byte : wrong result : ", xFloatValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater char : wrong result : ", xFloatValue > yCharValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater char : wrong result : ", yFloatValue > xCharValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater char : wrong result : ", xFloatValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater short : wrong result : ", xFloatValue > yShortValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater short : wrong result : ", yFloatValue > xShortValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater short : wrong result : ", xFloatValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater int : wrong result : ", xFloatValue > yIntValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater int : wrong result : ", yFloatValue > xIntValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater int : wrong result : ", xFloatValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater long : wrong result : ", xFloatValue > yLongValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater long : wrong result : ", yFloatValue > xLongValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater long : wrong result : ", xFloatValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater float : wrong result : ", xFloatValue > yFloatValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater float : wrong result : ", yFloatValue > xFloatValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater float : wrong result : ", xFloatValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater double : wrong result : ", xFloatValue > yDoubleValue, booleanValue);
-
-		value = eval(yFloat + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater double : wrong result : ", yFloatValue > xDoubleValue, booleanValue);
-
-		value = eval(xFloat + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greater double : wrong result : ", xFloatValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// float >= {byte, char, short, int, long, float, double}
-
-	public void testFloatGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual byte : wrong result : ", xFloatValue >= yByteValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual byte : wrong result : ", yFloatValue >= xByteValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual byte : wrong result : ", xFloatValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual char : wrong result : ", xFloatValue >= yCharValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual char : wrong result : ", yFloatValue >= xCharValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual char : wrong result : ", xFloatValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual short : wrong result : ", xFloatValue >= yShortValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual short : wrong result : ", yFloatValue >= xShortValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual short : wrong result : ", xFloatValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual int : wrong result : ", xFloatValue >= yIntValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual int : wrong result : ", yFloatValue >= xIntValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual int : wrong result : ", xFloatValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual long : wrong result : ", xFloatValue >= yLongValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual long : wrong result : ", yFloatValue >= xLongValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual long : wrong result : ", xFloatValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual float : wrong result : ", xFloatValue >= yFloatValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual float : wrong result : ", yFloatValue >= xFloatValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual float : wrong result : ", xFloatValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual double : wrong result : ", xFloatValue >= yDoubleValue, booleanValue);
-
-		value = eval(yFloat + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual double : wrong result : ", yFloatValue >= xDoubleValue, booleanValue);
-
-		value = eval(xFloat + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float greaterEqual double : wrong result : ", xFloatValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// float < {byte, char, short, int, long, float, double}
-
-	public void testFloatLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less byte : wrong result : ", xFloatValue < yByteValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less byte : wrong result : ", yFloatValue < xByteValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less byte : wrong result : ", xFloatValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less char : wrong result : ", xFloatValue < yCharValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less char : wrong result : ", yFloatValue < xCharValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less char : wrong result : ", xFloatValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less short : wrong result : ", xFloatValue < yShortValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less short : wrong result : ", yFloatValue < xShortValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less short : wrong result : ", xFloatValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less int : wrong result : ", xFloatValue < yIntValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less int : wrong result : ", yFloatValue < xIntValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less int : wrong result : ", xFloatValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less long : wrong result : ", xFloatValue < yLongValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less long : wrong result : ", yFloatValue < xLongValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less long : wrong result : ", xFloatValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less float : wrong result : ", xFloatValue < yFloatValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less float : wrong result : ", yFloatValue < xFloatValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less float : wrong result : ", xFloatValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less double : wrong result : ", xFloatValue < yDoubleValue, booleanValue);
-
-		value = eval(yFloat + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less double : wrong result : ", yFloatValue < xDoubleValue, booleanValue);
-
-		value = eval(xFloat + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float less double : wrong result : ", xFloatValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// float <= {byte, char, short, int, long, float, double}
-
-	public void testFloatLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual byte : wrong result : ", xFloatValue <= yByteValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual byte : wrong result : ", yFloatValue <= xByteValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual byte : wrong result : ", xFloatValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual char : wrong result : ", xFloatValue <= yCharValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual char : wrong result : ", yFloatValue <= xCharValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual char : wrong result : ", xFloatValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual short : wrong result : ", xFloatValue <= yShortValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual short : wrong result : ", yFloatValue <= xShortValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual short : wrong result : ", xFloatValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual int : wrong result : ", xFloatValue <= yIntValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual int : wrong result : ", yFloatValue <= xIntValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual int : wrong result : ", xFloatValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual long : wrong result : ", xFloatValue <= yLongValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual long : wrong result : ", yFloatValue <= xLongValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual long : wrong result : ", xFloatValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual float : wrong result : ", xFloatValue <= yFloatValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual float : wrong result : ", yFloatValue <= xFloatValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual float : wrong result : ", xFloatValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual double : wrong result : ", xFloatValue <= yDoubleValue, booleanValue);
-
-		value = eval(yFloat + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual double : wrong result : ", yFloatValue <= xDoubleValue, booleanValue);
-
-		value = eval(xFloat + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float lessEqual double : wrong result : ", xFloatValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// float == {byte, char, short, int, long, float, double}
-
-	public void testFloatEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual byte : wrong result : ", xFloatValue == yByteValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual byte : wrong result : ", yFloatValue == xByteValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual byte : wrong result : ", xFloatValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual char : wrong result : ", xFloatValue == yCharValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual char : wrong result : ", yFloatValue == xCharValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual char : wrong result : ", xFloatValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual short : wrong result : ", xFloatValue == yShortValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual short : wrong result : ", yFloatValue == xShortValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual short : wrong result : ", xFloatValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual int : wrong result : ", xFloatValue == yIntValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual int : wrong result : ", yFloatValue == xIntValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual int : wrong result : ", xFloatValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual long : wrong result : ", xFloatValue == yLongValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual long : wrong result : ", yFloatValue == xLongValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual long : wrong result : ", xFloatValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual float : wrong result : ", xFloatValue == yFloatValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual float : wrong result : ", yFloatValue == xFloatValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual float : wrong result : ", xFloatValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual double : wrong result : ", xFloatValue == yDoubleValue, booleanValue);
-
-		value = eval(yFloat + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual double : wrong result : ", yFloatValue == xDoubleValue, booleanValue);
-
-		value = eval(xFloat + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float equalEqual double : wrong result : ", xFloatValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// float != {byte, char, short, int, long, float, double}
-
-	public void testFloatNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual byte : wrong result : ", xFloatValue != yByteValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual byte : wrong result : ", yFloatValue != xByteValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual byte : wrong result : ", xFloatValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual char : wrong result : ", xFloatValue != yCharValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual char : wrong result : ", yFloatValue != xCharValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual char : wrong result : ", xFloatValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual short : wrong result : ", xFloatValue != yShortValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual short : wrong result : ", yFloatValue != xShortValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual short : wrong result : ", xFloatValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual int : wrong result : ", xFloatValue != yIntValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual int : wrong result : ", yFloatValue != xIntValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual int : wrong result : ", xFloatValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual long : wrong result : ", xFloatValue != yLongValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual long : wrong result : ", yFloatValue != xLongValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual long : wrong result : ", xFloatValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual float : wrong result : ", xFloatValue != yFloatValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual float : wrong result : ", yFloatValue != xFloatValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual float : wrong result : ", xFloatValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xFloat + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual double : wrong result : ", xFloatValue != yDoubleValue, booleanValue);
-
-		value = eval(yFloat + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual double : wrong result : ", yFloatValue != xDoubleValue, booleanValue);
-
-		value = eval(xFloat + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("float notEqual double : wrong result : ", xFloatValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + float
-
-	public void testPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("plus float : wrong result : ", + xFloatValue, floatValue, 0);
-
-		value = eval(plusOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("plus float : wrong result : ", + yFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// - float
-
-	public void testMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("minus float : wrong result : ", - xFloatValue, floatValue, 0);
-
-		value = eval(minusOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("minus float : wrong result : ", - yFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
deleted file mode 100644
index 1330be1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3758 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class IntAssignmentOperatorsTests extends Tests {
-
-	public IntAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// int += {byte, char, short, int, long, float, double}
-
-	public void testIntPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarInt + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarInt + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarInt + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarInt + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarInt + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarInt + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarInt + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarInt + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarInt + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarInt + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarInt + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarInt + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarInt + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarInt + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarInt + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarInt + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarInt + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarInt + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarInt + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int -= {byte, char, short, int, long, float, double}
-
-	public void testIntMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarInt + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarInt + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarInt + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarInt + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarInt + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarInt + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarInt + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarInt + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarInt + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarInt + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarInt + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarInt + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarInt + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarInt + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarInt + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarInt + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarInt + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarInt + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarInt + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarInt + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarInt + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarInt + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minusAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minusAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int *= {byte, char, short, int, long, float, double}
-
-	public void testIntMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarInt + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarInt + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarInt + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarInt + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiplyAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiplyAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int /= {byte, char, short, int, long, float, double}
-
-	public void testIntDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarInt + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarInt + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarInt + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarInt + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarInt + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarInt + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarInt + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarInt + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarInt + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarInt + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarInt + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarInt + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarInt + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarInt + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarInt + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarInt + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarInt + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarInt + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarInt + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarInt + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarInt + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarInt + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divideAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divideAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int %= {byte, char, short, int, long, float, double}
-
-	public void testIntRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarInt + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarInt + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarInt + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarInt + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarInt + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarInt + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarInt + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarInt + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarInt + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarInt + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarInt + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarInt + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarInt + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarInt + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarInt + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarInt + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarInt + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarInt + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment float : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarInt + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarInt + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarInt + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarInt + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainderAssignment double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainderAssignment double : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int <<= {byte, char, short, int, long, float, double}
-
-	public void testIntLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarInt + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarInt + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarInt + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int >>= {byte, char, short, int, long, float, double}
-
-	public void testIntRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarInt + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarInt + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarInt + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int >>>= {byte, char, short, int, long, float, double}
-
-	public void testIntUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarInt + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarInt + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarInt + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShiftAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShiftAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int |= {byte, char, short, int, long, float, double}
-
-	public void testIntOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarInt + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarInt + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarInt + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarInt + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarInt + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarInt + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarInt + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarInt + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarInt + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarInt + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarInt + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarInt + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarInt + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarInt + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarInt + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarInt + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int orAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int orAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int &= {byte, char, short, int, long, float, double}
-
-	public void testIntAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarInt + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarInt + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarInt + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarInt + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarInt + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarInt + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarInt + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarInt + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarInt + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarInt + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarInt + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarInt + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarInt + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarInt + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarInt + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarInt + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int andAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int andAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int ^= {byte, char, short, int, long, float, double}
-
-	public void testIntXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarInt + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarInt + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarInt + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment byte : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarInt + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarInt + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarInt + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment char : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarInt + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarInt + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarInt + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment short : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarInt + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarInt + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarInt + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarInt + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarInt + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarInt + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarInt + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xorAssignment long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xorAssignment long : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
deleted file mode 100644
index dc6e84d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
+++ /dev/null
@@ -1,2433 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class IntOperatorsTests extends Tests {
-
-	public IntOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// int + {byte, char, short, int, long, float, double}
-
-	public void testIntPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus byte : wrong result : ", xIntValue + yByteValue, intValue);
-
-		value = eval(yInt + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus byte : wrong result : ", yIntValue + xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus char : wrong result : ", xIntValue + yCharValue, intValue);
-
-		value = eval(yInt + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus char : wrong result : ", yIntValue + xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus short : wrong result : ", xIntValue + yShortValue, intValue);
-
-		value = eval(yInt + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus short : wrong result : ", yIntValue + xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", xIntValue + yIntValue, intValue);
-
-		value = eval(yInt + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", yIntValue + xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int plus long : wrong result : ", xIntValue + yLongValue, longValue);
-
-		value = eval(yInt + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int plus long : wrong result : ", yIntValue + xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int plus float : wrong result : ", xIntValue + yFloatValue, floatValue, 0);
-
-		value = eval(yInt + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int plus float : wrong result : ", yIntValue + xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int plus double : wrong result : ", xIntValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int plus double : wrong result : ", yIntValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("int plus java.lang.String : wrong result : ", xIntValue + yStringValue, stringValue);
-
-		value = eval(yInt + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("int plus java.lang.String : wrong result : ", yIntValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int - {byte, char, short, int, long, float, double}
-
-	public void testIntMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus byte : wrong result : ", xIntValue - yByteValue, intValue);
-
-		value = eval(yInt + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus byte : wrong result : ", yIntValue - xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus char : wrong result : ", xIntValue - yCharValue, intValue);
-
-		value = eval(yInt + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus char : wrong result : ", yIntValue - xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus short : wrong result : ", xIntValue - yShortValue, intValue);
-
-		value = eval(yInt + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus short : wrong result : ", yIntValue - xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus int : wrong result : ", xIntValue - yIntValue, intValue);
-
-		value = eval(yInt + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int minus int : wrong result : ", yIntValue - xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int minus long : wrong result : ", xIntValue - yLongValue, longValue);
-
-		value = eval(yInt + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int minus long : wrong result : ", yIntValue - xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int minus float : wrong result : ", xIntValue - yFloatValue, floatValue, 0);
-
-		value = eval(yInt + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int minus float : wrong result : ", yIntValue - xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int minus double : wrong result : ", xIntValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int minus double : wrong result : ", yIntValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// int * {byte, char, short, int, long, float, double}
-
-	public void testIntMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply byte : wrong result : ", xIntValue * yByteValue, intValue);
-
-		value = eval(yInt + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply byte : wrong result : ", yIntValue * xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply char : wrong result : ", xIntValue * yCharValue, intValue);
-
-		value = eval(yInt + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply char : wrong result : ", yIntValue * xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply short : wrong result : ", xIntValue * yShortValue, intValue);
-
-		value = eval(yInt + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply short : wrong result : ", yIntValue * xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply int : wrong result : ", xIntValue * yIntValue, intValue);
-
-		value = eval(yInt + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int multiply int : wrong result : ", yIntValue * xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int multiply long : wrong result : ", xIntValue * yLongValue, longValue);
-
-		value = eval(yInt + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int multiply long : wrong result : ", yIntValue * xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int multiply float : wrong result : ", xIntValue * yFloatValue, floatValue, 0);
-
-		value = eval(yInt + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int multiply float : wrong result : ", yIntValue * xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int multiply double : wrong result : ", xIntValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int multiply double : wrong result : ", yIntValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// int / {byte, char, short, int, long, float, double}
-
-	public void testIntDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide byte : wrong result : ", xIntValue / yByteValue, intValue);
-
-		value = eval(yInt + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide byte : wrong result : ", yIntValue / xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide char : wrong result : ", xIntValue / yCharValue, intValue);
-
-		value = eval(yInt + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide char : wrong result : ", yIntValue / xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide short : wrong result : ", xIntValue / yShortValue, intValue);
-
-		value = eval(yInt + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide short : wrong result : ", yIntValue / xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide int : wrong result : ", xIntValue / yIntValue, intValue);
-
-		value = eval(yInt + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int divide int : wrong result : ", yIntValue / xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int divide long : wrong result : ", xIntValue / yLongValue, longValue);
-
-		value = eval(yInt + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int divide long : wrong result : ", yIntValue / xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int divide float : wrong result : ", xIntValue / yFloatValue, floatValue, 0);
-
-		value = eval(yInt + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int divide float : wrong result : ", yIntValue / xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int divide double : wrong result : ", xIntValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int divide double : wrong result : ", yIntValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// int % {byte, char, short, int, long, float, double}
-
-	public void testIntRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder byte : wrong result : ", xIntValue % yByteValue, intValue);
-
-		value = eval(yInt + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder byte : wrong result : ", yIntValue % xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder char : wrong result : ", xIntValue % yCharValue, intValue);
-
-		value = eval(yInt + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder char : wrong result : ", yIntValue % xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder short : wrong result : ", xIntValue % yShortValue, intValue);
-
-		value = eval(yInt + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder short : wrong result : ", yIntValue % xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder int : wrong result : ", xIntValue % yIntValue, intValue);
-
-		value = eval(yInt + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int remainder int : wrong result : ", yIntValue % xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int remainder long : wrong result : ", xIntValue % yLongValue, longValue);
-
-		value = eval(yInt + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int remainder long : wrong result : ", yIntValue % xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int remainder float : wrong result : ", xIntValue % yFloatValue, floatValue, 0);
-
-		value = eval(yInt + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("int remainder float : wrong result : ", yIntValue % xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int remainder double : wrong result : ", xIntValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yInt + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("int remainder double : wrong result : ", yIntValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// int > {byte, char, short, int, long, float, double}
-
-	public void testIntGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater byte : wrong result : ", xIntValue > yByteValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater byte : wrong result : ", yIntValue > xByteValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater byte : wrong result : ", xIntValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater char : wrong result : ", xIntValue > yCharValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater char : wrong result : ", yIntValue > xCharValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater char : wrong result : ", xIntValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater short : wrong result : ", xIntValue > yShortValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater short : wrong result : ", yIntValue > xShortValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater short : wrong result : ", xIntValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater int : wrong result : ", xIntValue > yIntValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater int : wrong result : ", yIntValue > xIntValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater int : wrong result : ", xIntValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater long : wrong result : ", xIntValue > yLongValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater long : wrong result : ", yIntValue > xLongValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater long : wrong result : ", xIntValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater float : wrong result : ", xIntValue > yFloatValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater float : wrong result : ", yIntValue > xFloatValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater float : wrong result : ", xIntValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater double : wrong result : ", xIntValue > yDoubleValue, booleanValue);
-
-		value = eval(yInt + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater double : wrong result : ", yIntValue > xDoubleValue, booleanValue);
-
-		value = eval(xInt + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greater double : wrong result : ", xIntValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int >= {byte, char, short, int, long, float, double}
-
-	public void testIntGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual byte : wrong result : ", xIntValue >= yByteValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual byte : wrong result : ", yIntValue >= xByteValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual byte : wrong result : ", xIntValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual char : wrong result : ", xIntValue >= yCharValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual char : wrong result : ", yIntValue >= xCharValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual char : wrong result : ", xIntValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual short : wrong result : ", xIntValue >= yShortValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual short : wrong result : ", yIntValue >= xShortValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual short : wrong result : ", xIntValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual int : wrong result : ", xIntValue >= yIntValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual int : wrong result : ", yIntValue >= xIntValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual int : wrong result : ", xIntValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual long : wrong result : ", xIntValue >= yLongValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual long : wrong result : ", yIntValue >= xLongValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual long : wrong result : ", xIntValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual float : wrong result : ", xIntValue >= yFloatValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual float : wrong result : ", yIntValue >= xFloatValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual float : wrong result : ", xIntValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual double : wrong result : ", xIntValue >= yDoubleValue, booleanValue);
-
-		value = eval(yInt + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual double : wrong result : ", yIntValue >= xDoubleValue, booleanValue);
-
-		value = eval(xInt + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int greaterEqual double : wrong result : ", xIntValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int < {byte, char, short, int, long, float, double}
-
-	public void testIntLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less byte : wrong result : ", xIntValue < yByteValue, booleanValue);
-
-		value = eval(yInt + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less byte : wrong result : ", yIntValue < xByteValue, booleanValue);
-
-		value = eval(xInt + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less byte : wrong result : ", xIntValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less char : wrong result : ", xIntValue < yCharValue, booleanValue);
-
-		value = eval(yInt + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less char : wrong result : ", yIntValue < xCharValue, booleanValue);
-
-		value = eval(xInt + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less char : wrong result : ", xIntValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less short : wrong result : ", xIntValue < yShortValue, booleanValue);
-
-		value = eval(yInt + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less short : wrong result : ", yIntValue < xShortValue, booleanValue);
-
-		value = eval(xInt + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less short : wrong result : ", xIntValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less int : wrong result : ", xIntValue < yIntValue, booleanValue);
-
-		value = eval(yInt + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less int : wrong result : ", yIntValue < xIntValue, booleanValue);
-
-		value = eval(xInt + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less int : wrong result : ", xIntValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less long : wrong result : ", xIntValue < yLongValue, booleanValue);
-
-		value = eval(yInt + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less long : wrong result : ", yIntValue < xLongValue, booleanValue);
-
-		value = eval(xInt + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less long : wrong result : ", xIntValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less float : wrong result : ", xIntValue < yFloatValue, booleanValue);
-
-		value = eval(yInt + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less float : wrong result : ", yIntValue < xFloatValue, booleanValue);
-
-		value = eval(xInt + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less float : wrong result : ", xIntValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less double : wrong result : ", xIntValue < yDoubleValue, booleanValue);
-
-		value = eval(yInt + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less double : wrong result : ", yIntValue < xDoubleValue, booleanValue);
-
-		value = eval(xInt + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int less double : wrong result : ", xIntValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int <= {byte, char, short, int, long, float, double}
-
-	public void testIntLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual byte : wrong result : ", xIntValue <= yByteValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual byte : wrong result : ", yIntValue <= xByteValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual byte : wrong result : ", xIntValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual char : wrong result : ", xIntValue <= yCharValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual char : wrong result : ", yIntValue <= xCharValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual char : wrong result : ", xIntValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual short : wrong result : ", xIntValue <= yShortValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual short : wrong result : ", yIntValue <= xShortValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual short : wrong result : ", xIntValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual int : wrong result : ", xIntValue <= yIntValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual int : wrong result : ", yIntValue <= xIntValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual int : wrong result : ", xIntValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual long : wrong result : ", xIntValue <= yLongValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual long : wrong result : ", yIntValue <= xLongValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual long : wrong result : ", xIntValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual float : wrong result : ", xIntValue <= yFloatValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual float : wrong result : ", yIntValue <= xFloatValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual float : wrong result : ", xIntValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual double : wrong result : ", xIntValue <= yDoubleValue, booleanValue);
-
-		value = eval(yInt + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual double : wrong result : ", yIntValue <= xDoubleValue, booleanValue);
-
-		value = eval(xInt + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int lessEqual double : wrong result : ", xIntValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int == {byte, char, short, int, long, float, double}
-
-	public void testIntEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual byte : wrong result : ", xIntValue == yByteValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual byte : wrong result : ", yIntValue == xByteValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual byte : wrong result : ", xIntValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual char : wrong result : ", xIntValue == yCharValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual char : wrong result : ", yIntValue == xCharValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual char : wrong result : ", xIntValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual short : wrong result : ", xIntValue == yShortValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual short : wrong result : ", yIntValue == xShortValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual short : wrong result : ", xIntValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual int : wrong result : ", xIntValue == yIntValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual int : wrong result : ", yIntValue == xIntValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual int : wrong result : ", xIntValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual long : wrong result : ", xIntValue == yLongValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual long : wrong result : ", yIntValue == xLongValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual long : wrong result : ", xIntValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual float : wrong result : ", xIntValue == yFloatValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual float : wrong result : ", yIntValue == xFloatValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual float : wrong result : ", xIntValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual double : wrong result : ", xIntValue == yDoubleValue, booleanValue);
-
-		value = eval(yInt + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual double : wrong result : ", yIntValue == xDoubleValue, booleanValue);
-
-		value = eval(xInt + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int equalEqual double : wrong result : ", xIntValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int != {byte, char, short, int, long, float, double}
-
-	public void testIntNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual byte : wrong result : ", xIntValue != yByteValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual byte : wrong result : ", yIntValue != xByteValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual byte : wrong result : ", xIntValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual char : wrong result : ", xIntValue != yCharValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual char : wrong result : ", yIntValue != xCharValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual char : wrong result : ", xIntValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual short : wrong result : ", xIntValue != yShortValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual short : wrong result : ", yIntValue != xShortValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual short : wrong result : ", xIntValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual int : wrong result : ", xIntValue != yIntValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual int : wrong result : ", yIntValue != xIntValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual int : wrong result : ", xIntValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual long : wrong result : ", xIntValue != yLongValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual long : wrong result : ", yIntValue != xLongValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual long : wrong result : ", xIntValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual float : wrong result : ", xIntValue != yFloatValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual float : wrong result : ", yIntValue != xFloatValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual float : wrong result : ", xIntValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual double : wrong result : ", xIntValue != yDoubleValue, booleanValue);
-
-		value = eval(yInt + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual double : wrong result : ", yIntValue != xDoubleValue, booleanValue);
-
-		value = eval(xInt + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("int notEqual double : wrong result : ", xIntValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int << {byte, char, short, int, long}
-
-	public void testIntLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift byte : wrong result : ", xIntValue << yByteValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift byte : wrong result : ", yIntValue << xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift char : wrong result : ", xIntValue << yCharValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift char : wrong result : ", yIntValue << xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift short : wrong result : ", xIntValue << yShortValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift short : wrong result : ", yIntValue << xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift int : wrong result : ", xIntValue << yIntValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift int : wrong result : ", yIntValue << xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift long : wrong result : ", xIntValue << yLongValue, intValue);
-
-		value = eval(yInt + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int leftShift long : wrong result : ", yIntValue << xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int >> {byte, char, short, int, long}
-
-	public void testIntRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift byte : wrong result : ", xIntValue >> yByteValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift byte : wrong result : ", yIntValue >> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift char : wrong result : ", xIntValue >> yCharValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift char : wrong result : ", yIntValue >> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift short : wrong result : ", xIntValue >> yShortValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift short : wrong result : ", yIntValue >> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift int : wrong result : ", xIntValue >> yIntValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift int : wrong result : ", yIntValue >> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift long : wrong result : ", xIntValue >> yLongValue, intValue);
-
-		value = eval(yInt + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int rightShift long : wrong result : ", yIntValue >> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int >>> {byte, char, short, int, long}
-
-	public void testIntUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift byte : wrong result : ", xIntValue >>> yByteValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift byte : wrong result : ", yIntValue >>> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift char : wrong result : ", xIntValue >>> yCharValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift char : wrong result : ", yIntValue >>> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift short : wrong result : ", xIntValue >>> yShortValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift short : wrong result : ", yIntValue >>> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift int : wrong result : ", xIntValue >>> yIntValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift int : wrong result : ", yIntValue >>> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift long : wrong result : ", xIntValue >>> yLongValue, intValue);
-
-		value = eval(yInt + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int unsignedRightShift long : wrong result : ", yIntValue >>> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int | {byte, char, short, int, long}
-
-	public void testIntOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or byte : wrong result : ", xIntValue | yByteValue, intValue);
-
-		value = eval(yInt + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or byte : wrong result : ", yIntValue | xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or char : wrong result : ", xIntValue | yCharValue, intValue);
-
-		value = eval(yInt + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or char : wrong result : ", yIntValue | xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or short : wrong result : ", xIntValue | yShortValue, intValue);
-
-		value = eval(yInt + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or short : wrong result : ", yIntValue | xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or int : wrong result : ", xIntValue | yIntValue, intValue);
-
-		value = eval(yInt + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int or int : wrong result : ", yIntValue | xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int or long : wrong result : ", xIntValue | yLongValue, longValue);
-
-		value = eval(yInt + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int or long : wrong result : ", yIntValue | xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int & {byte, char, short, int, long}
-
-	public void testIntAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and byte : wrong result : ", xIntValue & yByteValue, intValue);
-
-		value = eval(yInt + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and byte : wrong result : ", yIntValue & xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and char : wrong result : ", xIntValue & yCharValue, intValue);
-
-		value = eval(yInt + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and char : wrong result : ", yIntValue & xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and short : wrong result : ", xIntValue & yShortValue, intValue);
-
-		value = eval(yInt + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and short : wrong result : ", yIntValue & xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and int : wrong result : ", xIntValue & yIntValue, intValue);
-
-		value = eval(yInt + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int and int : wrong result : ", yIntValue & xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int and long : wrong result : ", xIntValue & yLongValue, longValue);
-
-		value = eval(yInt + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int and long : wrong result : ", yIntValue & xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// int ^ {byte, char, short, int, long}
-
-	public void testIntXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor byte : wrong result : ", xIntValue ^ yByteValue, intValue);
-
-		value = eval(yInt + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor byte : wrong result : ", yIntValue ^ xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor char : wrong result : ", xIntValue ^ yCharValue, intValue);
-
-		value = eval(yInt + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor char : wrong result : ", yIntValue ^ xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor short : wrong result : ", xIntValue ^ yShortValue, intValue);
-
-		value = eval(yInt + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor short : wrong result : ", yIntValue ^ xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor int : wrong result : ", xIntValue ^ yIntValue, intValue);
-
-		value = eval(yInt + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int xor int : wrong result : ", yIntValue ^ xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int xor long : wrong result : ", xIntValue ^ yLongValue, longValue);
-
-		value = eval(yInt + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("int xor long : wrong result : ", yIntValue ^ xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + int
-
-	public void testPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus int : wrong result : ", + xIntValue, intValue);
-
-		value = eval(plusOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus int : wrong result : ", + yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// - int
-
-	public void testMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus int : wrong result : ", - xIntValue, intValue);
-
-		value = eval(minusOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus int : wrong result : ", - yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// ~ int
-
-	public void testTwiddleInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle int : wrong result : ", ~ xIntValue, intValue);
-
-		value = eval(twiddleOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle int : wrong result : ", ~ yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java
deleted file mode 100644
index 3b9a98f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LabelTests.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class LabelTests extends Tests {
-
-	public LabelTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-	
-	// if break
-	public void testIfBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("a: if (1 == 1) { if (1 == 1) { break a; } return 1; } return 2;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 2, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while break
-	public void testDoWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:do {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {break a;} yVarInt++;}} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while continue
-	public void testDoWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:do {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {continue a;} yVarInt++;}} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 8, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// while break
-	public void testWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:while (xVarInt < 5) {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {break a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// while continue
-	public void testWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; a:while (xVarInt < 5) {xVarInt++; for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {continue a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 8, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for break
-	public void testForBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("a:for (xVarInt= 0, yVarInt=0; xVarInt < 5;xVarInt++) {for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {break a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 6, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for continue
-	public void testForContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("a:for (xVarInt= 0, yVarInt=0; xVarInt < 5;xVarInt++) {for (xVarLong= 0; xVarLong < 2; xVarLong++){if (xVarInt == 3) {continue a;} yVarInt++;}} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 8, intValue);
-		} finally {
-			end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
deleted file mode 100644
index 5bfb4a0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
+++ /dev/null
@@ -1,493 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class LocalVarAssignmentTests extends Tests {
-
-	public LocalVarAssignmentTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// 
-
-	public void testByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarByte + equalOp +xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(xVarByte + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", yByteValue, byteValue);
-
-		value = eval(yVarByte + equalOp +xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", xByteValue, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", xByteValue, byteValue);
-
-		value = eval(yVarByte + equalOp +yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable assignment : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable assignment : wrong result : ", yByteValue, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", yByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarChar + equalOp +xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", xCharValue, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", xCharValue, charValue);
-
-		value = eval(xVarChar + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", yCharValue, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", yCharValue, charValue);
-
-		value = eval(yVarChar + equalOp +xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", xCharValue, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", xCharValue, charValue);
-
-		value = eval(yVarChar + equalOp +yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable assignment : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable assignment : wrong result : ", yCharValue, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", yCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarShort + equalOp +xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(xVarShort + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", yShortValue, shortValue);
-
-		value = eval(yVarShort + equalOp +xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", xShortValue, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", xShortValue, shortValue);
-
-		value = eval(yVarShort + equalOp +yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable assignment : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable assignment : wrong result : ", yShortValue, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", yShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarLong + equalOp +xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", xLongValue, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", xLongValue, longValue);
-
-		value = eval(xVarLong + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", yLongValue, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", yLongValue, longValue);
-
-		value = eval(yVarLong + equalOp +xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", xLongValue, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", xLongValue, longValue);
-
-		value = eval(yVarLong + equalOp +yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable assignment : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable assignment : wrong result : ", yLongValue, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", yLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarFloat + equalOp +xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(xVarFloat + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", yFloatValue, floatValue, 0);
-
-		value = eval(yVarFloat + equalOp +xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", xFloatValue, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval(yVarFloat + equalOp +yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable assignment : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable assignment : wrong result : ", yFloatValue, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", yFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarDouble + equalOp +xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(xVarDouble + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", yDoubleValue, doubleValue, 0);
-
-		value = eval(yVarDouble + equalOp +xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", xDoubleValue, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval(yVarDouble + equalOp +yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable assignment : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable assignment : wrong result : ", yDoubleValue, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", yDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarBoolean + equalOp +xBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(xVarBoolean + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(xVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", yBooleanValue, booleanValue);
-
-		value = eval(yVarBoolean + equalOp +xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", xBooleanValue, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", xBooleanValue, booleanValue);
-
-		value = eval(yVarBoolean + equalOp +yBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable assignment : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable assignment : wrong result : ", yBooleanValue, booleanValue);
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", yBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
deleted file mode 100644
index 5024f73..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class LocalVarValueTests extends Tests {
-
-	public LocalVarValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// 
-
-	public void testByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", xVarByteValue, byteValue);
-
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", yVarByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", xVarCharValue, charValue);
-
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", yVarCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", xVarShortValue, shortValue);
-
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", yVarShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xVarIntValue, intValue);
-
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yVarIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", xVarLongValue, longValue);
-
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", yVarLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", xVarFloatValue, floatValue, 0);
-
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", yVarFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", xVarDoubleValue, doubleValue, 0);
-
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", yVarDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xVarStringValue, stringValue);
-
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yVarStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", xVarBooleanValue, booleanValue);
-
-		value = eval(yVarBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean local variable value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean local variable value : wrong result : ", yVarBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
deleted file mode 100644
index bcd98de..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3758 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class LongAssignmentOperatorsTests extends Tests {
-
-	public LongAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// long += {byte, char, short, int, long, float, double}
-
-	public void testLongPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarLong + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarLong + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarLong + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarLong + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarLong + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarLong + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarLong + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarLong + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarLong + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarLong + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarLong + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarLong + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarLong + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarLong + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarLong + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarLong + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarLong + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarLong + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarLong + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarLong + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarLong + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarLong + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long -= {byte, char, short, int, long, float, double}
-
-	public void testLongMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarLong + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarLong + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarLong + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarLong + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarLong + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarLong + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarLong + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarLong + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarLong + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarLong + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarLong + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarLong + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarLong + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarLong + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarLong + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarLong + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarLong + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarLong + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarLong + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarLong + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarLong + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarLong + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minusAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minusAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long *= {byte, char, short, int, long, float, double}
-
-	public void testLongMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarLong + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarLong + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarLong + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarLong + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiplyAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiplyAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long /= {byte, char, short, int, long, float, double}
-
-	public void testLongDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarLong + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarLong + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarLong + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarLong + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarLong + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarLong + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarLong + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarLong + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarLong + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarLong + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarLong + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarLong + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarLong + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarLong + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarLong + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarLong + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarLong + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarLong + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarLong + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarLong + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarLong + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarLong + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divideAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divideAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long %= {byte, char, short, int, long, float, double}
-
-	public void testLongRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarLong + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarLong + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarLong + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarLong + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarLong + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarLong + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarLong + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarLong + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarLong + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarLong + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarLong + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarLong + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarLong + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarLong + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarLong + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarLong + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarLong + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarLong + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment float : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarLong + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarLong + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarLong + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarLong + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainderAssignment double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainderAssignment double : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long <<= {byte, char, short, int, long, float, double}
-
-	public void testLongLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarLong + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarLong + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarLong + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long >>= {byte, char, short, int, long, float, double}
-
-	public void testLongRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarLong + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarLong + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarLong + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long >>>= {byte, char, short, int, long, float, double}
-
-	public void testLongUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarLong + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarLong + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarLong + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShiftAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShiftAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long |= {byte, char, short, int, long, float, double}
-
-	public void testLongOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarLong + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarLong + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarLong + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarLong + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarLong + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarLong + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarLong + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarLong + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarLong + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarLong + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarLong + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarLong + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarLong + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarLong + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarLong + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarLong + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long orAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long orAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long &= {byte, char, short, int, long, float, double}
-
-	public void testLongAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarLong + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarLong + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarLong + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarLong + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarLong + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarLong + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarLong + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarLong + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarLong + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarLong + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarLong + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarLong + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarLong + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarLong + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarLong + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarLong + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long andAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long andAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long ^= {byte, char, short, int, long, float, double}
-
-	public void testLongXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarLong + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarLong + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarLong + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment byte : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarLong + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarLong + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarLong + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment char : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarLong + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarLong + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarLong + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment short : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarLong + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarLong + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarLong + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment int : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarLong + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarLong + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarLong + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarLong + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xorAssignment long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xorAssignment long : wrong result : ", tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
deleted file mode 100644
index 0d92905..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
+++ /dev/null
@@ -1,2433 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class LongOperatorsTests extends Tests {
-
-	public LongOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// long + {byte, char, short, int, long, float, double}
-
-	public void testLongPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus byte : wrong result : ", xLongValue + yByteValue, longValue);
-
-		value = eval(yLong + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus byte : wrong result : ", yLongValue + xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus char : wrong result : ", xLongValue + yCharValue, longValue);
-
-		value = eval(yLong + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus char : wrong result : ", yLongValue + xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus short : wrong result : ", xLongValue + yShortValue, longValue);
-
-		value = eval(yLong + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus short : wrong result : ", yLongValue + xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus int : wrong result : ", xLongValue + yIntValue, longValue);
-
-		value = eval(yLong + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus int : wrong result : ", yLongValue + xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus long : wrong result : ", xLongValue + yLongValue, longValue);
-
-		value = eval(yLong + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long plus long : wrong result : ", yLongValue + xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long plus float : wrong result : ", xLongValue + yFloatValue, floatValue, 0);
-
-		value = eval(yLong + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long plus float : wrong result : ", yLongValue + xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long plus double : wrong result : ", xLongValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long plus double : wrong result : ", yLongValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("long plus java.lang.String : wrong result : ", xLongValue + yStringValue, stringValue);
-
-		value = eval(yLong + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("long plus java.lang.String : wrong result : ", yLongValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long - {byte, char, short, int, long, float, double}
-
-	public void testLongMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus byte : wrong result : ", xLongValue - yByteValue, longValue);
-
-		value = eval(yLong + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus byte : wrong result : ", yLongValue - xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus char : wrong result : ", xLongValue - yCharValue, longValue);
-
-		value = eval(yLong + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus char : wrong result : ", yLongValue - xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus short : wrong result : ", xLongValue - yShortValue, longValue);
-
-		value = eval(yLong + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus short : wrong result : ", yLongValue - xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus int : wrong result : ", xLongValue - yIntValue, longValue);
-
-		value = eval(yLong + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus int : wrong result : ", yLongValue - xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus long : wrong result : ", xLongValue - yLongValue, longValue);
-
-		value = eval(yLong + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long minus long : wrong result : ", yLongValue - xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long minus float : wrong result : ", xLongValue - yFloatValue, floatValue, 0);
-
-		value = eval(yLong + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long minus float : wrong result : ", yLongValue - xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long minus double : wrong result : ", xLongValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long minus double : wrong result : ", yLongValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// long * {byte, char, short, int, long, float, double}
-
-	public void testLongMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply byte : wrong result : ", xLongValue * yByteValue, longValue);
-
-		value = eval(yLong + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply byte : wrong result : ", yLongValue * xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply char : wrong result : ", xLongValue * yCharValue, longValue);
-
-		value = eval(yLong + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply char : wrong result : ", yLongValue * xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply short : wrong result : ", xLongValue * yShortValue, longValue);
-
-		value = eval(yLong + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply short : wrong result : ", yLongValue * xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply int : wrong result : ", xLongValue * yIntValue, longValue);
-
-		value = eval(yLong + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply int : wrong result : ", yLongValue * xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply long : wrong result : ", xLongValue * yLongValue, longValue);
-
-		value = eval(yLong + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long multiply long : wrong result : ", yLongValue * xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long multiply float : wrong result : ", xLongValue * yFloatValue, floatValue, 0);
-
-		value = eval(yLong + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long multiply float : wrong result : ", yLongValue * xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long multiply double : wrong result : ", xLongValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long multiply double : wrong result : ", yLongValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// long / {byte, char, short, int, long, float, double}
-
-	public void testLongDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide byte : wrong result : ", xLongValue / yByteValue, longValue);
-
-		value = eval(yLong + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide byte : wrong result : ", yLongValue / xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide char : wrong result : ", xLongValue / yCharValue, longValue);
-
-		value = eval(yLong + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide char : wrong result : ", yLongValue / xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide short : wrong result : ", xLongValue / yShortValue, longValue);
-
-		value = eval(yLong + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide short : wrong result : ", yLongValue / xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide int : wrong result : ", xLongValue / yIntValue, longValue);
-
-		value = eval(yLong + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide int : wrong result : ", yLongValue / xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide long : wrong result : ", xLongValue / yLongValue, longValue);
-
-		value = eval(yLong + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long divide long : wrong result : ", yLongValue / xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long divide float : wrong result : ", xLongValue / yFloatValue, floatValue, 0);
-
-		value = eval(yLong + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long divide float : wrong result : ", yLongValue / xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long divide double : wrong result : ", xLongValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long divide double : wrong result : ", yLongValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// long % {byte, char, short, int, long, float, double}
-
-	public void testLongRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder byte : wrong result : ", xLongValue % yByteValue, longValue);
-
-		value = eval(yLong + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder byte : wrong result : ", yLongValue % xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder char : wrong result : ", xLongValue % yCharValue, longValue);
-
-		value = eval(yLong + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder char : wrong result : ", yLongValue % xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder short : wrong result : ", xLongValue % yShortValue, longValue);
-
-		value = eval(yLong + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder short : wrong result : ", yLongValue % xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder int : wrong result : ", xLongValue % yIntValue, longValue);
-
-		value = eval(yLong + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder int : wrong result : ", yLongValue % xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder long : wrong result : ", xLongValue % yLongValue, longValue);
-
-		value = eval(yLong + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long remainder long : wrong result : ", yLongValue % xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long remainder float : wrong result : ", xLongValue % yFloatValue, floatValue, 0);
-
-		value = eval(yLong + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("long remainder float : wrong result : ", yLongValue % xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long remainder double : wrong result : ", xLongValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yLong + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("long remainder double : wrong result : ", yLongValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// long > {byte, char, short, int, long, float, double}
-
-	public void testLongGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater byte : wrong result : ", xLongValue > yByteValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater byte : wrong result : ", yLongValue > xByteValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater byte : wrong result : ", xLongValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater char : wrong result : ", xLongValue > yCharValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater char : wrong result : ", yLongValue > xCharValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater char : wrong result : ", xLongValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater short : wrong result : ", xLongValue > yShortValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater short : wrong result : ", yLongValue > xShortValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater short : wrong result : ", xLongValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater int : wrong result : ", xLongValue > yIntValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater int : wrong result : ", yLongValue > xIntValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater int : wrong result : ", xLongValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater long : wrong result : ", xLongValue > yLongValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater long : wrong result : ", yLongValue > xLongValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater long : wrong result : ", xLongValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater float : wrong result : ", xLongValue > yFloatValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater float : wrong result : ", yLongValue > xFloatValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater float : wrong result : ", xLongValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater double : wrong result : ", xLongValue > yDoubleValue, booleanValue);
-
-		value = eval(yLong + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater double : wrong result : ", yLongValue > xDoubleValue, booleanValue);
-
-		value = eval(xLong + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greater double : wrong result : ", xLongValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long >= {byte, char, short, int, long, float, double}
-
-	public void testLongGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual byte : wrong result : ", xLongValue >= yByteValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual byte : wrong result : ", yLongValue >= xByteValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual byte : wrong result : ", xLongValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual char : wrong result : ", xLongValue >= yCharValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual char : wrong result : ", yLongValue >= xCharValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual char : wrong result : ", xLongValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual short : wrong result : ", xLongValue >= yShortValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual short : wrong result : ", yLongValue >= xShortValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual short : wrong result : ", xLongValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual int : wrong result : ", xLongValue >= yIntValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual int : wrong result : ", yLongValue >= xIntValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual int : wrong result : ", xLongValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual long : wrong result : ", xLongValue >= yLongValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual long : wrong result : ", yLongValue >= xLongValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual long : wrong result : ", xLongValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual float : wrong result : ", xLongValue >= yFloatValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual float : wrong result : ", yLongValue >= xFloatValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual float : wrong result : ", xLongValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual double : wrong result : ", xLongValue >= yDoubleValue, booleanValue);
-
-		value = eval(yLong + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual double : wrong result : ", yLongValue >= xDoubleValue, booleanValue);
-
-		value = eval(xLong + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long greaterEqual double : wrong result : ", xLongValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long < {byte, char, short, int, long, float, double}
-
-	public void testLongLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less byte : wrong result : ", xLongValue < yByteValue, booleanValue);
-
-		value = eval(yLong + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less byte : wrong result : ", yLongValue < xByteValue, booleanValue);
-
-		value = eval(xLong + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less byte : wrong result : ", xLongValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less char : wrong result : ", xLongValue < yCharValue, booleanValue);
-
-		value = eval(yLong + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less char : wrong result : ", yLongValue < xCharValue, booleanValue);
-
-		value = eval(xLong + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less char : wrong result : ", xLongValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less short : wrong result : ", xLongValue < yShortValue, booleanValue);
-
-		value = eval(yLong + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less short : wrong result : ", yLongValue < xShortValue, booleanValue);
-
-		value = eval(xLong + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less short : wrong result : ", xLongValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less int : wrong result : ", xLongValue < yIntValue, booleanValue);
-
-		value = eval(yLong + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less int : wrong result : ", yLongValue < xIntValue, booleanValue);
-
-		value = eval(xLong + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less int : wrong result : ", xLongValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less long : wrong result : ", xLongValue < yLongValue, booleanValue);
-
-		value = eval(yLong + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less long : wrong result : ", yLongValue < xLongValue, booleanValue);
-
-		value = eval(xLong + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less long : wrong result : ", xLongValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less float : wrong result : ", xLongValue < yFloatValue, booleanValue);
-
-		value = eval(yLong + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less float : wrong result : ", yLongValue < xFloatValue, booleanValue);
-
-		value = eval(xLong + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less float : wrong result : ", xLongValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less double : wrong result : ", xLongValue < yDoubleValue, booleanValue);
-
-		value = eval(yLong + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less double : wrong result : ", yLongValue < xDoubleValue, booleanValue);
-
-		value = eval(xLong + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long less double : wrong result : ", xLongValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long <= {byte, char, short, int, long, float, double}
-
-	public void testLongLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual byte : wrong result : ", xLongValue <= yByteValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual byte : wrong result : ", yLongValue <= xByteValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual byte : wrong result : ", xLongValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual char : wrong result : ", xLongValue <= yCharValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual char : wrong result : ", yLongValue <= xCharValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual char : wrong result : ", xLongValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual short : wrong result : ", xLongValue <= yShortValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual short : wrong result : ", yLongValue <= xShortValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual short : wrong result : ", xLongValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual int : wrong result : ", xLongValue <= yIntValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual int : wrong result : ", yLongValue <= xIntValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual int : wrong result : ", xLongValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual long : wrong result : ", xLongValue <= yLongValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual long : wrong result : ", yLongValue <= xLongValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual long : wrong result : ", xLongValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual float : wrong result : ", xLongValue <= yFloatValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual float : wrong result : ", yLongValue <= xFloatValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual float : wrong result : ", xLongValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual double : wrong result : ", xLongValue <= yDoubleValue, booleanValue);
-
-		value = eval(yLong + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual double : wrong result : ", yLongValue <= xDoubleValue, booleanValue);
-
-		value = eval(xLong + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long lessEqual double : wrong result : ", xLongValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long == {byte, char, short, int, long, float, double}
-
-	public void testLongEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual byte : wrong result : ", xLongValue == yByteValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual byte : wrong result : ", yLongValue == xByteValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual byte : wrong result : ", xLongValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual char : wrong result : ", xLongValue == yCharValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual char : wrong result : ", yLongValue == xCharValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual char : wrong result : ", xLongValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual short : wrong result : ", xLongValue == yShortValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual short : wrong result : ", yLongValue == xShortValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual short : wrong result : ", xLongValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual int : wrong result : ", xLongValue == yIntValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual int : wrong result : ", yLongValue == xIntValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual int : wrong result : ", xLongValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual long : wrong result : ", xLongValue == yLongValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual long : wrong result : ", yLongValue == xLongValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual long : wrong result : ", xLongValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual float : wrong result : ", xLongValue == yFloatValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual float : wrong result : ", yLongValue == xFloatValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual float : wrong result : ", xLongValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual double : wrong result : ", xLongValue == yDoubleValue, booleanValue);
-
-		value = eval(yLong + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual double : wrong result : ", yLongValue == xDoubleValue, booleanValue);
-
-		value = eval(xLong + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long equalEqual double : wrong result : ", xLongValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long != {byte, char, short, int, long, float, double}
-
-	public void testLongNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual byte : wrong result : ", xLongValue != yByteValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual byte : wrong result : ", yLongValue != xByteValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual byte : wrong result : ", xLongValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual char : wrong result : ", xLongValue != yCharValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual char : wrong result : ", yLongValue != xCharValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual char : wrong result : ", xLongValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual short : wrong result : ", xLongValue != yShortValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual short : wrong result : ", yLongValue != xShortValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual short : wrong result : ", xLongValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual int : wrong result : ", xLongValue != yIntValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual int : wrong result : ", yLongValue != xIntValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual int : wrong result : ", xLongValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual long : wrong result : ", xLongValue != yLongValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual long : wrong result : ", yLongValue != xLongValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual long : wrong result : ", xLongValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual float : wrong result : ", xLongValue != yFloatValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual float : wrong result : ", yLongValue != xFloatValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual float : wrong result : ", xLongValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual double : wrong result : ", xLongValue != yDoubleValue, booleanValue);
-
-		value = eval(yLong + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual double : wrong result : ", yLongValue != xDoubleValue, booleanValue);
-
-		value = eval(xLong + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("long notEqual double : wrong result : ", xLongValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long << {byte, char, short, int, long}
-
-	public void testLongLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift byte : wrong result : ", xLongValue << yByteValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift byte : wrong result : ", yLongValue << xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift char : wrong result : ", xLongValue << yCharValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift char : wrong result : ", yLongValue << xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift short : wrong result : ", xLongValue << yShortValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift short : wrong result : ", yLongValue << xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift int : wrong result : ", xLongValue << yIntValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift int : wrong result : ", yLongValue << xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift long : wrong result : ", xLongValue << yLongValue, longValue);
-
-		value = eval(yLong + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long leftShift long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long leftShift long : wrong result : ", yLongValue << xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long >> {byte, char, short, int, long}
-
-	public void testLongRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift byte : wrong result : ", xLongValue >> yByteValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift byte : wrong result : ", yLongValue >> xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift char : wrong result : ", xLongValue >> yCharValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift char : wrong result : ", yLongValue >> xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift short : wrong result : ", xLongValue >> yShortValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift short : wrong result : ", yLongValue >> xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift int : wrong result : ", xLongValue >> yIntValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift int : wrong result : ", yLongValue >> xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift long : wrong result : ", xLongValue >> yLongValue, longValue);
-
-		value = eval(yLong + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long rightShift long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long rightShift long : wrong result : ", yLongValue >> xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long >>> {byte, char, short, int, long}
-
-	public void testLongUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift byte : wrong result : ", xLongValue >>> yByteValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift byte : wrong result : ", yLongValue >>> xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift char : wrong result : ", xLongValue >>> yCharValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift char : wrong result : ", yLongValue >>> xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift short : wrong result : ", xLongValue >>> yShortValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift short : wrong result : ", yLongValue >>> xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift int : wrong result : ", xLongValue >>> yIntValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift int : wrong result : ", yLongValue >>> xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift long : wrong result : ", xLongValue >>> yLongValue, longValue);
-
-		value = eval(yLong + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long unsignedRightShift long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long unsignedRightShift long : wrong result : ", yLongValue >>> xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long | {byte, char, short, int, long}
-
-	public void testLongOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or byte : wrong result : ", xLongValue | yByteValue, longValue);
-
-		value = eval(yLong + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or byte : wrong result : ", yLongValue | xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or char : wrong result : ", xLongValue | yCharValue, longValue);
-
-		value = eval(yLong + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or char : wrong result : ", yLongValue | xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or short : wrong result : ", xLongValue | yShortValue, longValue);
-
-		value = eval(yLong + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or short : wrong result : ", yLongValue | xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or int : wrong result : ", xLongValue | yIntValue, longValue);
-
-		value = eval(yLong + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or int : wrong result : ", yLongValue | xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or long : wrong result : ", xLongValue | yLongValue, longValue);
-
-		value = eval(yLong + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long or long : wrong result : ", yLongValue | xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long & {byte, char, short, int, long}
-
-	public void testLongAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and byte : wrong result : ", xLongValue & yByteValue, longValue);
-
-		value = eval(yLong + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and byte : wrong result : ", yLongValue & xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and char : wrong result : ", xLongValue & yCharValue, longValue);
-
-		value = eval(yLong + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and char : wrong result : ", yLongValue & xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and short : wrong result : ", xLongValue & yShortValue, longValue);
-
-		value = eval(yLong + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and short : wrong result : ", yLongValue & xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and int : wrong result : ", xLongValue & yIntValue, longValue);
-
-		value = eval(yLong + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and int : wrong result : ", yLongValue & xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and long : wrong result : ", xLongValue & yLongValue, longValue);
-
-		value = eval(yLong + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long and long : wrong result : ", yLongValue & xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// long ^ {byte, char, short, int, long}
-
-	public void testLongXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor byte : wrong result : ", xLongValue ^ yByteValue, longValue);
-
-		value = eval(yLong + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor byte : wrong result : ", yLongValue ^ xByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor char : wrong result : ", xLongValue ^ yCharValue, longValue);
-
-		value = eval(yLong + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor char : wrong result : ", yLongValue ^ xCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor short : wrong result : ", xLongValue ^ yShortValue, longValue);
-
-		value = eval(yLong + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor short : wrong result : ", yLongValue ^ xShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor int : wrong result : ", xLongValue ^ yIntValue, longValue);
-
-		value = eval(yLong + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor int : wrong result : ", yLongValue ^ xIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xLong + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor long : wrong result : ", xLongValue ^ yLongValue, longValue);
-
-		value = eval(yLong + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long xor long : wrong result : ", yLongValue ^ xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + long
-
-	public void testPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("plus long : wrong result : ", + xLongValue, longValue);
-
-		value = eval(plusOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("plus long : wrong result : ", + yLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// - long
-
-	public void testMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("minus long : wrong result : ", - xLongValue, longValue);
-
-		value = eval(minusOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("minus long : wrong result : ", - yLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// ~ long
-
-	public void testTwiddleLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("twiddle long : wrong result : ", ~ xLongValue, longValue);
-
-		value = eval(twiddleOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("twiddle long : wrong result : ", ~ yLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java
deleted file mode 100644
index 47484b2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LoopTests.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class LoopTests extends Tests {
-
-	public LoopTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// while
-	public void testWhile() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; while (xVarInt < 5) {xVarInt++; yVarInt++;} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 5, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while
-	public void testDoWhile() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; do {xVarInt++; yVarInt++;} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 5, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for
-	public void testFor() throws Throwable {
-		try {
-			init();
-			IValue value = eval("for (xVarInt= 0, yVarInt=0; xVarInt < 5; xVarInt++) {yVarInt++;}  return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 5, intValue);
-		} finally {
-			end();
-		}
-	}
-	
-	// while break
-	public void testWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; while (xVarInt < 5) {xVarInt++; if (xVarInt == 3) {break;} yVarInt++;} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 2, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while break
-	public void testDoWhileBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; do {xVarInt++; if (xVarInt == 3) {break;} yVarInt++;} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 2, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for break
-	public void testForBreak() throws Throwable {
-		try {
-			init();
-			IValue value = eval("for (xVarInt= 0, yVarInt=0; xVarInt < 5; xVarInt++) {if (xVarInt == 3) {break;} yVarInt++;}  return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 3, intValue);
-		} finally {
-			end();
-		}
-	}
-	
-	// while continue
-	public void testWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; while (xVarInt < 5) {xVarInt++; if (xVarInt == 3) {continue;} yVarInt++;} return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// do while continue
-	public void testDoWhileContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("xVarInt= 0; yVarInt=0; do {xVarInt++; if (xVarInt == 3) {continue;} yVarInt++;} while (xVarInt < 5); return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// for continue
-	public void testForContinue() throws Throwable {
-		try {
-			init();
-			IValue value = eval("for (xVarInt= 0, yVarInt=0; xVarInt < 5; xVarInt++) {if (xVarInt == 3) {continue;} yVarInt++;}  return yVarInt;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 4, intValue);
-		} finally {
-			end();
-		}
-	}
-	}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_120.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_120.java
deleted file mode 100644
index 3c44d49..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_120.java
+++ /dev/null
@@ -1,833 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_120 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_120(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 120, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_A_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_A_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_145.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_145.java
deleted file mode 100644
index 8cdf0f5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_145.java
+++ /dev/null
@@ -1,833 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_145 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_145(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 145, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_A_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_A_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_155.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_155.java
deleted file mode 100644
index 53dadfa..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_155.java
+++ /dev/null
@@ -1,1004 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_155 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_155(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 155, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(THIS + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(THIS + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_179.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_179.java
deleted file mode 100644
index cd3efca..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_179.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_179 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_179(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 179, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
deleted file mode 100644
index abba283..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_203 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_203(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 203, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_214.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_214.java
deleted file mode 100644
index 5d08005..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_214.java
+++ /dev/null
@@ -1,890 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_214 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_214(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 214, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AA + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AA + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AA + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_252.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_252.java
deleted file mode 100644
index 0f52c4f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_252.java
+++ /dev/null
@@ -1,1137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_252 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_252(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 252, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_279.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_279.java
deleted file mode 100644
index ed4df56..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_279.java
+++ /dev/null
@@ -1,909 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_279 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_279(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 279, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
deleted file mode 100644
index df00470..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
+++ /dev/null
@@ -1,909 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_304 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_304(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 304, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_B_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_315.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_315.java
deleted file mode 100644
index c5cd5d9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_315.java
+++ /dev/null
@@ -1,1099 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_315 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_315(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 315, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_1, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_1, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(THIS + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(THIS + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_BB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_BB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_BB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_354.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_354.java
deleted file mode 100644
index 8c3cc32..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_354.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_354 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_354(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 354, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_381.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_381.java
deleted file mode 100644
index c440ff0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_381.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_381 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_381(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 381, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
deleted file mode 100644
index 3e3f6a2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_406 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_406(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 406, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_417.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_417.java
deleted file mode 100644
index 89ebabf..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_417.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_417 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_417(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 417, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_1, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_1, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_455.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_455.java
deleted file mode 100644
index 94de64e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_455.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_455 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_455(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 455, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_481.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_481.java
deleted file mode 100644
index 1044c2e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_481.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_481 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_481(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 481, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
deleted file mode 100644
index ef0b70d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_506 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_506(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 506, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_517.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_517.java
deleted file mode 100644
index d26d682..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_517.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_517 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_517(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 517, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_1, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_1, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T_this + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(T_T_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T_this + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_529.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_529.java
deleted file mode 100644
index 53ed194..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_529.java
+++ /dev/null
@@ -1,1004 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_529 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_529(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 529, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(THIS + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(THIS + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_0, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(I_B + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(I_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(I_B + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(I_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_BB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_BB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_BB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_566.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_566.java
deleted file mode 100644
index a721dba..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_566.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_566 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_566(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 566, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_592.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_592.java
deleted file mode 100644
index ec2e2fc..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_592.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_592 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_592(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 592, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_616.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_616.java
deleted file mode 100644
index e292b5d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_616.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_616 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_616(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 616, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_626.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_626.java
deleted file mode 100644
index 01e82b2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_626.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_626 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_626(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 626, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_65.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_65.java
deleted file mode 100644
index d4979ad..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_65.java
+++ /dev/null
@@ -1,966 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_65 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_65(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 65, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_664.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_664.java
deleted file mode 100644
index 8d0f789..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_664.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_664 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_664(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 664, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_69.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_69.java
deleted file mode 100644
index 453178f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_69.java
+++ /dev/null
@@ -1,795 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_69 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_69(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 69, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_690.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_690.java
deleted file mode 100644
index 471fa99..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_690.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_690 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_690(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 690, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_714.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_714.java
deleted file mode 100644
index 33447ab..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_714.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_714 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_714(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 714, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_724.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_724.java
deleted file mode 100644
index ff0cf21..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_724.java
+++ /dev/null
@@ -1,624 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_724 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_724(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 724, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_1, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_1, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_739.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_739.java
deleted file mode 100644
index 7d8ee2a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_739.java
+++ /dev/null
@@ -1,947 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_739 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_739(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 739, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(I_A + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(I_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(I_A + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(I_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AA + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AA + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AA + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(I_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(I_AB + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_94.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_94.java
deleted file mode 100644
index b46e9cb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_94.java
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class NestedTypeFieldValue_94 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_94(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 94, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("b : wrong result : ", bIntValue_2, intValue);
-
-		value = eval(bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("b : wrong result : ", bStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("g : wrong result : ", gIntValue_2, intValue);
-
-		value = eval(gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("g : wrong result : ", gStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(THIS + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(THIS + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(THIS + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(T_T + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_A_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_B_BB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_B_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AA + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(T_AB + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_A_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_g() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + gInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_g : wrong result : ", gIntValue_1, intValue);
-
-		value = eval(T_A_this + gString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_g : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_g : wrong result : ", gStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_A_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
deleted file mode 100644
index bd50c04..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
+++ /dev/null
@@ -1,976 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class NumericTypesCastTests extends Tests {
-
-	public NumericTypesCastTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// (byte) {byte, char, short, int, long, float, double}
-
-	public void testByteCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) byte : wrong result : ", xByteValue, byteValue);
-
-		value = eval("(byte)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) byte : wrong result : ", yByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) char : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) char : wrong result : ", (byte) xCharValue, byteValue);
-
-		value = eval("(byte)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) char : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) char : wrong result : ", (byte) yCharValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) short : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) short : wrong result : ", ( byte) xShortValue, byteValue);
-
-		value = eval("(byte)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) short : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) short : wrong result : ", ( byte) yShortValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) int : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) int : wrong result : ", ( byte) xIntValue, byteValue);
-
-		value = eval("(byte)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) int : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) int : wrong result : ", ( byte) yIntValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) long : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) long : wrong result : ", ( byte) xLongValue, byteValue);
-
-		value = eval("(byte)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) long : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) long : wrong result : ", ( byte) yLongValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) float : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) float : wrong result : ", ( byte) xFloatValue, byteValue);
-
-		value = eval("(byte)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) float : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) float : wrong result : ", ( byte) yFloatValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testByteCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(byte)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(byte) double : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) double : wrong result : ", ( byte) xDoubleValue, byteValue);
-
-		value = eval("(byte)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(byte) double : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("(byte) double : wrong result : ", ( byte) yDoubleValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// (char) {byte, char, short, int, long, float, double}
-
-	public void testCharCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) byte : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) byte : wrong result : ", ( char) xByteValue, charValue);
-
-		value = eval("(char)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) byte : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) byte : wrong result : ", ( char) yByteValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) char : wrong result : ", xCharValue, charValue);
-
-		value = eval("(char)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) char : wrong result : ", yCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) short : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) short : wrong result : ", ( char) xShortValue, charValue);
-
-		value = eval("(char)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) short : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) short : wrong result : ", ( char) yShortValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) int : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) int : wrong result : ", ( char) xIntValue, charValue);
-
-		value = eval("(char)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) int : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) int : wrong result : ", ( char) yIntValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) long : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) long : wrong result : ", ( char) xLongValue, charValue);
-
-		value = eval("(char)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) long : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) long : wrong result : ", ( char) yLongValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) float : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) float : wrong result : ", ( char) xFloatValue, charValue);
-
-		value = eval("(char)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) float : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) float : wrong result : ", ( char) yFloatValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(char)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(char) double : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) double : wrong result : ", ( char) xDoubleValue, charValue);
-
-		value = eval("(char)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(char) double : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("(char) double : wrong result : ", ( char) yDoubleValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// (short) {byte, char, short, int, long, float, double}
-
-	public void testShortCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) byte : wrong result : ", xByteValue, shortValue);
-
-		value = eval("(short)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) byte : wrong result : ", yByteValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) char : wrong result : ", (short) xCharValue, shortValue);
-
-		value = eval("(short)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) char : wrong result : ", (short) yCharValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) short : wrong result : ", xShortValue, shortValue);
-
-		value = eval("(short)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) short : wrong result : ", yShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) int : wrong result : ", ( short) xIntValue, shortValue);
-
-		value = eval("(short)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) int : wrong result : ", ( short) yIntValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) long : wrong result : ", ( short) xLongValue, shortValue);
-
-		value = eval("(short)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) long : wrong result : ", ( short) yLongValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) float : wrong result : ", ( short) xFloatValue, shortValue);
-
-		value = eval("(short)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) float : wrong result : ", ( short) yFloatValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(short)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(short) double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) double : wrong result : ", ( short) xDoubleValue, shortValue);
-
-		value = eval("(short)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(short) double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("(short) double : wrong result : ", ( short) yDoubleValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// (int) {byte, char, short, int, long, float, double}
-
-	public void testIntCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) byte : wrong result : ", xByteValue, intValue);
-
-		value = eval("(int)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) byte : wrong result : ", yByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) char : wrong result : ", xCharValue, intValue);
-
-		value = eval("(int)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) char : wrong result : ", yCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) short : wrong result : ", xShortValue, intValue);
-
-		value = eval("(int)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) short : wrong result : ", yShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) int : wrong result : ", xIntValue, intValue);
-
-		value = eval("(int)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) int : wrong result : ", yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) long : wrong result : ", ( int) xLongValue, intValue);
-
-		value = eval("(int)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) long : wrong result : ", ( int) yLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) float : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) float : wrong result : ", ( int) xFloatValue, intValue);
-
-		value = eval("(int)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) float : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) float : wrong result : ", ( int) yFloatValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(int)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(int) double : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) double : wrong result : ", ( int) xDoubleValue, intValue);
-
-		value = eval("(int)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(int) double : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("(int) double : wrong result : ", ( int) yDoubleValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// (long) {byte, char, short, int, long, float, double}
-
-	public void testLongCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) byte : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) byte : wrong result : ", xByteValue, longValue);
-
-		value = eval("(long)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) byte : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) byte : wrong result : ", yByteValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) char : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) char : wrong result : ", xCharValue, longValue);
-
-		value = eval("(long)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) char : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) char : wrong result : ", yCharValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) short : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) short : wrong result : ", xShortValue, longValue);
-
-		value = eval("(long)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) short : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) short : wrong result : ", yShortValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) int : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) int : wrong result : ", xIntValue, longValue);
-
-		value = eval("(long)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) int : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) int : wrong result : ", yIntValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) long : wrong result : ", xLongValue, longValue);
-
-		value = eval("(long)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) long : wrong result : ", yLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) float : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) float : wrong result : ", ( long) xFloatValue, longValue);
-
-		value = eval("(long)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) float : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) float : wrong result : ", ( long) yFloatValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(long)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(long) double : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) double : wrong result : ", ( long) xDoubleValue, longValue);
-
-		value = eval("(long)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(long) double : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("(long) double : wrong result : ", ( long) yDoubleValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// (float) {byte, char, short, int, long, float, double}
-
-	public void testFloatCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) byte : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) byte : wrong result : ", xByteValue, floatValue, 0);
-
-		value = eval("(float)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) byte : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) byte : wrong result : ", yByteValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) char : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) char : wrong result : ", xCharValue, floatValue, 0);
-
-		value = eval("(float)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) char : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) char : wrong result : ", yCharValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) short : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) short : wrong result : ", xShortValue, floatValue, 0);
-
-		value = eval("(float)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) short : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) short : wrong result : ", yShortValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) int : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) int : wrong result : ", xIntValue, floatValue, 0);
-
-		value = eval("(float)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) int : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) int : wrong result : ", yIntValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) long : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) long : wrong result : ", xLongValue, floatValue, 0);
-
-		value = eval("(float)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) long : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) long : wrong result : ", yLongValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) float : wrong result : ", xFloatValue, floatValue, 0);
-
-		value = eval("(float)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) float : wrong result : ", yFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(float)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(float) double : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) double : wrong result : ", ( float) xDoubleValue, floatValue, 0);
-
-		value = eval("(float)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(float) double : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("(float) double : wrong result : ", ( float) yDoubleValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// (double) {byte, char, short, int, long, float, double}
-
-	public void testDoubleCastByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) byte : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) byte : wrong result : ", xByteValue, doubleValue, 0);
-
-		value = eval("(double)" + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) byte : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) byte : wrong result : ", yByteValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleCastChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) char : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) char : wrong result : ", xCharValue, doubleValue, 0);
-
-		value = eval("(double)" + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) char : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) char : wrong result : ", yCharValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleCastShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) short : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) short : wrong result : ", xShortValue, doubleValue, 0);
-
-		value = eval("(double)" + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) short : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) short : wrong result : ", yShortValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleCastInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) int : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) int : wrong result : ", xIntValue, doubleValue, 0);
-
-		value = eval("(double)" + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) int : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) int : wrong result : ", yIntValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleCastLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) long : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) long : wrong result : ", xLongValue, doubleValue, 0);
-
-		value = eval("(double)" + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) long : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) long : wrong result : ", yLongValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleCastFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) float : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) float : wrong result : ", xFloatValue, doubleValue, 0);
-
-		value = eval("(double)" + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) float : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) float : wrong result : ", yFloatValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleCastDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval("(double)" + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("(double) double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) double : wrong result : ", xDoubleValue, doubleValue, 0);
-
-		value = eval("(double)" + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("(double) double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("(double) double : wrong result : ", yDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
deleted file mode 100644
index 4c5e819..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class QualifiedFieldValueTests extends Tests {
-
-	public QualifiedFieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",73,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xFieldByteValue, byteValue);
-
-		value = eval("foo." + yFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yFieldByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xFieldCharValue, charValue);
-
-		value = eval("foo." + yFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yFieldCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xFieldShortValue, shortValue);
-
-		value = eval("foo." + yFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yFieldShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xFieldIntValue, intValue);
-
-		value = eval("foo." + yFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yFieldIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xFieldLongValue, longValue);
-
-		value = eval("foo." + yFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yFieldLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xFieldFloatValue, floatValue, 0);
-
-		value = eval("foo." + yFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yFieldFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xFieldDoubleValue, doubleValue, 0);
-
-		value = eval("foo." + yFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yFieldDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xFieldStringValue, stringValue);
-
-		value = eval("foo." + yFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yFieldStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xFieldBooleanValue, booleanValue);
-
-		value = eval("foo." + yFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yFieldBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
deleted file mode 100644
index c7a1d24..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class QualifiedStaticFieldValueTests extends Tests {
-
-	public QualifiedStaticFieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",73,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("foo." + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("foo." + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("foo." + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("foo." + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("foo." + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("foo." + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("foo." + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("foo." + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("foo." + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("foo." + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
deleted file mode 100644
index 8931f4c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class QualifiedStaticFieldValueTests2 extends Tests {
-
-	public QualifiedStaticFieldValueTests2(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",73,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("EvalTypeTests." + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("EvalTypeTests." + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("EvalTypeTests." + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("EvalTypeTests." + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
deleted file mode 100644
index 161e8c5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3758 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class ShortAssignmentOperatorsTests extends Tests {
-
-	public ShortAssignmentOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// short += {byte, char, short, int, long, float, double}
-
-	public void testShortPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarShort + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarShort + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarShort + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarShort + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarShort + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarShort + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarShort + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarShort + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarShort + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarShort + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarShort + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarShort + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarShort + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarShort + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarShort + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarShort + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarShort + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarShort + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarShort + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarShort + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarShort + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarShort + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short plusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short -= {byte, char, short, int, long, float, double}
-
-	public void testShortMinusAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xByteValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yByteValue;
-		value = eval(xVarShort + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xByteValue;
-		value = eval(yVarShort + minusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yByteValue;
-		value = eval(yVarShort + minusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xCharValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yCharValue;
-		value = eval(xVarShort + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xCharValue;
-		value = eval(yVarShort + minusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yCharValue;
-		value = eval(yVarShort + minusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xShortValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yShortValue;
-		value = eval(xVarShort + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xShortValue;
-		value = eval(yVarShort + minusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yShortValue;
-		value = eval(yVarShort + minusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xIntValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yIntValue;
-		value = eval(xVarShort + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xIntValue;
-		value = eval(yVarShort + minusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yIntValue;
-		value = eval(yVarShort + minusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xLongValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yLongValue;
-		value = eval(xVarShort + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xLongValue;
-		value = eval(yVarShort + minusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yLongValue;
-		value = eval(yVarShort + minusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xFloatValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yFloatValue;
-		value = eval(xVarShort + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xFloatValue;
-		value = eval(yVarShort + minusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yFloatValue;
-		value = eval(yVarShort + minusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar -= xDoubleValue;
-		IValue value = eval(xVarShort + minusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar -= yDoubleValue;
-		value = eval(xVarShort + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar -= xDoubleValue;
-		value = eval(yVarShort + minusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar -= yDoubleValue;
-		value = eval(yVarShort + minusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minusAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short minusAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short *= {byte, char, short, int, long, float, double}
-
-	public void testShortMultiplyAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xByteValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yByteValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xByteValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yByteValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xCharValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yCharValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xCharValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yCharValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xShortValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yShortValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xShortValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yShortValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xIntValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yIntValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xIntValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yIntValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xLongValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yLongValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xLongValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yLongValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xFloatValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yFloatValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xFloatValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yFloatValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar *= xDoubleValue;
-		IValue value = eval(xVarShort + multiplyAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar *= yDoubleValue;
-		value = eval(xVarShort + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar *= xDoubleValue;
-		value = eval(yVarShort + multiplyAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar *= yDoubleValue;
-		value = eval(yVarShort + multiplyAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiplyAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short multiplyAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short /= {byte, char, short, int, long, float, double}
-
-	public void testShortDivideAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xByteValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yByteValue;
-		value = eval(xVarShort + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xByteValue;
-		value = eval(yVarShort + divideAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yByteValue;
-		value = eval(yVarShort + divideAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xCharValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yCharValue;
-		value = eval(xVarShort + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xCharValue;
-		value = eval(yVarShort + divideAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yCharValue;
-		value = eval(yVarShort + divideAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xShortValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yShortValue;
-		value = eval(xVarShort + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xShortValue;
-		value = eval(yVarShort + divideAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yShortValue;
-		value = eval(yVarShort + divideAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xIntValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yIntValue;
-		value = eval(xVarShort + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xIntValue;
-		value = eval(yVarShort + divideAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yIntValue;
-		value = eval(yVarShort + divideAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xLongValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yLongValue;
-		value = eval(xVarShort + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xLongValue;
-		value = eval(yVarShort + divideAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yLongValue;
-		value = eval(yVarShort + divideAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xFloatValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yFloatValue;
-		value = eval(xVarShort + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xFloatValue;
-		value = eval(yVarShort + divideAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yFloatValue;
-		value = eval(yVarShort + divideAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar /= xDoubleValue;
-		IValue value = eval(xVarShort + divideAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar /= yDoubleValue;
-		value = eval(xVarShort + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar /= xDoubleValue;
-		value = eval(yVarShort + divideAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar /= yDoubleValue;
-		value = eval(yVarShort + divideAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divideAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short divideAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short %= {byte, char, short, int, long, float, double}
-
-	public void testShortRemainderAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xByteValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yByteValue;
-		value = eval(xVarShort + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xByteValue;
-		value = eval(yVarShort + remainderAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yByteValue;
-		value = eval(yVarShort + remainderAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xCharValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yCharValue;
-		value = eval(xVarShort + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xCharValue;
-		value = eval(yVarShort + remainderAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yCharValue;
-		value = eval(yVarShort + remainderAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xShortValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yShortValue;
-		value = eval(xVarShort + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xShortValue;
-		value = eval(yVarShort + remainderAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yShortValue;
-		value = eval(yVarShort + remainderAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xIntValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yIntValue;
-		value = eval(xVarShort + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xIntValue;
-		value = eval(yVarShort + remainderAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yIntValue;
-		value = eval(yVarShort + remainderAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xLongValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yLongValue;
-		value = eval(xVarShort + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xLongValue;
-		value = eval(yVarShort + remainderAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yLongValue;
-		value = eval(yVarShort + remainderAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentFloat() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xFloatValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yFloatValue;
-		value = eval(xVarShort + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xFloatValue;
-		value = eval(yVarShort + remainderAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yFloatValue;
-		value = eval(yVarShort + remainderAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment float : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment float : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderAssignmentDouble() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar %= xDoubleValue;
-		IValue value = eval(xVarShort + remainderAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar %= yDoubleValue;
-		value = eval(xVarShort + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar %= xDoubleValue;
-		value = eval(yVarShort + remainderAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar %= yDoubleValue;
-		value = eval(yVarShort + remainderAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainderAssignment double : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short remainderAssignment double : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short <<= {byte, char, short, int, long, float, double}
-
-	public void testShortLeftShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xByteValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yByteValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xByteValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yByteValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xCharValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yCharValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xCharValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yCharValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xShortValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yShortValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xShortValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yShortValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xIntValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yIntValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xIntValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yIntValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar <<= xLongValue;
-		IValue value = eval(xVarShort + leftShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar <<= yLongValue;
-		value = eval(xVarShort + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar <<= xLongValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar <<= yLongValue;
-		value = eval(yVarShort + leftShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short leftShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short >>= {byte, char, short, int, long, float, double}
-
-	public void testShortRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xByteValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yByteValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xByteValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yByteValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xCharValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yCharValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xCharValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yCharValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xShortValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yShortValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xShortValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yShortValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xIntValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yIntValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xIntValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yIntValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>= xLongValue;
-		IValue value = eval(xVarShort + rightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>= yLongValue;
-		value = eval(xVarShort + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>= xLongValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>= yLongValue;
-		value = eval(yVarShort + rightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short rightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short >>>= {byte, char, short, int, long, float, double}
-
-	public void testShortUnsignedRightShiftAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xByteValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yByteValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xByteValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yByteValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xCharValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yCharValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xCharValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yCharValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xShortValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yShortValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xShortValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yShortValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xIntValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yIntValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xIntValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yIntValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar >>>= xLongValue;
-		IValue value = eval(xVarShort + unsignedRightShiftAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar >>>= yLongValue;
-		value = eval(xVarShort + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar >>>= xLongValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar >>>= yLongValue;
-		value = eval(yVarShort + unsignedRightShiftAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShiftAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short unsignedRightShiftAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short |= {byte, char, short, int, long, float, double}
-
-	public void testShortOrAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xByteValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yByteValue;
-		value = eval(xVarShort + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xByteValue;
-		value = eval(yVarShort + orAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yByteValue;
-		value = eval(yVarShort + orAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xCharValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yCharValue;
-		value = eval(xVarShort + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xCharValue;
-		value = eval(yVarShort + orAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yCharValue;
-		value = eval(yVarShort + orAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xShortValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yShortValue;
-		value = eval(xVarShort + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xShortValue;
-		value = eval(yVarShort + orAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yShortValue;
-		value = eval(yVarShort + orAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xIntValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yIntValue;
-		value = eval(xVarShort + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xIntValue;
-		value = eval(yVarShort + orAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yIntValue;
-		value = eval(yVarShort + orAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar |= xLongValue;
-		IValue value = eval(xVarShort + orAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar |= yLongValue;
-		value = eval(xVarShort + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar |= xLongValue;
-		value = eval(yVarShort + orAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar |= yLongValue;
-		value = eval(yVarShort + orAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short orAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short orAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short &= {byte, char, short, int, long, float, double}
-
-	public void testShortAndAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xByteValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yByteValue;
-		value = eval(xVarShort + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xByteValue;
-		value = eval(yVarShort + andAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yByteValue;
-		value = eval(yVarShort + andAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xCharValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yCharValue;
-		value = eval(xVarShort + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xCharValue;
-		value = eval(yVarShort + andAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yCharValue;
-		value = eval(yVarShort + andAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xShortValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yShortValue;
-		value = eval(xVarShort + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xShortValue;
-		value = eval(yVarShort + andAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yShortValue;
-		value = eval(yVarShort + andAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xIntValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yIntValue;
-		value = eval(xVarShort + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xIntValue;
-		value = eval(yVarShort + andAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yIntValue;
-		value = eval(yVarShort + andAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar &= xLongValue;
-		IValue value = eval(xVarShort + andAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar &= yLongValue;
-		value = eval(xVarShort + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar &= xLongValue;
-		value = eval(yVarShort + andAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar &= yLongValue;
-		value = eval(yVarShort + andAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short andAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short andAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short ^= {byte, char, short, int, long, float, double}
-
-	public void testShortXorAssignmentByte() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xByteValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yByteValue;
-		value = eval(xVarShort + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xByteValue;
-		value = eval(yVarShort + xorAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yByteValue;
-		value = eval(yVarShort + xorAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment byte : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment byte : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentChar() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xCharValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yCharValue;
-		value = eval(xVarShort + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xCharValue;
-		value = eval(yVarShort + xorAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yCharValue;
-		value = eval(yVarShort + xorAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment char : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment char : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xShortValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yShortValue;
-		value = eval(xVarShort + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xShortValue;
-		value = eval(yVarShort + xorAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yShortValue;
-		value = eval(yVarShort + xorAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment short : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentInt() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xIntValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yIntValue;
-		value = eval(xVarShort + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xIntValue;
-		value = eval(yVarShort + xorAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yIntValue;
-		value = eval(yVarShort + xorAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment int : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment int : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorAssignmentLong() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		tmpxVar ^= xLongValue;
-		IValue value = eval(xVarShort + xorAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		tmpxVar ^= yLongValue;
-		value = eval(xVarShort + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		tmpyVar ^= xLongValue;
-		value = eval(yVarShort + xorAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-
-		tmpyVar ^= yLongValue;
-		value = eval(yVarShort + xorAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xorAssignment long : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short xorAssignment long : wrong result : ", tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
deleted file mode 100644
index b56534b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
+++ /dev/null
@@ -1,2433 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class ShortOperatorsTests extends Tests {
-
-	public ShortOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// short + {byte, char, short, int, long, float, double}
-
-	public void testShortPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus byte : wrong result : ", xShortValue + yByteValue, intValue);
-
-		value = eval(yShort + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus byte : wrong result : ", yShortValue + xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus char : wrong result : ", xShortValue + yCharValue, intValue);
-
-		value = eval(yShort + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus char : wrong result : ", yShortValue + xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus short : wrong result : ", xShortValue + yShortValue, intValue);
-
-		value = eval(yShort + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus short : wrong result : ", yShortValue + xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus int : wrong result : ", xShortValue + yIntValue, intValue);
-
-		value = eval(yShort + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short plus int : wrong result : ", yShortValue + xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short plus long : wrong result : ", xShortValue + yLongValue, longValue);
-
-		value = eval(yShort + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short plus long : wrong result : ", yShortValue + xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short plus float : wrong result : ", xShortValue + yFloatValue, floatValue, 0);
-
-		value = eval(yShort + plusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short plus float : wrong result : ", yShortValue + xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short plus double : wrong result : ", xShortValue + yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short plus double : wrong result : ", yShortValue + xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("short plus java.lang.String : wrong result : ", xShortValue + yStringValue, stringValue);
-
-		value = eval(yShort + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("short plus java.lang.String : wrong result : ", yShortValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short - {byte, char, short, int, long, float, double}
-
-	public void testShortMinusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus byte : wrong result : ", xShortValue - yByteValue, intValue);
-
-		value = eval(yShort + minusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus byte : wrong result : ", yShortValue - xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus char : wrong result : ", xShortValue - yCharValue, intValue);
-
-		value = eval(yShort + minusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus char : wrong result : ", yShortValue - xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus short : wrong result : ", xShortValue - yShortValue, intValue);
-
-		value = eval(yShort + minusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus short : wrong result : ", yShortValue - xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus int : wrong result : ", xShortValue - yIntValue, intValue);
-
-		value = eval(yShort + minusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short minus int : wrong result : ", yShortValue - xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short minus long : wrong result : ", xShortValue - yLongValue, longValue);
-
-		value = eval(yShort + minusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short minus long : wrong result : ", yShortValue - xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short minus float : wrong result : ", xShortValue - yFloatValue, floatValue, 0);
-
-		value = eval(yShort + minusOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short minus float : wrong result : ", yShortValue - xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMinusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + minusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short minus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short minus double : wrong result : ", xShortValue - yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + minusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short minus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short minus double : wrong result : ", yShortValue - xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// short * {byte, char, short, int, long, float, double}
-
-	public void testShortMultiplyByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply byte : wrong result : ", xShortValue * yByteValue, intValue);
-
-		value = eval(yShort + multiplyOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply byte : wrong result : ", yShortValue * xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply char : wrong result : ", xShortValue * yCharValue, intValue);
-
-		value = eval(yShort + multiplyOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply char : wrong result : ", yShortValue * xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply short : wrong result : ", xShortValue * yShortValue, intValue);
-
-		value = eval(yShort + multiplyOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply short : wrong result : ", yShortValue * xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply int : wrong result : ", xShortValue * yIntValue, intValue);
-
-		value = eval(yShort + multiplyOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short multiply int : wrong result : ", yShortValue * xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short multiply long : wrong result : ", xShortValue * yLongValue, longValue);
-
-		value = eval(yShort + multiplyOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short multiply long : wrong result : ", yShortValue * xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short multiply float : wrong result : ", xShortValue * yFloatValue, floatValue, 0);
-
-		value = eval(yShort + multiplyOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short multiply float : wrong result : ", yShortValue * xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortMultiplyDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + multiplyOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short multiply double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short multiply double : wrong result : ", xShortValue * yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + multiplyOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short multiply double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short multiply double : wrong result : ", yShortValue * xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// short / {byte, char, short, int, long, float, double}
-
-	public void testShortDivideByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide byte : wrong result : ", xShortValue / yByteValue, intValue);
-
-		value = eval(yShort + divideOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide byte : wrong result : ", yShortValue / xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide char : wrong result : ", xShortValue / yCharValue, intValue);
-
-		value = eval(yShort + divideOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide char : wrong result : ", yShortValue / xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide short : wrong result : ", xShortValue / yShortValue, intValue);
-
-		value = eval(yShort + divideOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide short : wrong result : ", yShortValue / xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide int : wrong result : ", xShortValue / yIntValue, intValue);
-
-		value = eval(yShort + divideOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short divide int : wrong result : ", yShortValue / xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short divide long : wrong result : ", xShortValue / yLongValue, longValue);
-
-		value = eval(yShort + divideOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short divide long : wrong result : ", yShortValue / xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short divide float : wrong result : ", xShortValue / yFloatValue, floatValue, 0);
-
-		value = eval(yShort + divideOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short divide float : wrong result : ", yShortValue / xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortDivideDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + divideOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short divide double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short divide double : wrong result : ", xShortValue / yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + divideOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short divide double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short divide double : wrong result : ", yShortValue / xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// short % {byte, char, short, int, long, float, double}
-
-	public void testShortRemainderByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder byte : wrong result : ", xShortValue % yByteValue, intValue);
-
-		value = eval(yShort + remainderOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder byte : wrong result : ", yShortValue % xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder char : wrong result : ", xShortValue % yCharValue, intValue);
-
-		value = eval(yShort + remainderOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder char : wrong result : ", yShortValue % xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder short : wrong result : ", xShortValue % yShortValue, intValue);
-
-		value = eval(yShort + remainderOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder short : wrong result : ", yShortValue % xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder int : wrong result : ", xShortValue % yIntValue, intValue);
-
-		value = eval(yShort + remainderOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short remainder int : wrong result : ", yShortValue % xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short remainder long : wrong result : ", xShortValue % yLongValue, longValue);
-
-		value = eval(yShort + remainderOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short remainder long : wrong result : ", yShortValue % xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short remainder float : wrong result : ", xShortValue % yFloatValue, floatValue, 0);
-
-		value = eval(yShort + remainderOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("short remainder float : wrong result : ", yShortValue % xFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRemainderDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + remainderOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short remainder double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short remainder double : wrong result : ", xShortValue % yDoubleValue, doubleValue, 0);
-
-		value = eval(yShort + remainderOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short remainder double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("short remainder double : wrong result : ", yShortValue % xDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// short > {byte, char, short, int, long, float, double}
-
-	public void testShortGreaterByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater byte : wrong result : ", xShortValue > yByteValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater byte : wrong result : ", yShortValue > xByteValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater byte : wrong result : ", xShortValue > xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater char : wrong result : ", xShortValue > yCharValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater char : wrong result : ", yShortValue > xCharValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater char : wrong result : ", xShortValue > xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater short : wrong result : ", xShortValue > yShortValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater short : wrong result : ", yShortValue > xShortValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater short : wrong result : ", xShortValue > xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater int : wrong result : ", xShortValue > yIntValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater int : wrong result : ", yShortValue > xIntValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater int : wrong result : ", xShortValue > xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater long : wrong result : ", xShortValue > yLongValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater long : wrong result : ", yShortValue > xLongValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater long : wrong result : ", xShortValue > xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater float : wrong result : ", xShortValue > yFloatValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater float : wrong result : ", yShortValue > xFloatValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater float : wrong result : ", xShortValue > xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greater double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater double : wrong result : ", xShortValue > yDoubleValue, booleanValue);
-
-		value = eval(yShort + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater double : wrong result : ", yShortValue > xDoubleValue, booleanValue);
-
-		value = eval(xShort + greaterOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greater double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greater double : wrong result : ", xShortValue > xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short >= {byte, char, short, int, long, float, double}
-
-	public void testShortGreaterEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual byte : wrong result : ", xShortValue >= yByteValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual byte : wrong result : ", yShortValue >= xByteValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual byte : wrong result : ", xShortValue >= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual char : wrong result : ", xShortValue >= yCharValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual char : wrong result : ", yShortValue >= xCharValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual char : wrong result : ", xShortValue >= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual short : wrong result : ", xShortValue >= yShortValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual short : wrong result : ", yShortValue >= xShortValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual short : wrong result : ", xShortValue >= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual int : wrong result : ", xShortValue >= yIntValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual int : wrong result : ", yShortValue >= xIntValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual int : wrong result : ", xShortValue >= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual long : wrong result : ", xShortValue >= yLongValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual long : wrong result : ", yShortValue >= xLongValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual long : wrong result : ", xShortValue >= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual float : wrong result : ", xShortValue >= yFloatValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual float : wrong result : ", yShortValue >= xFloatValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual float : wrong result : ", xShortValue >= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortGreaterEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + greaterEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual double : wrong result : ", xShortValue >= yDoubleValue, booleanValue);
-
-		value = eval(yShort + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual double : wrong result : ", yShortValue >= xDoubleValue, booleanValue);
-
-		value = eval(xShort + greaterEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short greaterEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short greaterEqual double : wrong result : ", xShortValue >= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short < {byte, char, short, int, long, float, double}
-
-	public void testShortLessByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less byte : wrong result : ", xShortValue < yByteValue, booleanValue);
-
-		value = eval(yShort + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less byte : wrong result : ", yShortValue < xByteValue, booleanValue);
-
-		value = eval(xShort + lessOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less byte : wrong result : ", xShortValue < xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less char : wrong result : ", xShortValue < yCharValue, booleanValue);
-
-		value = eval(yShort + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less char : wrong result : ", yShortValue < xCharValue, booleanValue);
-
-		value = eval(xShort + lessOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less char : wrong result : ", xShortValue < xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less short : wrong result : ", xShortValue < yShortValue, booleanValue);
-
-		value = eval(yShort + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less short : wrong result : ", yShortValue < xShortValue, booleanValue);
-
-		value = eval(xShort + lessOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less short : wrong result : ", xShortValue < xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less int : wrong result : ", xShortValue < yIntValue, booleanValue);
-
-		value = eval(yShort + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less int : wrong result : ", yShortValue < xIntValue, booleanValue);
-
-		value = eval(xShort + lessOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less int : wrong result : ", xShortValue < xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less long : wrong result : ", xShortValue < yLongValue, booleanValue);
-
-		value = eval(yShort + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less long : wrong result : ", yShortValue < xLongValue, booleanValue);
-
-		value = eval(xShort + lessOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less long : wrong result : ", xShortValue < xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less float : wrong result : ", xShortValue < yFloatValue, booleanValue);
-
-		value = eval(yShort + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less float : wrong result : ", yShortValue < xFloatValue, booleanValue);
-
-		value = eval(xShort + lessOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less float : wrong result : ", xShortValue < xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short less double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less double : wrong result : ", xShortValue < yDoubleValue, booleanValue);
-
-		value = eval(yShort + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less double : wrong result : ", yShortValue < xDoubleValue, booleanValue);
-
-		value = eval(xShort + lessOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short less double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short less double : wrong result : ", xShortValue < xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short <= {byte, char, short, int, long, float, double}
-
-	public void testShortLessEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual byte : wrong result : ", xShortValue <= yByteValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual byte : wrong result : ", yShortValue <= xByteValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual byte : wrong result : ", xShortValue <= xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual char : wrong result : ", xShortValue <= yCharValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual char : wrong result : ", yShortValue <= xCharValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual char : wrong result : ", xShortValue <= xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual short : wrong result : ", xShortValue <= yShortValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual short : wrong result : ", yShortValue <= xShortValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual short : wrong result : ", xShortValue <= xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual int : wrong result : ", xShortValue <= yIntValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual int : wrong result : ", yShortValue <= xIntValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual int : wrong result : ", xShortValue <= xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual long : wrong result : ", xShortValue <= yLongValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual long : wrong result : ", yShortValue <= xLongValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual long : wrong result : ", xShortValue <= xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual float : wrong result : ", xShortValue <= yFloatValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual float : wrong result : ", yShortValue <= xFloatValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual float : wrong result : ", xShortValue <= xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLessEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + lessEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual double : wrong result : ", xShortValue <= yDoubleValue, booleanValue);
-
-		value = eval(yShort + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual double : wrong result : ", yShortValue <= xDoubleValue, booleanValue);
-
-		value = eval(xShort + lessEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short lessEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short lessEqual double : wrong result : ", xShortValue <= xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short == {byte, char, short, int, long, float, double}
-
-	public void testShortEqualEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual byte : wrong result : ", xShortValue == yByteValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual byte : wrong result : ", yShortValue == xByteValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual byte : wrong result : ", xShortValue == xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortEqualEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual char : wrong result : ", xShortValue == yCharValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual char : wrong result : ", yShortValue == xCharValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual char : wrong result : ", xShortValue == xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortEqualEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual short : wrong result : ", xShortValue == yShortValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual short : wrong result : ", yShortValue == xShortValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual short : wrong result : ", xShortValue == xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortEqualEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual int : wrong result : ", xShortValue == yIntValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual int : wrong result : ", yShortValue == xIntValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual int : wrong result : ", xShortValue == xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortEqualEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual long : wrong result : ", xShortValue == yLongValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual long : wrong result : ", yShortValue == xLongValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual long : wrong result : ", xShortValue == xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortEqualEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual float : wrong result : ", xShortValue == yFloatValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual float : wrong result : ", yShortValue == xFloatValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual float : wrong result : ", xShortValue == xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortEqualEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + equalEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual double : wrong result : ", xShortValue == yDoubleValue, booleanValue);
-
-		value = eval(yShort + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual double : wrong result : ", yShortValue == xDoubleValue, booleanValue);
-
-		value = eval(xShort + equalEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short equalEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short equalEqual double : wrong result : ", xShortValue == xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short != {byte, char, short, int, long, float, double}
-
-	public void testShortNotEqualByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual byte : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual byte : wrong result : ", xShortValue != yByteValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual byte : wrong result : ", yShortValue != xByteValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual byte : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual byte : wrong result : ", xShortValue != xByteValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortNotEqualChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual char : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual char : wrong result : ", xShortValue != yCharValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual char : wrong result : ", yShortValue != xCharValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual char : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual char : wrong result : ", xShortValue != xCharValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortNotEqualShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual short : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual short : wrong result : ", xShortValue != yShortValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual short : wrong result : ", yShortValue != xShortValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual short : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual short : wrong result : ", xShortValue != xShortValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortNotEqualInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual int : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual int : wrong result : ", xShortValue != yIntValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual int : wrong result : ", yShortValue != xIntValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual int : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual int : wrong result : ", xShortValue != xIntValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortNotEqualLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual long : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual long : wrong result : ", xShortValue != yLongValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual long : wrong result : ", yShortValue != xLongValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual long : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual long : wrong result : ", xShortValue != xLongValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortNotEqualFloat() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual float : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual float : wrong result : ", xShortValue != yFloatValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual float : wrong result : ", yShortValue != xFloatValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual float : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual float : wrong result : ", xShortValue != xFloatValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortNotEqualDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + notEqualOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual double : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual double : wrong result : ", xShortValue != yDoubleValue, booleanValue);
-
-		value = eval(yShort + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual double : wrong result : ", yShortValue != xDoubleValue, booleanValue);
-
-		value = eval(xShort + notEqualOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short notEqual double : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("short notEqual double : wrong result : ", xShortValue != xDoubleValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short << {byte, char, short, int, long}
-
-	public void testShortLeftShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift byte : wrong result : ", xShortValue << yByteValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift byte : wrong result : ", yShortValue << xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift char : wrong result : ", xShortValue << yCharValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift char : wrong result : ", yShortValue << xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift short : wrong result : ", xShortValue << yShortValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift short : wrong result : ", yShortValue << xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift int : wrong result : ", xShortValue << yIntValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift int : wrong result : ", yShortValue << xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortLeftShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + leftShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift long : wrong result : ", xShortValue << yLongValue, intValue);
-
-		value = eval(yShort + leftShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short leftShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short leftShift long : wrong result : ", yShortValue << xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short >> {byte, char, short, int, long}
-
-	public void testShortRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift byte : wrong result : ", xShortValue >> yByteValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift byte : wrong result : ", yShortValue >> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift char : wrong result : ", xShortValue >> yCharValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift char : wrong result : ", yShortValue >> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift short : wrong result : ", xShortValue >> yShortValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift short : wrong result : ", yShortValue >> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift int : wrong result : ", xShortValue >> yIntValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift int : wrong result : ", yShortValue >> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + rightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift long : wrong result : ", xShortValue >> yLongValue, intValue);
-
-		value = eval(yShort + rightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short rightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short rightShift long : wrong result : ", yShortValue >> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short >>> {byte, char, short, int, long}
-
-	public void testShortUnsignedRightShiftByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift byte : wrong result : ", xShortValue >>> yByteValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift byte : wrong result : ", yShortValue >>> xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift char : wrong result : ", xShortValue >>> yCharValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift char : wrong result : ", yShortValue >>> xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift short : wrong result : ", xShortValue >>> yShortValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift short : wrong result : ", yShortValue >>> xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift int : wrong result : ", xShortValue >>> yIntValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift int : wrong result : ", yShortValue >>> xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortUnsignedRightShiftLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + unsignedRightShiftOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift long : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift long : wrong result : ", xShortValue >>> yLongValue, intValue);
-
-		value = eval(yShort + unsignedRightShiftOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short unsignedRightShift long : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short unsignedRightShift long : wrong result : ", yShortValue >>> xLongValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short | {byte, char, short, int, long}
-
-	public void testShortOrByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or byte : wrong result : ", xShortValue | yByteValue, intValue);
-
-		value = eval(yShort + orOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or byte : wrong result : ", yShortValue | xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or char : wrong result : ", xShortValue | yCharValue, intValue);
-
-		value = eval(yShort + orOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or char : wrong result : ", yShortValue | xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or short : wrong result : ", xShortValue | yShortValue, intValue);
-
-		value = eval(yShort + orOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or short : wrong result : ", yShortValue | xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or int : wrong result : ", xShortValue | yIntValue, intValue);
-
-		value = eval(yShort + orOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short or int : wrong result : ", yShortValue | xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortOrLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + orOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short or long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short or long : wrong result : ", xShortValue | yLongValue, longValue);
-
-		value = eval(yShort + orOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short or long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short or long : wrong result : ", yShortValue | xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short & {byte, char, short, int, long}
-
-	public void testShortAndByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and byte : wrong result : ", xShortValue & yByteValue, intValue);
-
-		value = eval(yShort + andOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and byte : wrong result : ", yShortValue & xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and char : wrong result : ", xShortValue & yCharValue, intValue);
-
-		value = eval(yShort + andOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and char : wrong result : ", yShortValue & xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and short : wrong result : ", xShortValue & yShortValue, intValue);
-
-		value = eval(yShort + andOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and short : wrong result : ", yShortValue & xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and int : wrong result : ", xShortValue & yIntValue, intValue);
-
-		value = eval(yShort + andOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short and int : wrong result : ", yShortValue & xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortAndLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + andOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short and long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short and long : wrong result : ", xShortValue & yLongValue, longValue);
-
-		value = eval(yShort + andOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short and long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short and long : wrong result : ", yShortValue & xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// short ^ {byte, char, short, int, long}
-
-	public void testShortXorByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor byte : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor byte : wrong result : ", xShortValue ^ yByteValue, intValue);
-
-		value = eval(yShort + xorOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor byte : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor byte : wrong result : ", yShortValue ^ xByteValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor char : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor char : wrong result : ", xShortValue ^ yCharValue, intValue);
-
-		value = eval(yShort + xorOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor char : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor char : wrong result : ", yShortValue ^ xCharValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor short : wrong result : ", xShortValue ^ yShortValue, intValue);
-
-		value = eval(yShort + xorOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor short : wrong result : ", yShortValue ^ xShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor int : wrong result : ", xShortValue ^ yIntValue, intValue);
-
-		value = eval(yShort + xorOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("short xor int : wrong result : ", yShortValue ^ xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortXorLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xShort + xorOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short xor long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short xor long : wrong result : ", xShortValue ^ yLongValue, longValue);
-
-		value = eval(yShort + xorOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short xor long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("short xor long : wrong result : ", yShortValue ^ xLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// + short
-
-	public void testPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(plusOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("plus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus short : wrong result : ", + xShortValue, intValue);
-
-		value = eval(plusOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("plus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("plus short : wrong result : ", + yShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// - short
-
-	public void testMinusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(minusOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("minus short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus short : wrong result : ", - xShortValue, intValue);
-
-		value = eval(minusOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("minus short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("minus short : wrong result : ", - yShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// ~ short
-
-	public void testTwiddleShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(twiddleOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("twiddle short : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle short : wrong result : ", ~ xShortValue, intValue);
-
-		value = eval(twiddleOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("twiddle short : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("twiddle short : wrong result : ", ~ yShortValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
deleted file mode 100644
index 34a02a2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StaticFieldValueTests extends Tests {
-
-	public StaticFieldValueTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",63,2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("" + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("" + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("" + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("" + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("" + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("" + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("" + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("" + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("" + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
deleted file mode 100644
index 08be2ee..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StaticFieldValueTests2 extends Tests {
-
-	public StaticFieldValueTests2(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalTypeTests",67,2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testByteStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", xStaticFieldByteValue, byteValue);
-
-		value = eval("" + yStaticFieldByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte field value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte field value : wrong result : ", yStaticFieldByteValue, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testCharStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", xStaticFieldCharValue, charValue);
-
-		value = eval("" + yStaticFieldChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char field value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char field value : wrong result : ", yStaticFieldCharValue, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testShortStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", xStaticFieldShortValue, shortValue);
-
-		value = eval("" + yStaticFieldShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short field value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short field value : wrong result : ", yStaticFieldShortValue, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", xStaticFieldIntValue, intValue);
-
-		value = eval("" + yStaticFieldInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int field value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int field value : wrong result : ", yStaticFieldIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testLongStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", xStaticFieldLongValue, longValue);
-
-		value = eval("" + yStaticFieldLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long field value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long field value : wrong result : ", yStaticFieldLongValue, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testFloatStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", xStaticFieldFloatValue, floatValue, 0);
-
-		value = eval("" + yStaticFieldFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float field value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float field value : wrong result : ", yStaticFieldFloatValue, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testDoubleStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", xStaticFieldDoubleValue, doubleValue, 0);
-
-		value = eval("" + yStaticFieldDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double field value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double field value : wrong result : ", yStaticFieldDoubleValue, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", xStaticFieldStringValue, stringValue);
-
-		value = eval("" + yStaticFieldString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String field value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String field value : wrong result : ", yStaticFieldStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testBooleanStaticFieldValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval("" + xStaticFieldBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		boolean booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", xStaticFieldBooleanValue, booleanValue);
-
-		value = eval("" + yStaticFieldBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("boolean field value : wrong type : ", "boolean", typeName);
-		booleanValue = ((IJavaPrimitiveValue)value).getBooleanValue();
-		assertEquals("boolean field value : wrong result : ", yStaticFieldBooleanValue, booleanValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
deleted file mode 100644
index f5b4558..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
+++ /dev/null
@@ -1,546 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StringPlusAssignmentOpTests extends Tests {
-
-	public StringPlusAssignmentOpTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// java.lang.String += {byte, char, short, int, long, java.lang.String, null}
-
-	public void testStringPlusAssignmentByte() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xByteValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yByteValue;
-		value = eval(xVarString + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xByteValue;
-		value = eval(yVarString + plusAssignmentOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yByteValue;
-		value = eval(yVarString + plusAssignmentOp + yByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment byte : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentChar() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xCharValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yCharValue;
-		value = eval(xVarString + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xCharValue;
-		value = eval(yVarString + plusAssignmentOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yCharValue;
-		value = eval(yVarString + plusAssignmentOp + yChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment char : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentShort() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xShortValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yShortValue;
-		value = eval(xVarString + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xShortValue;
-		value = eval(yVarString + plusAssignmentOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yShortValue;
-		value = eval(yVarString + plusAssignmentOp + yShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment short : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarString + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarString + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarString + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment int : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentLong() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xLongValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yLongValue;
-		value = eval(xVarString + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xLongValue;
-		value = eval(yVarString + plusAssignmentOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yLongValue;
-		value = eval(yVarString + plusAssignmentOp + yLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment long : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentFloat() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xFloatValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yFloatValue;
-		value = eval(xVarString + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xFloatValue;
-		value = eval(yVarString + plusAssignmentOp + xFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yFloatValue;
-		value = eval(yVarString + plusAssignmentOp + yFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment float : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment float : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentDouble() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xDoubleValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yDoubleValue;
-		value = eval(xVarString + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xDoubleValue;
-		value = eval(yVarString + plusAssignmentOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yDoubleValue;
-		value = eval(yVarString + plusAssignmentOp + yDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment double : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentString() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xStringValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yStringValue;
-		value = eval(xVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xStringValue;
-		value = eval(yVarString + plusAssignmentOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yStringValue;
-		value = eval(yVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentNull() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xNullValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xNull);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yNullValue;
-		value = eval(xVarString + plusAssignmentOp + yNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xNullValue;
-		value = eval(yVarString + plusAssignmentOp + xNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yNullValue;
-		value = eval(yVarString + plusAssignmentOp + yNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment null : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
deleted file mode 100644
index 311864a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class StringPlusOpTests extends Tests {
-
-	public StringPlusOpTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// java.lang.String + {byte, char, short, int, long, java.lang.String, null}
-
-	public void testStringPlusByte() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus byte : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus byte : wrong result : ", xStringValue + yByteValue, stringValue);
-
-		value = eval(yString + plusOp + xByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus byte : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus byte : wrong result : ", yStringValue + xByteValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusChar() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus char : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus char : wrong result : ", xStringValue + yCharValue, stringValue);
-
-		value = eval(yString + plusOp + xChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus char : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus char : wrong result : ", yStringValue + xCharValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusShort() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus short : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus short : wrong result : ", xStringValue + yShortValue, stringValue);
-
-		value = eval(yString + plusOp + xShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus short : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus short : wrong result : ", yStringValue + xShortValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus int : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus int : wrong result : ", xStringValue + yIntValue, stringValue);
-
-		value = eval(yString + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus int : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus int : wrong result : ", yStringValue + xIntValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusLong() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus long : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus long : wrong result : ", xStringValue + yLongValue, stringValue);
-
-		value = eval(yString + plusOp + xLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus long : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus long : wrong result : ", yStringValue + xLongValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusDouble() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus double : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus double : wrong result : ", xStringValue + yDoubleValue, stringValue);
-
-		value = eval(yString + plusOp + xDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus double : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus double : wrong result : ", yStringValue + xDoubleValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusBoolean() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yBoolean);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus boolean : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus boolean : wrong result : ", xStringValue + yBooleanValue, stringValue);
-
-		value = eval(yString + plusOp + xBoolean);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus boolean : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus boolean : wrong result : ", yStringValue + xBooleanValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", xStringValue + yStringValue, stringValue);
-
-		value = eval(yString + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", yStringValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusNull() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yNull);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus null : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus null : wrong result : ", xStringValue + yNullValue, stringValue);
-
-		value = eval(yString + plusOp + xNull);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus null : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus null : wrong result : ", yStringValue + xNullValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
deleted file mode 100644
index 497f098..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.eval.EvaluationManager;
-import org.eclipse.jdt.debug.eval.IEvaluationEngine;
-import org.eclipse.jdt.debug.eval.IEvaluationListener;
-import org.eclipse.jdt.debug.eval.IEvaluationResult;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-
-public abstract class Tests extends AbstractDebugTest {
-
-	static final String xByte = "((byte)-3)";
-	static final String xChar = "((char)-3)";
-	static final String xShort = "((short)-3)";
-	static final String xInt = "(-3)";
-	static final String xLong = "(-3l)";
-	static final String xFloat = "(-3.2f)";
-	static final String xDouble = "(-3.2)";
-	static final String xString = "\"minus three\"";
-	static final String xBoolean = "true";
-	static final String xNull = "null";
-	
-	static final byte xByteValue = (byte)-3;
-	static final char xCharValue = (char)-3;
-	static final short xShortValue = (short)-3;
-	static final int xIntValue = -3;
-	static final long xLongValue = -3l;
-	static final float xFloatValue = -3.2f;
-	static final double xDoubleValue = -3.2;
-	static final String xStringValue = "minus three";
-	static final boolean xBooleanValue = true;
-	static final Object xNullValue = null;
-
-	static final String xVarByte = "xVarByte";
-	static final String xVarChar = "xVarChar";
-	static final String xVarShort = "xVarShort";
-	static final String xVarInt = "xVarInt";
-	static final String xVarLong = "xVarLong";
-	static final String xVarFloat = "xVarFloat";
-	static final String xVarDouble = "xVarDouble";
-	static final String xVarString = "xVarString";
-	static final String xVarBoolean = "xVarBoolean";
-//	static final String xVarNull = "xVarNull";
-	
-	static final byte xVarByteValue = (byte)-5;
-	static final char xVarCharValue = (char)-5;
-	static final short xVarShortValue = (short)-5;
-	static final int xVarIntValue = -5;
-	static final long xVarLongValue = -5;
-	static final float xVarFloatValue = (float)-5.3;
-	static final double xVarDoubleValue = -5.3;
-	static final String xVarStringValue = "minus five";
-	static final boolean xVarBooleanValue = true;
-//	static final Object xVarNullValue = null;
-
-	static final String yByte = "((byte)8)";
-	static final String yChar = "((char)8)";
-	static final String yShort = "((short)8)";
-	static final String yInt = "8";
-	static final String yLong = "8l";
-	static final String yFloat = "7.8f";
-	static final String yDouble = "7.8";
-	static final String yString = "\"eight\"";
-	static final String yBoolean = "false";
-	static final String yNull = "null";
-
-	static final byte yByteValue = (byte)8;
-	static final char yCharValue = (char)8;
-	static final short yShortValue = (short)8;
-	static final int yIntValue = 8;
-	static final long yLongValue = 8;
-	static final float yFloatValue = (float)7.8;
-	static final double yDoubleValue = 7.8;
-	static final String yStringValue = "eight";
-	static final boolean yBooleanValue = false;
-	static final Object yNullValue = null;
-	
-	static final String yVarByte = "yVarByte";
-	static final String yVarChar = "yVarChar";
-	static final String yVarShort = "yVarShort";
-	static final String yVarInt = "yVarInt";
-	static final String yVarLong = "yVarLong";
-	static final String yVarFloat = "yVarFloat";
-	static final String yVarDouble = "yVarDouble";
-	static final String yVarString = "yVarString";
-	static final String yVarBoolean = "yVarBoolean";
-//	static final String yVarNull = "yVarNull";
-	
-	static final byte yVarByteValue = (byte)7;
-	static final char yVarCharValue = (char)7;
-	static final short yVarShortValue = (short)7;
-	static final int yVarIntValue = 7;
-	static final long yVarLongValue = 7;
-	static final float yVarFloatValue = (float)6.9;
-	static final double yVarDoubleValue = 6.9;
-	static final String yVarStringValue = "seven";
-	static final boolean yVarBooleanValue = false;
-//	static final Object yVarNullValue = null;
-	
-	static final String xFieldByte = "xFieldByte";
-	static final String xFieldChar = "xFieldChar";
-	static final String xFieldShort = "xFieldShort";
-	static final String xFieldInt = "xFieldInt";
-	static final String xFieldLong = "xFieldLong";
-	static final String xFieldFloat = "xFieldFloat";
-	static final String xFieldDouble = "xFieldDouble";
-	static final String xFieldString = "xFieldString";
-	static final String xFieldBoolean = "xFieldBoolean";
-
-	static final String yFieldByte = "yFieldByte";
-	static final String yFieldChar = "yFieldChar";
-	static final String yFieldShort = "yFieldShort";
-	static final String yFieldInt = "yFieldInt";
-	static final String yFieldLong = "yFieldLong";
-	static final String yFieldFloat = "yFieldFloat";
-	static final String yFieldDouble = "yFieldDouble";
-	static final String yFieldString = "yFieldString";
-	static final String yFieldBoolean = "yFieldBoolean";
-
-	static final String xStaticFieldByte = "xStaticFieldByte";
-	static final String xStaticFieldChar = "xStaticFieldChar";
-	static final String xStaticFieldShort = "xStaticFieldShort";
-	static final String xStaticFieldInt = "xStaticFieldInt";
-	static final String xStaticFieldLong = "xStaticFieldLong";
-	static final String xStaticFieldFloat = "xStaticFieldFloat";
-	static final String xStaticFieldDouble = "xStaticFieldDouble";
-	static final String xStaticFieldString = "xStaticFieldString";
-	static final String xStaticFieldBoolean = "xStaticFieldBoolean";
-
-	static final String yStaticFieldByte = "yStaticFieldByte";
-	static final String yStaticFieldChar = "yStaticFieldChar";
-	static final String yStaticFieldShort = "yStaticFieldShort";
-	static final String yStaticFieldInt = "yStaticFieldInt";
-	static final String yStaticFieldLong = "yStaticFieldLong";
-	static final String yStaticFieldFloat = "yStaticFieldFloat";
-	static final String yStaticFieldDouble = "yStaticFieldDouble";
-	static final String yStaticFieldString = "yStaticFieldString";
-	static final String yStaticFieldBoolean = "yStaticFieldBoolean";
-	
-	static final byte xFieldByteValue = -2;
-	static final char xFieldCharValue = (char)-2;
-	static final short xFieldShortValue = -2;
-	static final int xFieldIntValue = -2;
-	static final long xFieldLongValue = -2;
-	static final float xFieldFloatValue = (float)-2.1;
-	static final double xFieldDoubleValue = -2.1;
-	static final String xFieldStringValue = "minus two";
-	static final boolean xFieldBooleanValue = true;
-
-	static final byte yFieldByteValue = 9;
-	static final char yFieldCharValue = 9;
-	static final short yFieldShortValue = 9;
-	static final int yFieldIntValue = 9;
-	static final long yFieldLongValue = 9;
-	static final float yFieldFloatValue = (float)8.6;
-	static final double yFieldDoubleValue = 8.6;
-	static final String yFieldStringValue = "nine";
-	static final boolean yFieldBooleanValue = false;
-
-	static final byte xStaticFieldByteValue = -1;
-	static final char xStaticFieldCharValue = (char)-1;
-	static final short xStaticFieldShortValue = -1;
-	static final int xStaticFieldIntValue = -1;
-	static final long xStaticFieldLongValue = -1;
-	static final float xStaticFieldFloatValue = (float)-1.5;
-	static final double xStaticFieldDoubleValue = -1.5;
-	static final String xStaticFieldStringValue = "minus one";
-	static final boolean xStaticFieldBooleanValue = true;
-
-	static final byte yStaticFieldByteValue = 6;
-	static final char yStaticFieldCharValue = 6;
-	static final short yStaticFieldShortValue = 6;
-	static final int yStaticFieldIntValue = 6;
-	static final long yStaticFieldLongValue = 6;
-	static final float yStaticFieldFloatValue = (float)6.5;
-	static final double yStaticFieldDoubleValue = 6.5;
-	static final String yStaticFieldStringValue = "six";
-	static final boolean yStaticFieldBooleanValue = false;
-	
-	static final String xArrayByte = "xArrayByte";
-	static final String xArrayChar = "xArrayChar";
-	static final String xArrayShort = "xArrayShort";
-	static final String xArrayInt = "xArrayInt";
-	static final String xArrayLong = "xArrayLong";
-	static final String xArrayFloat = "xArrayFloat";
-	static final String xArrayDouble = "xArrayDouble";
-	static final String xArrayString = "xArrayString";
-	static final String xArrayBoolean = "xArrayBoolean";
-
-	static final String yArrayByte = "yArrayByte";
-	static final String yArrayChar = "yArrayChar";
-	static final String yArrayShort = "yArrayShort";
-	static final String yArrayInt = "yArrayInt";
-	static final String yArrayLong = "yArrayLong";
-	static final String yArrayFloat = "yArrayFloat";
-	static final String yArrayDouble = "yArrayDouble";
-	static final String yArrayString = "yArrayString";
-	static final String yArrayBoolean = "yArrayBoolean";
-
-	static final byte[] xArrayByteValue = new byte[]{1, 2, 3};
-	static final char[] xArrayCharValue = new char[]{1, 2, 3};
-	static final short[] xArrayShortValue = new short[]{1, 2, 3};
-	static final int[] xArrayIntValue = new int[]{1, 2, 3};
-	static final long[] xArrayLongValue = new long[]{1, 2, 3};
-	static final float[] xArrayFloatValue = new float[]{(float)1.2, (float)2.3, (float)3.4};
-	static final double[] xArrayDoubleValue = new double[]{1.2, 2.3, 3.4};
-	static final String[] xArrayStringValue = new String[]{"one", "two", "three"};
-	static final boolean[] xArrayBooleanValue = new boolean[]{true, false, true};
-
-	static final byte[] yArrayByteValue = new byte[]{7, 8, 9};
-	static final char[] yArrayCharValue = new char[]{7, 8, 9};
-	static final short[] yArrayShortValue = new short[]{7, 8, 9};
-	static final int[] yArrayIntValue = new int[]{7, 8, 9};
-	static final long[] yArrayLongValue = new long[]{7, 8, 9};
-	static final float[] yArrayFloatValue = new float[]{(float)7.6, (float)8.7, (float)9.8};
-	static final double[] yArrayDoubleValue = new double[]{7.6, 8.7, 9.8};
-	static final String[] yArrayStringValue = new String[]{"seven", "eight", "nine"};
-	static final boolean[] yArrayBooleanValue = new boolean[]{false, true, false};
-		
-	
-	static final String plusOp = "+";
-	static final String minusOp = "-";
-	static final String multiplyOp = "*";
-	static final String divideOp = "/";
-	static final String remainderOp = "%";
-	static final String greaterOp = ">";
-	static final String greaterEqualOp = ">=";
-	static final String lessOp = "<";
-	static final String lessEqualOp = "<=";
-	static final String equalEqualOp = "==";
-	static final String notEqualOp = "!=";
-	static final String leftShiftOp = "<<";
-	static final String rightShiftOp = ">>";
-	static final String unsignedRightShiftOp = ">>>";
-	static final String orOp = "|";
-	static final String andOp = "&";
-	static final String xorOp = "^";
-	static final String notOp = "!";
-	static final String twiddleOp = "~";
-	static final String equalOp = "=";
-	static final String plusAssignmentOp = "+=";
-	static final String minusAssignmentOp = "-=";
-	static final String multiplyAssignmentOp = "*=";
-	static final String divideAssignmentOp = "/=";
-	static final String remainderAssignmentOp = "%=";
-	static final String leftShiftAssignmentOp = "<<=";
-	static final String rightShiftAssignmentOp = ">>=";
-	static final String unsignedRightShiftAssignmentOp = ">>>=";
-	static final String orAssignmentOp = "|=";
-	static final String andAssignmentOp = "&=";
-	static final String xorAssignmentOp = "^=";
-	static final String prefixPlusPlusOp = "++";
-	static final String postfixPlusPlusOp = "++";
-	static final String prefixMinusMinusOp = "--";
-	static final String postfixMinusMinusOp = "--";
-	
-	
-	static final String aInt = "a";
-	static final String bInt = "b";
-	static final String cInt = "c";
-	static final String dInt = "d";
-	static final String eInt = "e";
-	static final String fInt = "f";
-	static final String gInt = "g";
-	static final String hInt = "h";
-	static final String iInt = "i";
-	static final String jInt = "j";
-
-	static final String aString = "aa";
-	static final String bString = "bb";
-	static final String cString = "cc";
-	static final String dString = "dd";
-	static final String eString = "ee";
-	static final String fString = "ff";
-	static final String gString = "gg";
-	static final String hString = "hh";
-	static final String iString = "ii";
-	static final String jString = "jj";
-
-	static final int aIntValue_0 = 1;
-	static final int bIntValue_0 = 2;
-	static final int cIntValue_0 = 3;
-	static final int dIntValue_0 = 4;
-	static final int eIntValue_0 = 5;
-	static final int fIntValue_0 = 6;
-	static final int aIntValue_1 = 1;
-	static final int bIntValue_1 = 2;
-	static final int cIntValue_1 = 37;
-	static final int dIntValue_1 = 48;
-	static final int eIntValue_1 = 5;
-	static final int fIntValue_1 = 6;
-	static final int gIntValue_1 = 7;
-	static final int hIntValue_1 = 8;
-	static final int aIntValue_2 = 1;
-	static final int bIntValue_2 = 2;
-	static final int cIntValue_2 = 379;
-	static final int dIntValue_2 = 480;
-	static final int eIntValue_2 = 59;
-	static final int fIntValue_2 = 60;
-	static final int gIntValue_2 = 7;
-	static final int hIntValue_2 = 8;
-	static final int iIntValue_2 = 9;
-	static final int jIntValue_2 = 0;
-
-
-	static final String aStringValue_0 = "one";
-	static final String bStringValue_0 = "two";
-	static final String cStringValue_0 = "three";
-	static final String dStringValue_0 = "four";
-	static final String eStringValue_0 = "five";
-	static final String fStringValue_0 = "six";
-	static final String aStringValue_1 = "one";
-	static final String bStringValue_1 = "two";
-	static final String cStringValue_1 = "three seven";
-	static final String dStringValue_1 = "four eight";
-	static final String eStringValue_1 = "five";
-	static final String fStringValue_1 = "six";
-	static final String gStringValue_1 = "seven";
-	static final String hStringValue_1 = "eight";
-	static final String aStringValue_2 = "one";
-	static final String bStringValue_2 = "two";
-	static final String cStringValue_2 = "three seven nine";
-	static final String dStringValue_2 = "four eight zero";
-	static final String eStringValue_2 = "five nine";
-	static final String fStringValue_2 = "six zero";
-	static final String gStringValue_2 = "seven";
-	static final String hStringValue_2 = "eight";
-	static final String iStringValue_2 = "nine";
-	static final String jStringValue_2 = "zero";
-	
-	static final String EMPTY= "";
-	static final String THIS= "this.";
-	static final String T_T= "EvalNestedTypeTests.";
-	static final String T_T_A= T_T + "A.";
-	static final String T_A= "A.";
-	static final String T_T_A_AA= T_T_A + "AA.";
-	static final String T_A_AA= T_A + "AA.";
-	static final String T_AA= "AA.";
-	static final String T_T_A_AB= T_T_A + "AB.";
-	static final String T_A_AB= T_A + "AB.";
-	static final String T_AB= "AB.";
-	static final String T_T_B= T_T + "B.";
-	static final String T_B= "B.";
-	static final String T_T_B_BB= T_T_B + "BB.";
-	static final String T_B_BB= T_B + "BB.";
-	static final String T_BB= "BB.";
-	static final String T_C= "C.";
-	static final String T_E= "E.";
-
-	static final String T_T_this= T_T + "this.";
-	static final String T_T_A_this= T_T_A + "this.";
-	static final String T_A_this= T_A + "this.";
-	static final String T_B_this= T_B + "this.";
-	static final String T_C_this= T_C + "this.";
-	static final String T_E_this= T_E + "this.";
-
-	static final String I_A= "i_a.";
-	static final String I_AA= "i_aa.";
-	static final String I_AB= "i_ab.";
-	static final String I_AC= "i_ac.";
-	static final String I_AD= "i_ad.";
-	static final String I_AE= "i_ae.";
-	static final String I_AF= "i_af.";
-	static final String I_B= "i_b.";
-	static final String I_BB= "i_bb.";
-	static final String I_BC= "i_bc.";
-	static final String I_BD= "i_bd.";
-	static final String I_C= "i_c.";
-	static final String I_CB= "i_cb.";
-	static final String I_CC= "i_cc.";
-	static final String I_CD= "i_cd.";
-	static final String I_D= "i_d.";
-	static final String I_DB= "i_db.";
-	static final String I_DC= "i_dc.";
-	static final String I_DD= "i_dd.";
-	static final String I_E= "i_e.";
-	static final String I_EB= "i_eb.";
-	static final String I_EC= "i_ec.";
-	static final String I_ED= "i_ed.";
-	static final String I_F= "i_f.";
-	static final String I_FB= "i_fb.";
-	static final String I_FC= "i_fc.";
-	static final String I_FD= "i_fd.";
-	
-
-	/**
-	 * Constructor for Tests.
-	 * @param name
-	 */
-	public Tests(String name) {
-		super(name);
-	}
-
-	static protected IJavaThread fSuspendeeThread;
-	
-	static protected IJavaStackFrame fFrame;
-	
-	static protected ICompilationUnit fCu;
-	
-	static protected IEvaluationEngine fEngine;
-	
-
-	static protected IValue eval(String command) {
-		
-		class Listener implements IEvaluationListener {
-			IEvaluationResult fResult;
-			
-			public void evaluationComplete(IEvaluationResult result) {
-				fResult= result;
-			}
-			
-			public IEvaluationResult getResult() {
-				return fResult;
-			}
-		}
-		Listener listener= new Listener();
-		try {
-			fEngine.evaluate(command, fFrame, listener, DebugEvent.EVALUATION_IMPLICIT, false);
-		} catch (DebugException e) {
-			e.printStackTrace();
-		}
-		while (listener.fResult == null) {
-			try {
-				Thread.sleep(100);
-			} catch(InterruptedException e) {
-			}
-		}
-		IEvaluationResult result= listener.getResult();
-		if (result.hasErrors()) {
-			String message;
-			DebugException exception= result.getException();
-			if (exception == null) {
-				message= "";
-				String[] messages= result.getErrorMessages();
-				for (int i= 0, limit= messages.length; i < limit; i++) {
-					message += messages[i] + ", ";
-				}
-			} else {
-				message= exception.getStatus().getMessage();
-			}
-			assertTrue(message, false);
-		}
-		return result.getValue();
-	}
-	
-	protected void initializeFrame(String testClass, int breakPointLine, int numberFrames) throws Exception {
-		fFrame = getStackFrame(breakPointLine, numberFrames, 0, 0, testClass);
-
-		fEngine = getEvaluationEngine((IJavaDebugTarget)fFrame.getDebugTarget(), getJavaProject());
-	}
-	
-	protected void initializeFrame(String testClass, int breakPointLine, int numberFrames, int hitCount) throws Exception {
-		fFrame = getStackFrame(breakPointLine, numberFrames, 0, hitCount, testClass);
-
-		fEngine = getEvaluationEngine((IJavaDebugTarget)fFrame.getDebugTarget(), getJavaProject());
-	}
-	
-	protected void destroyFrame() throws Exception {
-		try {
-			terminateAndRemove(fSuspendeeThread);
-		} finally {
-			removeAllBreakpoints();
-			if (fEngine != null) {
-				fEngine.dispose();
-			}
-		}
-		fFrame = null;
-	}
-	
-	
-	protected IEvaluationEngine getEvaluationEngine(IJavaDebugTarget vm, IJavaProject project) {
-		IEvaluationEngine engine = EvaluationManager.newAstEvaluationEngine(project, vm);
-		return engine;
-	}		
-	
-	protected IJavaStackFrame getStackFrame(int breakpointLine, int numberFrames, int frameNumber, int hitCount, String testClass) throws Exception {
-		IJavaLineBreakpoint breakpoint= createLineBreakpoint(breakpointLine, testClass);
-		breakpoint.setHitCount(hitCount);
-		fSuspendeeThread= launchToLineBreakpoint(testClass, breakpoint);
-		IStackFrame[] stackFrames= fSuspendeeThread.getStackFrames();
-		assertEquals("Should be " + numberFrames + " stack frame children, was: " + stackFrames.length, numberFrames, stackFrames.length);
-		IStackFrame stackFrame= stackFrames[frameNumber];
-		return (IJavaStackFrame)stackFrame;
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
deleted file mode 100644
index 93cbe54..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsArrays extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsArrays(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalArrayTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testIntArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[0], intValue);
-
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[1], intValue);
-
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xArrayIntValue[2], intValue);
-
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[0], intValue);
-
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[1], intValue);
-
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yArrayIntValue[2], intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", xArrayIntValue.length, intValue);
-
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", yArrayIntValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + "[0]" + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xArrayInt + "[1]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(xArrayInt + "[2]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[0]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + "[1]" + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yArrayInt + "[2]" + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		int intValue = 0;
-		value = eval(xArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 2, intValue);
-		value = eval(xArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(xArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yArrayInt + equalOp + "new int[]{" + xInt + ", " + yInt + ", " + xInt + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array assignment : wrong type : ", "int[]", typeName);
-		value = eval(yArrayInt + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array length : wrong result : ", 3, intValue);
-		value = eval(yArrayInt + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		value = eval(yArrayInt + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", yIntValue, intValue);
-		value = eval(yArrayInt + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("int array value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int array value : wrong result : ", xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayValue() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[0], stringValue);
-
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[1], stringValue);
-
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xArrayStringValue[2], stringValue);
-
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[0], stringValue);
-
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[1], stringValue);
-
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yArrayStringValue[2], stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayLength() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + ".length");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", xArrayStringValue.length, intValue);
-
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", yArrayStringValue.length, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayAssignment() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + "[0]" + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xArrayString + "[1]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(xArrayString + "[2]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[0]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + "[1]" + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yArrayString + "[2]" + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringArrayAllocation() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + "}");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		int intValue = 0;
-		java.lang.String stringValue = yStringValue;
-		value = eval(xArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 2, intValue);
-		value = eval(xArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(xArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yArrayString + equalOp + "new java.lang.String[]{" + xString + ", " + yString + ", " + xString + "}");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array assignment : wrong type : ", "java.lang.String[]", typeName);
-		value = eval(yArrayString + ".length");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array length : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("java.lang.String array length : wrong result : ", 3, intValue);
-		value = eval(yArrayString + "[0]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		value = eval(yArrayString + "[1]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", yStringValue, stringValue);
-		value = eval(yArrayString + "[2]");
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String array value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String array value : wrong result : ", xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
deleted file mode 100644
index 7cc1b53..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsNestedTypes1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNestedTypes1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 252, 4, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("a : wrong result : ", aIntValue_2, intValue);
-
-		value = eval(aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("a : wrong result : ", aStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("d : wrong result : ", dIntValue_2, intValue);
-
-		value = eval(dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("d : wrong result : ", dStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("e : wrong result : ", eIntValue_2, intValue);
-
-		value = eval(eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("e : wrong result : ", eStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("h : wrong result : ", hIntValue_2, intValue);
-
-		value = eval(hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("h : wrong result : ", hStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(THIS + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(THIS + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_this_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(THIS + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(THIS + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_BB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_BB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_BB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_BB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_BB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_BB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_c : wrong result : ", cIntValue_1, intValue);
-
-		value = eval(T_B_this + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_c : wrong result : ", cStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_this_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_this + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_this_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_B_this + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_this_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_this_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_a() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + aInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_a : wrong result : ", aIntValue_0, intValue);
-
-		value = eval(T_T_this + aString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_a : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_a : wrong result : ", aStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_d : wrong result : ", dIntValue_0, intValue);
-
-		value = eval(T_T_this + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_d : wrong result : ", dStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_this_e() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_this + eInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_this_e : wrong result : ", eIntValue_0, intValue);
-
-		value = eval(T_T_this + eString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_this_e : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_this_e : wrong result : ", eStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
deleted file mode 100644
index 68586c1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsNestedTypes2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNestedTypes2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 739, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("f : wrong result : ", fIntValue_0, intValue);
-
-		value = eval(fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("f : wrong result : ", fStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_b() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T + bInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_b : wrong result : ", bIntValue_0, intValue);
-
-		value = eval(T_T + bString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_b : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_b : wrong result : ", bStringValue_0, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_A + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_A_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_A_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_A_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_A_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_A_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_A_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_A_AB_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_A_AB + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_A_AB_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(T_A_AB + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_A_AB_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_A_AB_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(T_T_B + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_d() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B + dInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_d : wrong result : ", dIntValue_1, intValue);
-
-		value = eval(T_B + dString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_d : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_d : wrong result : ", dStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_T_B_BB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(T_B_BB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("T_B_BB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(T_B_BB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("T_B_BB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("T_B_BB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_A_h() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_A + hInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_A_h : wrong result : ", hIntValue_1, intValue);
-
-		value = eval(I_A + hString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_A_h : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_A_h : wrong result : ", hStringValue_1, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AA + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AA + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AA_j() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AA + jInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AA_j : wrong result : ", jIntValue_2, intValue);
-
-		value = eval(I_AA + jString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AA_j : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AA_j : wrong result : ", jStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_c() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + cInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_c : wrong result : ", cIntValue_2, intValue);
-
-		value = eval(I_AB + cString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_c : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_c : wrong result : ", cStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + fInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_f : wrong result : ", fIntValue_2, intValue);
-
-		value = eval(I_AB + fString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_f : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_f : wrong result : ", fStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_I_AB_i() throws Throwable {
-		try {
-		init();
-		IValue value = eval(I_AB + iInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("I_AB_i : wrong result : ", iIntValue_2, intValue);
-
-		value = eval(I_AB + iString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("I_AB_i : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("I_AB_i : wrong result : ", iStringValue_2, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
deleted file mode 100644
index c20b366..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
+++ /dev/null
@@ -1,709 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-public class TestsNumberLiteral extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNumberLiteral(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void test0() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0 : wrong result : ", 0, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test00() throws Throwable {
-		try {
-		init();
-		IValue value = eval("00");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("00 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("00 : wrong result : ", 00, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x0() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x0");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x0 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x0 : wrong result : ", 0x0, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testN1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-1");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("-1 : wrong result : ", -1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test2147483647() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2147483647");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2147483647 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("2147483647 : wrong result : ", 2147483647, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testN2147483648() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-2147483648");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-2147483648 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("-2147483648 : wrong result : ", -2147483648, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x7fffffff() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x7fffffff");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x7fffffff : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x7fffffff : wrong result : ", 0x7fffffff, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x80000000() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x80000000");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x80000000 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x80000000 : wrong result : ", 0x80000000, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0xffffffff() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xffffffff");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xffffffff : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0xffffffff : wrong result : ", 0xffffffff, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test017777777777() throws Throwable {
-		try {
-		init();
-		IValue value = eval("017777777777");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("017777777777 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("017777777777 : wrong result : ", 017777777777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test020000000000() throws Throwable {
-		try {
-		init();
-		IValue value = eval("020000000000");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("020000000000 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("020000000000 : wrong result : ", 020000000000, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test037777777777() throws Throwable {
-		try {
-		init();
-		IValue value = eval("037777777777");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("037777777777 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("037777777777 : wrong result : ", 037777777777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0372() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0372");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0372 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0372 : wrong result : ", 0372, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0xDadaCafe() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xDadaCafe");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xDadaCafe : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0xDadaCafe : wrong result : ", 0xDadaCafe, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1996() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1996");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1996 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("1996 : wrong result : ", 1996, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x00FF00FF() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x00FF00FF");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x00FF00FF : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("0x00FF00FF : wrong result : ", 0x00FF00FF, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0L : wrong result : ", 0L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test00L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("00L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("00L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("00L : wrong result : ", 00L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x0L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x0L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x0L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x0L : wrong result : ", 0x0L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testN1L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-1L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-1L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("-1L : wrong result : ", -1L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("1L : wrong result : ", 1L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test9223372036854775807L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("9223372036854775807L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("9223372036854775807L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("9223372036854775807L : wrong result : ", 9223372036854775807L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testN9223372036854775808L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("-9223372036854775808L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("-9223372036854775808L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("-9223372036854775808L : wrong result : ", -9223372036854775808L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x7fffffffffffffffL() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x7fffffffffffffffL");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x7fffffffffffffffL : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x7fffffffffffffffL : wrong result : ", 0x7fffffffffffffffL, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x8000000000000000L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x8000000000000000L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x8000000000000000L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x8000000000000000L : wrong result : ", 0x8000000000000000L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0xffffffffffffffffL() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xffffffffffffffffL");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xffffffffffffffffL : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0xffffffffffffffffL : wrong result : ", 0xffffffffffffffffL, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0777777777777777777777L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0777777777777777777777L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0777777777777777777777L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0777777777777777777777L : wrong result : ", 0777777777777777777777L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test01000000000000000000000L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("01000000000000000000000L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("01000000000000000000000L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("01000000000000000000000L : wrong result : ", 01000000000000000000000L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test01777777777777777777777L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("01777777777777777777777L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("01777777777777777777777L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("01777777777777777777777L : wrong result : ", 01777777777777777777777L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0777l() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0777l");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0777l : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0777l : wrong result : ", 0777l, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0x100000000L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0x100000000L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0x100000000L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0x100000000L : wrong result : ", 0x100000000L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test2147483648L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2147483648L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2147483648L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("2147483648L : wrong result : ", 2147483648L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0xC0B0L() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0xC0B0L");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0xC0B0L : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("0xC0B0L : wrong result : ", 0xC0B0L, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void test3_40282347eP38f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("3.40282347e+38f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("3.40282347e+38f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("3.40282347e+38f : wrong result : ", 3.40282347e+38f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1_40239846eN45f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1.40239846e-45f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1.40239846e-45f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("1.40239846e-45f : wrong result : ", 1.40239846e-45f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1e1f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e1f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e1f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("1e1f : wrong result : ", 1e1f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test2_f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2.f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2.f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("2.f : wrong result : ", 2.f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test_3f() throws Throwable {
-		try {
-		init();
-		IValue value = eval(".3f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals(".3f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals(".3f : wrong result : ", .3f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("0f : wrong result : ", 0f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test3_14f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("3.14f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("3.14f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("3.14f : wrong result : ", 3.14f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test6_022137eP23f() throws Throwable {
-		try {
-		init();
-		IValue value = eval("6.022137e+23f");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("6.022137e+23f : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("6.022137e+23f : wrong result : ", 6.022137e+23f, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1_79769313486231570eP308() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1.79769313486231570e+308");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1.79769313486231570e+308 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1.79769313486231570e+308 : wrong result : ", 1.79769313486231570e+308, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test4_94065645841246544eN324() throws Throwable {
-		try {
-		init();
-		IValue value = eval("4.94065645841246544e-324");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("4.94065645841246544e-324 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("4.94065645841246544e-324 : wrong result : ", 4.94065645841246544e-324, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1e1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e1");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e1 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1e1 : wrong result : ", 1e1, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test2_() throws Throwable {
-		try {
-		init();
-		IValue value = eval("2.");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("2. : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("2. : wrong result : ", 2., doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test_3() throws Throwable {
-		try {
-		init();
-		IValue value = eval(".3");
-		String typeName = value.getReferenceTypeName();
-		assertEquals(".3 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals(".3 : wrong result : ", .3, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test0_0() throws Throwable {
-		try {
-		init();
-		IValue value = eval("0.0");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("0.0 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("0.0 : wrong result : ", 0.0, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test3_14() throws Throwable {
-		try {
-		init();
-		IValue value = eval("3.14");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("3.14 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("3.14 : wrong result : ", 3.14, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1eN9d() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e-9d");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e-9d : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1e-9d : wrong result : ", 1e-9d, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void test1e137() throws Throwable {
-		try {
-		init();
-		IValue value = eval("1e137");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("1e137 : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("1e137 : wrong result : ", 1e137, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
deleted file mode 100644
index 915500f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsOperators1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsOperators1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testIntPlusInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xInt + plusOp + yInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", xIntValue + yIntValue, intValue);
-
-		value = eval(yInt + plusOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plus int : wrong result : ", yIntValue + xIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xString + plusOp + yString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", xStringValue + yStringValue, stringValue);
-
-		value = eval(yString + plusOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plus java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plus java.lang.String : wrong result : ", yStringValue + xStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xVarIntValue, intValue);
-
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yVarIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xVarStringValue, stringValue);
-
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yVarStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
deleted file mode 100644
index 7395651..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class TestsOperators2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsOperators2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 37, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testInt() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarInt + equalOp +xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(xVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", xIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", xIntValue, intValue);
-
-		value = eval(yVarInt + equalOp +yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable assignment : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable assignment : wrong result : ", yIntValue, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", yIntValue, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testString() throws Throwable {
-		try {
-		init();
-		IValue value = eval(xVarString + equalOp +xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(xVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", xStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", xStringValue, stringValue);
-
-		value = eval(yVarString + equalOp +yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable assignment : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable assignment : wrong result : ", yStringValue, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", yStringValue, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testIntPlusAssignmentInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		tmpxVar += xIntValue;
-		IValue value = eval(xVarInt + plusAssignmentOp + xInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		tmpxVar += yIntValue;
-		value = eval(xVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		tmpyVar += xIntValue;
-		value = eval(yVarInt + plusAssignmentOp + xInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-
-		tmpyVar += yIntValue;
-		value = eval(yVarInt + plusAssignmentOp + yInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int plusAssignment int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int plusAssignment int : wrong result : ", tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testStringPlusAssignmentString() throws Throwable {
-		try {
-		init();
-		java.lang.String tmpxVar = xVarStringValue;
-		tmpxVar += xStringValue;
-		IValue value = eval(xVarString + plusAssignmentOp + xString);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		String stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		tmpxVar += yStringValue;
-		value = eval(xVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpxVar, stringValue);
-		value = eval(xVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpxVar, stringValue);
-
-		java.lang.String tmpyVar = yVarStringValue;
-		tmpyVar += xStringValue;
-		value = eval(yVarString + plusAssignmentOp + xString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-
-		tmpyVar += yStringValue;
-		value = eval(yVarString + plusAssignmentOp + yString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String plusAssignment java.lang.String : wrong result : ", tmpyVar, stringValue);
-		value = eval(yVarString);
-		typeName = value.getReferenceTypeName();
-		assertEquals("java.lang.String local variable value : wrong type : ", "java.lang.String", typeName);
-		stringValue = ((JDIObjectValue)value).getValueString();
-		assertEquals("java.lang.String local variable value : wrong result : ", tmpyVar, stringValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
deleted file mode 100644
index b3eaae6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-public class TestsTypeHierarchy1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsTypeHierarchy1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 146, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_iaa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iaa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iaa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iaa.m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m6 : wrong result : ", 666, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s6 : wrong result : ", 777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
deleted file mode 100644
index 39468cb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-import org.eclipse.debug.core.model.IValue;
-public class TestsTypeHierarchy2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsTypeHierarchy2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 119, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 999, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 888, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m5 : wrong result : ", 555, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m6 : wrong result : ", 666, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s6 : wrong result : ", 777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m4 : wrong result : ", 44, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java
deleted file mode 100644
index fd21425..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_119_1.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_119_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_119_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 119, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 999, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 888, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m5 : wrong result : ", 555, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m6 : wrong result : ", 666, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s6 : wrong result : ", 777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m4 : wrong result : ", 44, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java
deleted file mode 100644
index 73891d1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_146_1.java
+++ /dev/null
@@ -1,787 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_146_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_146_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 146, 1, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_iaa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iaa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iaa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iaa.m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_iab_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iab.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iab.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iab.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_iac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("iac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("iac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("iac.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_aa_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("aa.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("aa.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("aa.s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ab_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ab.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ab.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ab.s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ac_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ac.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ac.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ac.s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibb.m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_ibc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("ibc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("ibc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("ibc.m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.m4 : wrong result : ", 44, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bb_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bb.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bb.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bb.s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_bc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("bc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("bc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("bc.s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_icc_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("icc.m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("icc.m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("icc.m5 : wrong result : ", 555, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s2 : wrong result : ", 999, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s4 : wrong result : ", 888, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m5 : wrong result : ", 555, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.m6 : wrong result : ", 666, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_cc_s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("cc.s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("cc.s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("cc.s6 : wrong result : ", 777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_A___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new A().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new A().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new A().s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().m4 : wrong result : ", 44, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_B___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new B().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new B().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new B().s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s2 : wrong result : ", 999, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s4 : wrong result : ", 888, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m5() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m5()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m5 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m5 : wrong result : ", 555, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___m6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().m6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().m6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().m6 : wrong result : ", 666, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_new_C___s6() throws Throwable {
-		try {
-		init();
-		IValue value = eval("new C().s6()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("new C().s6 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("new C().s6 : wrong result : ", 777, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java
deleted file mode 100644
index 66fcdfb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_1.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java
deleted file mode 100644
index a46a805..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_2.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java
deleted file mode 100644
index 6513de7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_3.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_3(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java
deleted file mode 100644
index 3954994..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_4.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_4 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_4(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 4);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java
deleted file mode 100644
index 70fddb1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_5.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_5 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_5(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 5);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java
deleted file mode 100644
index 1df5827..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_32_6.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_32_6 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_32_6(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 32, 2, 6);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 9, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java
deleted file mode 100644
index 3bc0d5b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_1.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_68_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_68_1(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 11, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 22, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 33, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 44, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java
deleted file mode 100644
index 5cdad0e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_2.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_68_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_68_2(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 2);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java
deleted file mode 100644
index 6a43401..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_68_3.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_68_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_68_3(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalTypeHierarchyTests", 68, 2, 3);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	public void testEvalNestedTypeTest_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m1 : wrong result : ", 111, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m2 : wrong result : ", 222, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s2 : wrong result : ", 99, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m3() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m3()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m3 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m3 : wrong result : ", 333, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_m4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("m4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("m4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("m4 : wrong result : ", 444, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_s4() throws Throwable {
-		try {
-		init();
-		IValue value = eval("s4()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("s4 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("s4 : wrong result : ", 88, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m1() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m1()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m1 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m1 : wrong result : ", 1, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testEvalNestedTypeTest_super_m2() throws Throwable {
-		try {
-		init();
-		IValue value = eval("super.m2()");
-		String typeName = value.getReferenceTypeName();
-		assertEquals("super.m2 : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("super.m2 : wrong result : ", 2, intValue);
-		} finally {
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java
deleted file mode 100644
index a2d495f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/VariableDeclarationTests.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIArrayValue;
-import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;
-
-public class VariableDeclarationTests extends Tests {
-
-	public VariableDeclarationTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",15,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// int
-	public void testInt() throws Throwable {
-		try {
-			init();
-			IValue value = eval("int i= 3; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-			assertEquals("int : wrong result : ", 3, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.lang.String
-	public void testString() throws Throwable {
-		try {
-			init();
-			IValue value = eval("String i= \"test\"; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.lang.String : wrong type : ", "java.lang.String", typeName);
-			String stringValue = ((JDIObjectValue)value).getValueString();
-			assertEquals("java.lang.String : wrong result : ", "test", stringValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.util.ArrayList
-	public void testArrayList() throws Throwable {
-		try {
-			init();
-			IValue value = eval("java.util.ArrayList i= new java.util.ArrayList(); return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.util.ArrayList : wrong type : ", "java.util.ArrayList", typeName);
-		} finally {
-			end();
-		}
-	}
-
-	// int[]
-	public void testIntTab() throws Throwable {
-		try {
-			init();
-			IValue value = eval("int[] i= new int[] {3,2}; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("int[] : wrong type : ", "int[]", typeName);
-			IValue cellValue = ((JDIArrayValue)value).getValue(0);
-			typeName = cellValue.getReferenceTypeName();
-			assertEquals("int[] : wrong type : ", "int", typeName);
-			int intValue = ((IJavaPrimitiveValue)cellValue).getIntValue();
-			assertEquals("int[] : wrong result : ", 3, intValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.lang.String[]
-	public void testStringTab() throws Throwable {
-		try {
-			init();
-			IValue value = eval("String[] i= new String[] {\"test1\",\"test2\"}; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.lang.String[] : wrong type : ", "java.lang.String[]", typeName);
-			IValue cellValue = ((JDIArrayValue)value).getValue(0);
-			typeName = cellValue.getReferenceTypeName();
-			assertEquals("java.lang.String[] : wrong type : ", "java.lang.String", typeName);
-			String stringValue = ((JDIObjectValue)cellValue).getValueString();
-			assertEquals("java.lang.String[] : wrong result : ", "test1", stringValue);
-		} finally {
-			end();
-		}
-	}
-
-	// java.util.ArrayList[]
-	public void testArrayListTab() throws Throwable {
-		try {
-			init();
-			IValue value = eval("java.util.ArrayList[] i= new java.util.ArrayList[] {new java.util.ArrayList(), new java.util.ArrayList()}; return i;");
-			String typeName = value.getReferenceTypeName();
-			assertEquals("java.util.ArrayList[] : wrong type : ", "java.util.ArrayList[]", typeName);
-			IValue cellValue = ((JDIArrayValue)value).getValue(0);
-			typeName = cellValue.getReferenceTypeName();
-			assertEquals("java.util.ArrayList[] : wrong type : ", "java.util.ArrayList", typeName);
-		} finally {
-			end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
deleted file mode 100644
index 800d623..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
+++ /dev/null
@@ -1,920 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class XfixOperatorsTests extends Tests {
-
-	public XfixOperatorsTests(String arg) {
-		super(arg);
-	}
-
-	protected void init() throws Exception {
-		initializeFrame("EvalSimpleTests",37,1);
-	}
-
-	protected void end() throws Exception {
-		destroyFrame();
-	}
-
-	// {++, --} byte
-	// byte {++, --}
-
-	public void testPrefixPlusPlusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(prefixPlusPlusOp + xVarByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixPlusPlus byte : wrong result : ", ++tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(prefixPlusPlusOp + yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixPlusPlus byte : wrong result : ", ++tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(prefixMinusMinusOp + xVarByte);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus byte : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixMinusMinus byte : wrong result : ", --tmpxVar, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(prefixMinusMinusOp + yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus byte : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("prefixMinusMinus byte : wrong result : ", --tmpyVar, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(xVarByte + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixPlusPlus : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixPlusPlus : wrong result : ", tmpxVar++, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(yVarByte + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixPlusPlus : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixPlusPlus : wrong result : ", tmpyVar++, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusByte() throws Throwable {
-		try {
-		init();
-		byte tmpxVar = xVarByteValue;
-		IValue value = eval(xVarByte + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixMinusMinus : wrong type : ", "byte", typeName);
-		byte byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixMinusMinus : wrong result : ", tmpxVar--, byteValue);
-		value = eval(xVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpxVar, byteValue);
-
-		byte tmpyVar = yVarByteValue;
-		value = eval(yVarByte + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte postfixMinusMinus : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte postfixMinusMinus : wrong result : ", tmpyVar--, byteValue);
-		value = eval(yVarByte);
-		typeName = value.getReferenceTypeName();
-		assertEquals("byte local variable value : wrong type : ", "byte", typeName);
-		byteValue = ((IJavaPrimitiveValue)value).getByteValue();
-		assertEquals("byte local variable value : wrong result : ", tmpyVar, byteValue);
-		} finally {
-		end();
-		}
-	}
-
-	// {++, --} char
-	// char {++, --}
-
-	public void testPrefixPlusPlusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(prefixPlusPlusOp + xVarChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixPlusPlus char : wrong result : ", ++tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(prefixPlusPlusOp + yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixPlusPlus char : wrong result : ", ++tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(prefixMinusMinusOp + xVarChar);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus char : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixMinusMinus char : wrong result : ", --tmpxVar, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(prefixMinusMinusOp + yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus char : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("prefixMinusMinus char : wrong result : ", --tmpyVar, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(xVarChar + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char postfixPlusPlus : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixPlusPlus : wrong result : ", tmpxVar++, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(yVarChar + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char postfixPlusPlus : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixPlusPlus : wrong result : ", tmpyVar++, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusChar() throws Throwable {
-		try {
-		init();
-		char tmpxVar = xVarCharValue;
-		IValue value = eval(xVarChar + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("char postfixMinusMinus : wrong type : ", "char", typeName);
-		char charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixMinusMinus : wrong result : ", tmpxVar--, charValue);
-		value = eval(xVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpxVar, charValue);
-
-		char tmpyVar = yVarCharValue;
-		value = eval(yVarChar + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char postfixMinusMinus : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char postfixMinusMinus : wrong result : ", tmpyVar--, charValue);
-		value = eval(yVarChar);
-		typeName = value.getReferenceTypeName();
-		assertEquals("char local variable value : wrong type : ", "char", typeName);
-		charValue = ((IJavaPrimitiveValue)value).getCharValue();
-		assertEquals("char local variable value : wrong result : ", tmpyVar, charValue);
-		} finally {
-		end();
-		}
-	}
-
-	// {++, --} short
-	// short {++, --}
-
-	public void testPrefixPlusPlusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(prefixPlusPlusOp + xVarShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixPlusPlus short : wrong result : ", ++tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(prefixPlusPlusOp + yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixPlusPlus short : wrong result : ", ++tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(prefixMinusMinusOp + xVarShort);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus short : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixMinusMinus short : wrong result : ", --tmpxVar, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(prefixMinusMinusOp + yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus short : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("prefixMinusMinus short : wrong result : ", --tmpyVar, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(xVarShort + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short postfixPlusPlus : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixPlusPlus : wrong result : ", tmpxVar++, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(yVarShort + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short postfixPlusPlus : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixPlusPlus : wrong result : ", tmpyVar++, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusShort() throws Throwable {
-		try {
-		init();
-		short tmpxVar = xVarShortValue;
-		IValue value = eval(xVarShort + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("short postfixMinusMinus : wrong type : ", "short", typeName);
-		short shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixMinusMinus : wrong result : ", tmpxVar--, shortValue);
-		value = eval(xVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpxVar, shortValue);
-
-		short tmpyVar = yVarShortValue;
-		value = eval(yVarShort + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short postfixMinusMinus : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short postfixMinusMinus : wrong result : ", tmpyVar--, shortValue);
-		value = eval(yVarShort);
-		typeName = value.getReferenceTypeName();
-		assertEquals("short local variable value : wrong type : ", "short", typeName);
-		shortValue = ((IJavaPrimitiveValue)value).getShortValue();
-		assertEquals("short local variable value : wrong result : ", tmpyVar, shortValue);
-		} finally {
-		end();
-		}
-	}
-
-	// {++, --} int
-	// int {++, --}
-
-	public void testPrefixPlusPlusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(prefixPlusPlusOp + xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixPlusPlus int : wrong result : ", ++tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(prefixPlusPlusOp + yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixPlusPlus int : wrong result : ", ++tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(prefixMinusMinusOp + xVarInt);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus int : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixMinusMinus int : wrong result : ", --tmpxVar, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(prefixMinusMinusOp + yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus int : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("prefixMinusMinus int : wrong result : ", --tmpyVar, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(xVarInt + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int postfixPlusPlus : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixPlusPlus : wrong result : ", tmpxVar++, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(yVarInt + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int postfixPlusPlus : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixPlusPlus : wrong result : ", tmpyVar++, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusInt() throws Throwable {
-		try {
-		init();
-		int tmpxVar = xVarIntValue;
-		IValue value = eval(xVarInt + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("int postfixMinusMinus : wrong type : ", "int", typeName);
-		int intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixMinusMinus : wrong result : ", tmpxVar--, intValue);
-		value = eval(xVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpxVar, intValue);
-
-		int tmpyVar = yVarIntValue;
-		value = eval(yVarInt + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int postfixMinusMinus : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int postfixMinusMinus : wrong result : ", tmpyVar--, intValue);
-		value = eval(yVarInt);
-		typeName = value.getReferenceTypeName();
-		assertEquals("int local variable value : wrong type : ", "int", typeName);
-		intValue = ((IJavaPrimitiveValue)value).getIntValue();
-		assertEquals("int local variable value : wrong result : ", tmpyVar, intValue);
-		} finally {
-		end();
-		}
-	}
-
-	// {++, --} long
-	// long {++, --}
-
-	public void testPrefixPlusPlusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(prefixPlusPlusOp + xVarLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixPlusPlus long : wrong result : ", ++tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(prefixPlusPlusOp + yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixPlusPlus long : wrong result : ", ++tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(prefixMinusMinusOp + xVarLong);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus long : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixMinusMinus long : wrong result : ", --tmpxVar, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(prefixMinusMinusOp + yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus long : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("prefixMinusMinus long : wrong result : ", --tmpyVar, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(xVarLong + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long postfixPlusPlus : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixPlusPlus : wrong result : ", tmpxVar++, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(yVarLong + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long postfixPlusPlus : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixPlusPlus : wrong result : ", tmpyVar++, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusLong() throws Throwable {
-		try {
-		init();
-		long tmpxVar = xVarLongValue;
-		IValue value = eval(xVarLong + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("long postfixMinusMinus : wrong type : ", "long", typeName);
-		long longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixMinusMinus : wrong result : ", tmpxVar--, longValue);
-		value = eval(xVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpxVar, longValue);
-
-		long tmpyVar = yVarLongValue;
-		value = eval(yVarLong + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long postfixMinusMinus : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long postfixMinusMinus : wrong result : ", tmpyVar--, longValue);
-		value = eval(yVarLong);
-		typeName = value.getReferenceTypeName();
-		assertEquals("long local variable value : wrong type : ", "long", typeName);
-		longValue = ((IJavaPrimitiveValue)value).getLongValue();
-		assertEquals("long local variable value : wrong result : ", tmpyVar, longValue);
-		} finally {
-		end();
-		}
-	}
-
-	// {++, --} float
-	// float {++, --}
-
-	public void testPrefixPlusPlusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(prefixPlusPlusOp + xVarFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixPlusPlus float : wrong result : ", ++tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(prefixPlusPlusOp + yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixPlusPlus float : wrong result : ", ++tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(prefixMinusMinusOp + xVarFloat);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus float : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixMinusMinus float : wrong result : ", --tmpxVar, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(prefixMinusMinusOp + yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus float : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("prefixMinusMinus float : wrong result : ", --tmpyVar, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(xVarFloat + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float postfixPlusPlus : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixPlusPlus : wrong result : ", tmpxVar++, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(yVarFloat + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float postfixPlusPlus : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixPlusPlus : wrong result : ", tmpyVar++, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusFloat() throws Throwable {
-		try {
-		init();
-		float tmpxVar = xVarFloatValue;
-		IValue value = eval(xVarFloat + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("float postfixMinusMinus : wrong type : ", "float", typeName);
-		float floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixMinusMinus : wrong result : ", tmpxVar--, floatValue, 0);
-		value = eval(xVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpxVar, floatValue, 0);
-
-		float tmpyVar = yVarFloatValue;
-		value = eval(yVarFloat + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float postfixMinusMinus : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float postfixMinusMinus : wrong result : ", tmpyVar--, floatValue, 0);
-		value = eval(yVarFloat);
-		typeName = value.getReferenceTypeName();
-		assertEquals("float local variable value : wrong type : ", "float", typeName);
-		floatValue = ((IJavaPrimitiveValue)value).getFloatValue();
-		assertEquals("float local variable value : wrong result : ", tmpyVar, floatValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	// {++, --} double
-	// double {++, --}
-
-	public void testPrefixPlusPlusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(prefixPlusPlusOp + xVarDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixPlusPlus double : wrong result : ", ++tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(prefixPlusPlusOp + yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixPlusPlus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixPlusPlus double : wrong result : ", ++tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPrefixMinusMinusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(prefixMinusMinusOp + xVarDouble);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus double : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixMinusMinus double : wrong result : ", --tmpxVar, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(prefixMinusMinusOp + yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("prefixMinusMinus double : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("prefixMinusMinus double : wrong result : ", --tmpyVar, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixPlusPlusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(xVarDouble + postfixPlusPlusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double postfixPlusPlus : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixPlusPlus : wrong result : ", tmpxVar++, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(yVarDouble + postfixPlusPlusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double postfixPlusPlus : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixPlusPlus : wrong result : ", tmpyVar++, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-	public void testPostfixMinusMinusDouble() throws Throwable {
-		try {
-		init();
-		double tmpxVar = xVarDoubleValue;
-		IValue value = eval(xVarDouble + postfixMinusMinusOp);
-		String typeName = value.getReferenceTypeName();
-		assertEquals("double postfixMinusMinus : wrong type : ", "double", typeName);
-		double doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixMinusMinus : wrong result : ", tmpxVar--, doubleValue, 0);
-		value = eval(xVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpxVar, doubleValue, 0);
-
-		double tmpyVar = yVarDoubleValue;
-		value = eval(yVarDouble + postfixMinusMinusOp);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double postfixMinusMinus : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double postfixMinusMinus : wrong result : ", tmpyVar--, doubleValue, 0);
-		value = eval(yVarDouble);
-		typeName = value.getReferenceTypeName();
-		assertEquals("double local variable value : wrong type : ", "double", typeName);
-		doubleValue = ((IJavaPrimitiveValue)value).getDoubleValue();
-		assertEquals("double local variable value : wrong result : ", tmpyVar, doubleValue, 0);
-		} finally {
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
deleted file mode 100644
index 23640fc..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
+++ /dev/null
@@ -1,809 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class NestedTypeTestGenerator extends TestGenerator {
-
-	static final int T_T = 0;
-	static final int T_T_A= 1;
-	static final int T_A= 2;
-	static final int T_T_A_AA= 3;
-	static final int T_A_AA= 4;
-	static final int T_AA= 5;
-	static final int T_T_A_AB= 44;
-	static final int T_A_AB= 45;
-	static final int T_AB= 46;
-	static final int T_T_B= 39;
-	static final int T_B= 40;
-	static final int T_T_B_BB= 41;
-	static final int T_B_BB= 42;
-	static final int T_BB= 43;
-	static final int T_C= -1;
-	static final int T_E= -1;
-
-	static final int T_T_this= 6;
-	static final int T_T_A_this= 7;
-	static final int T_A_this= 8;
-	static final int T_B_this= 9;
-	static final int T_C_this= 10;
-	static final int T_E_this= 11;
-
-	static final int I_A= 12;
-	static final int I_AA= 13;
-	static final int I_AB= 14;
-	static final int I_AC= 15;
-	static final int I_AD= 16;
-	static final int I_AE= 17;
-	static final int I_AF= 18;
-	static final int I_B= 19;
-	static final int I_BB= 20;
-	static final int I_BC= 21;
-	static final int I_BD= 22;
-	static final int I_C= 23;
-	static final int I_CB= 24;
-	static final int I_CC= 25;
-	static final int I_CD= 26;
-	static final int I_D= 27;
-	static final int I_DB= 28;
-	static final int I_DC= 29;
-	static final int I_DD= 30;
-	static final int I_E= 31;
-	static final int I_EB= 32;
-	static final int I_EC= 33;
-	static final int I_ED= 34;
-	static final int I_F= 35;
-	static final int I_FB= 36;
-	static final int I_FC= 37;
-	static final int I_FD= 38;
-
-	static final String[] qualifiers= 
-		{"T_T",     "T_T_A",    "T_A",    "T_T_A_AA", "T_A_AA",   "T_AA",   "T_T_this", "T_T_Athis", "T_A_this", "T_B_this",
-		"T_C_this", "T_E_this", "I_A",    "I_AA",     "I_AB",     "I_AC",   "I_AD",     "I_AE",      "I_AF",     "I_B",
-		"I_BB",     "I_BC",     "I_BD",   "I_C",      "I_CB",     "I_CC",   "I_CD",     "I_D",       "I_DB",     "I_DC",
-		"I_DD",     "I_E",      "I_EB",   "I_EC",     "I_ED",     "I_F",    "I_FB",     "I_FC",      "I_FD",     "T_T_B",
-		"T_B",      "T_T_B_BB", "T_B_BB", "T_BB",     "T_T_A_AB", "T_A_AB", "T_AB"};
-	
-	static final int [] qualifiersLevel=
-		{0, 1, 1, 2, 2, 2, 0, 1, 1, 1,
-		 1, 1, 1, 2, 2, 2, 2, 2, 2, 1,
-		 2, 2, 2, 1, 2, 2, 2, 1, 2, 2,
-		 2, 1, 2, 2, 2, 1, 2, 2, 2, 1,
-		 1, 2, 2, 2, 2, 2, 2};
-
-	public static void main(String[] args) throws Exception {
-		gen_AA_aa();
-		gen_AA_aaStatic();
-		gen_AB_ab();
-		gen_AC_ac();
-		gen_AD_ad();
-		gen_A_a();
-		gen_AE_ae();
-		gen_AF_af();
-		gen_A_aStatic();
-		gen_BB_bb();
-		gen_BC_bc();
-		gen_BD_bd();
-		gen_B_b();
-		gen_CB_cb();
-		gen_CC_cc();
-		gen_CD_cd();
-		gen_C_c();
-		gen_DB_db();
-		gen_DC_dc();
-		gen_DD_dd();
-		gen_D_d();
-		gen_EB_eb();
-		gen_EC_ec();
-		gen_ED_ed();
-		gen_E_e();
-		gen_FB_fb();
-		gen_FC_fc();
-		gen_FD_fd();
-		gen_F_f();
-		gen_evalNestedTypeTest();
-		gen_evalNestedTypeTestStatic();
-		System.out.println("done");
-	}
-	
-	public static void gen_AA_aa() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('c', 2, code);
-		createTest('d', 2, code);
-		createTest('e', 2, code);
-		createTest('f', 2, code);
-		createTest('h', 2, code);
-		createTest('i', 2, code);
-		createTest('j', 2, code);
-		createTestThis('c', 2, code);
-		createTestThis('d', 2, code);
-		createTestThis('e', 2, code);
-		createTestThis('f', 2, code);
-		createTestThis('i', 2, code);
-		createTestThis('j', 2, code);
-		createTestsStaticFields_A(code);
-		
-		createJavaFile(code, 65, 4);
-	}
-	
-	public static void gen_AA_aaStatic() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('d', 2, code);
-		createTest('f', 2, code);
-		createTest('h', 2, code);
-		createTest('j', 2, code);
-		createTestsStaticFields_A(code);
-
-		createJavaFile(code, 69, 4);
-	}
-	
-	public static void gen_AB_ab() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('c', 2, code);
-		createTest('d', 2, code);
-		createTest('e', 2, code);
-		createTest('f', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTest('i', 2, code);
-		createTest('j', 2, code);
-		createTestThis('c', 2, code);
-		createTestThis('d', 2, code);
-		createTestThis('e', 2, code);
-		createTestThis('f', 2, code);
-		createTestThis('i', 2, code);
-		createTestThis('j', 2, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(T_A_this, 'c', code);
-		createTestQualifier(T_A_this, 'd', code);
-		createTestQualifier(T_A_this, 'g', code);
-		createTestQualifier(T_A_this, 'h', code);
-		
-		createJavaFile(code, 94, 4);
-	}
-
-	public static void gen_AC_ac() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(T_A_this, 'c', code);
-		createTestQualifier(T_A_this, 'd', code);
-		createTestQualifier(T_A_this, 'g', code);
-		createTestQualifier(T_A_this, 'h', code);
-		
-		createJavaFile(code, 120, 4);
-	}
-	
-	public static void gen_AD_ad() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(T_A_this, 'c', code);
-		createTestQualifier(T_A_this, 'd', code);
-		createTestQualifier(T_A_this, 'g', code);
-		createTestQualifier(T_A_this, 'h', code);
-		
-		createJavaFile(code, 145, 4);
-	}
-	
-	public static void gen_A_a() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('c', 1, code);
-		createTest('d', 1, code);
-		createTest('f', 1, code);
-		createTest('g', 1, code);
-		createTest('h', 1, code);
-		createTestThis('c', 1, code);
-		createTestThis('d', 1, code);
-		createTestThis('g', 1, code);
-		createTestThis('h', 1, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(I_AB, 'c', code);
-		createTestQualifier(I_AB, 'd', code);
-		createTestQualifier(I_AB, 'e', code);
-		createTestQualifier(I_AB, 'f', code);
-		createTestQualifier(I_AB, 'i', code);
-		createTestQualifier(I_AB, 'j', code);
-		
-		createJavaFile(code, 155, 3);
-	}
-	
-	public static void gen_AE_ae() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		
-		createJavaFile(code, 179, 4);
-	}
-	
-	public static void gen_AF_af() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_A(code);
-		
-		createJavaFile(code, 203, 4);
-	}
-	
-	public static void gen_A_aStatic() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('d', 1, code);
-		createTest('f', 1, code);
-		createTest('h', 1, code);
-		createTestsStaticFields_A(code);
-		createTestQualifier(I_AA, 'c', code);
-		createTestQualifier(I_AA, 'd', code);
-		createTestQualifier(I_AA, 'e', code);
-		createTestQualifier(I_AA, 'f', code);
-		createTestQualifier(I_AA, 'i', code);
-		createTestQualifier(I_AA, 'j', code);
-		
-		createJavaFile(code, 214, 3);
-	}
-	
-	public static void gen_BB_bb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTest('c', 2, code);
-		createTest('d', 2, code);
-		createTest('e', 2, code);
-		createTest('f', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTest('i', 2, code);
-		createTest('j', 2, code);
-		createTestThis('c', 2, code);
-		createTestThis('d', 2, code);
-		createTestThis('e', 2, code);
-		createTestThis('f', 2, code);
-		createTestThis('i', 2, code);
-		createTestThis('j', 2, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_B_this, 'c', code);
-		createTestQualifier(T_B_this, 'd', code);
-		createTestQualifier(T_B_this, 'g', code);
-		createTestQualifier(T_B_this, 'h', code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 252, 4);
-	}
-
-	public static void gen_BC_bc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_B_this, 'c', code);
-		createTestQualifier(T_B_this, 'd', code);
-		createTestQualifier(T_B_this, 'g', code);
-		createTestQualifier(T_B_this, 'h', code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 279, 4);
-	}
-
-	public static void gen_BD_bd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTest('g', 2, code);
-		createTest('h', 2, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_B_this, 'c', code);
-		createTestQualifier(T_B_this, 'd', code);
-		createTestQualifier(T_B_this, 'g', code);
-		createTestQualifier(T_B_this, 'h', code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 304, 4);
-	}
-
-	public static void gen_B_b() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 1, code);
-		createTest('b', 1, code);
-		createTest('c', 1, code);
-		createTest('d', 1, code);
-		createTest('e', 1, code);
-		createTest('f', 1, code);
-		createTest('g', 1, code);
-		createTest('h', 1, code);
-		createTestThis('c', 1, code);
-		createTestThis('d', 1, code);
-		createTestThis('g', 1, code);
-		createTestThis('h', 1, code);
-		createTestsStaticFields_B(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		createTestQualifier(I_BB, 'c', code);
-		createTestQualifier(I_BB, 'd', code);
-		createTestQualifier(I_BB, 'e', code);
-		createTestQualifier(I_BB, 'f', code);
-		createTestQualifier(I_BB, 'i', code);
-		createTestQualifier(I_BB, 'j', code);
-		
-		createJavaFile(code, 315, 3);
-	}
-
-	public static void gen_CB_cb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 354, 4);
-	}
-
-	public static void gen_CC_cc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 381, 4);
-	}
-
-	public static void gen_CD_cd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 406, 4);
-	}
-
-	public static void gen_C_c() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 1, code);
-		createTest('b', 1, code);
-		createTest('e', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 417, 3);
-	}
-
-	public static void gen_DB_db() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 455, 4);
-	}
-
-	public static void gen_DC_dc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 481, 4);
-	}
-
-	public static void gen_DD_dd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 2, code);
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 506, 4);
-	}
-
-	public static void gen_D_d() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('a', 1, code);
-		createTest('b', 1, code);
-		createTest('e', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		createTestQualifier(T_T_this, 'a', code);
-		createTestQualifier(T_T_this, 'b', code);
-		createTestQualifier(T_T_this, 'c', code);
-		createTestQualifier(T_T_this, 'd', code);
-		createTestQualifier(T_T_this, 'e', code);
-		createTestQualifier(T_T_this, 'f', code);
-		
-		createJavaFile(code, 517, 3);
-	}
-	
-	public static void gen_evalNestedTypeTest() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		
-		createTest('a', 0, code);
-		createTest('b', 0, code);
-		createTest('c', 0, code);
-		createTest('d', 0, code);
-		createTest('e', 0, code);
-		createTest('f', 0, code);
-		createTestThis('a', 0, code);
-		createTestThis('b', 0, code);
-		createTestThis('c', 0, code);
-		createTestThis('d', 0, code);
-		createTestThis('e', 0, code);
-		createTestThis('f', 0, code);
-		createTestsStaticFields(code);
-		createTestQualifier(I_B, 'c', code);
-		createTestQualifier(I_B, 'd', code);
-		createTestQualifier(I_B, 'g', code);
-		createTestQualifier(I_B, 'h', code);
-		createTestQualifier(I_BB, 'c', code);
-		createTestQualifier(I_BB, 'd', code);
-		createTestQualifier(I_BB, 'e', code);
-		createTestQualifier(I_BB, 'f', code);
-		createTestQualifier(I_BB, 'i', code);
-		createTestQualifier(I_BB, 'j', code);
-		
-		createJavaFile(code, 529, 2);
-	}
-
-	public static void gen_EB_eb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 566, 4);
-	}
-
-	public static void gen_EC_ec() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 592, 4);
-	}
-
-	public static void gen_ED_ed() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 616, 4);
-	}
-
-	public static void gen_E_e() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 626, 3);
-	}
-	
-	public static void gen_FB_fb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 664, 4);
-	}
-
-	public static void gen_FC_fc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 690, 4);
-	}
-
-	public static void gen_FD_fd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 714, 4);
-	}
-
-	public static void gen_F_f() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 1, code);
-		createTest('f', 1, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 724, 3);
-	}
-	
-	public static void gen_evalNestedTypeTestStatic() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 0, code);
-		createTest('d', 0, code);
-		createTest('f', 0, code);
-		createTestsStaticFields(code);
-		createTestQualifier(I_A, 'c', code);
-		createTestQualifier(I_A, 'd', code);
-		createTestQualifier(I_A, 'g', code);
-		createTestQualifier(I_A, 'h', code);
-		createTestQualifier(I_AA, 'c', code);
-		createTestQualifier(I_AA, 'd', code);
-		createTestQualifier(I_AA, 'e', code);
-		createTestQualifier(I_AA, 'f', code);
-		createTestQualifier(I_AA, 'i', code);
-		createTestQualifier(I_AA, 'j', code);
-		createTestQualifier(I_AB, 'c', code);
-		createTestQualifier(I_AB, 'd', code);
-		createTestQualifier(I_AB, 'e', code);
-		createTestQualifier(I_AB, 'f', code);
-		createTestQualifier(I_AB, 'i', code);
-		createTestQualifier(I_AB, 'j', code);
-		
-		createJavaFile(code, 739, 2);
-	}
-	
-	public static void gen_main() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTestsStaticFields(code);
-
-		createJavaFile(code, 745, 1);
-	}
-
-	// ------------------------------
-	
-	public static void createTestsStaticFields(StringBuffer code) {
-		createTestQualifier(T_T, 'b', code);
-		createTestQualifier(T_T, 'd', code);
-		createTestQualifier(T_T, 'f', code);
-		createTestQualifier(T_T_A, 'd', code);
-		createTestQualifier(T_T_A, 'h', code);
-		createTestQualifier(T_A, 'd', code);
-		createTestQualifier(T_A, 'h', code);
-		createTestQualifier(T_T_A_AA, 'd', code);
-		createTestQualifier(T_T_A_AA, 'f', code);
-		createTestQualifier(T_T_A_AA, 'j', code);
-		createTestQualifier(T_T_A_AB, 'd', code);
-		createTestQualifier(T_T_A_AB, 'f', code);
-		createTestQualifier(T_T_A_AB, 'j', code);
-		createTestQualifier(T_A_AA, 'd', code);
-		createTestQualifier(T_A_AA, 'f', code);
-		createTestQualifier(T_A_AA, 'j', code);
-		createTestQualifier(T_A_AB, 'd', code);
-		createTestQualifier(T_A_AB, 'f', code);
-		createTestQualifier(T_A_AB, 'j', code);
-		createTestQualifier(T_T_B, 'd', code);
-		createTestQualifier(T_T_B, 'h', code);
-		createTestQualifier(T_B, 'd', code);
-		createTestQualifier(T_B, 'h', code);
-		createTestQualifier(T_T_B_BB, 'd', code);
-		createTestQualifier(T_T_B_BB, 'f', code);
-		createTestQualifier(T_T_B_BB, 'j', code);
-		createTestQualifier(T_B_BB, 'd', code);
-		createTestQualifier(T_B_BB, 'f', code);
-		createTestQualifier(T_B_BB, 'j', code);
-	}
-	
-	public static void createTestsStaticFields_A(StringBuffer code) {
-		createTestsStaticFields(code);
-		createTestQualifier(T_AA, 'd', code);
-		createTestQualifier(T_AA, 'f', code);
-		createTestQualifier(T_AA, 'j', code);
-		createTestQualifier(T_AB, 'd', code);
-		createTestQualifier(T_AB, 'f', code);
-		createTestQualifier(T_AB, 'j', code);
-	}
-	
-	public static void createTestsStaticFields_B(StringBuffer code) {
-		createTestsStaticFields(code);
-		createTestQualifier(T_BB, 'd', code);
-		createTestQualifier(T_BB, 'f', code);
-		createTestQualifier(T_BB, 'j', code);
-	}
-	
-	// ------------------------------
-	
-	public static void createTest(char variable, int level, StringBuffer code) {
-		code.append("\tpublic void testEvalNestedTypeTest_" + variable + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("" + variable + "Int", true, code);
-		genCodeReturnTypeCheck("" + variable, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType("" + variable, "int", "Int", variable + "IntValue_" + level, true, code);
-		code.append("\n");
-		
-		genCodeEval("" + variable + "String", false, code);
-		genCodeReturnTypeCheck("" + variable, "java.lang.String", false, code);
-		genCodeReturnValueCheckStringType("" + variable, variable + "StringValue_" + level, true, code);
-		
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void createTestThis(char variable, int level, StringBuffer code) {
-		code.append("\tpublic void testEvalNestedTypeTest_this_" + variable + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("THIS + " + variable + "Int", true, code);
-		genCodeReturnTypeCheck("" + variable, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType("" + variable, "int", "Int", variable + "IntValue_" + level, true, code);
-		code.append("\n");
-		
-		genCodeEval("THIS + " + variable + "String", false, code);
-		genCodeReturnTypeCheck("" + variable, "java.lang.String", false, code);
-		genCodeReturnValueCheckStringType("" + variable, variable + "StringValue_" + level, true, code);
-		
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	
-	
-	public static void createTestQualifier(int qualifier, char variable, StringBuffer code) {
-		String strQualifier= qualifiers[qualifier];
-		code.append("\tpublic void testEvalNestedTypeTest_" + strQualifier + "_" + variable + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval(strQualifier + " + " + variable + "Int", true, code);
-		genCodeReturnTypeCheck("" + strQualifier + "_" + variable, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType("" + strQualifier + "_" + variable, "int", "Int", variable + "IntValue_" + qualifiersLevel[qualifier], true, code);
-		code.append("\n");
-		
-		genCodeEval(strQualifier + " + " + variable + "String", false, code);
-		genCodeReturnTypeCheck("" + strQualifier + "_" + variable, "java.lang.String", false, code);
-		genCodeReturnValueCheckStringType("" + strQualifier + "_" + variable, variable + "StringValue_" + qualifiersLevel[qualifier], true, code);
-		
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	//---------------------
-	
-	public static void createJavaFile(StringBuffer tests, int lineNumber, int numberFrames) throws Exception {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("/*******************************************************************************\n");
-		code.append(" * Copyright (c) 2002, 2003 IBM Corporation and others.\n");
-		code.append(" * All rights reserved. This program and the accompanying materials \n");
-		code.append(" * are made available under the terms of the Eclipse Public License v1.0\n");
-		code.append(" * which accompanies this distribution, and is available at\n");
-		code.append(" * http://www.eclipse.org/legal/epl-v10.html\n");
-		code.append(" * \n");
-		code.append(" * Contributors:\n");
-		code.append(" *     IBM Corporation - initial API and implementation\n");
-		code.append(" *******************************************************************************/\n");
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n\n");
-		code.append("import org.eclipse.debug.core.model.IValue;\n");
-		code.append("import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n\n");
-		code.append("public class NestedTypeFieldValue_" + lineNumber + " extends Tests {\n");
-		code.append("\t/**\n");
-		code.append("\t * Constructor for NestedTypeFieldValue.\n");
-		code.append("\t * @param name\n");
-		code.append("\t */\n");
-		code.append("\tpublic NestedTypeFieldValue_" + lineNumber + "(String name) {\n");
-		code.append("\t\tsuper(name);\n");
-		code.append("\t}\n\n");
-		code.append("\tpublic void init() throws Exception {\n");
-		code.append("\t\tinitializeFrame(\"EvalNestedTypeTests\", " + lineNumber + ", " + numberFrames + ");\n");
-		code.append("\t}\n\n");
-		code.append("\tprotected void end() throws Exception {\n");
-		code.append("\t\tdestroyFrame();\n");
-		code.append("\t}\n\n");
-		
-		code.append(tests.toString());
-		
-		code.append("}\n");
-		
-		Writer file = new FileWriter(new File("NestedTypeFieldValue_" + lineNumber + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
deleted file mode 100644
index 7e0185d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class OtherTestsGenerator extends TestGenerator {
-
-	public static void main(String[] args) throws Exception {
-		
-		genTestsOperators1();
-		genTestsOperators2();
-		genTestsArray();
-		genTestsNestedTypes1();
-		genTestsNestedTypes2();
-		genTestsTypeHierarchy1();
-		genTestsTypeHierarchy2();
-		genTestNumberLiteral();
-		
-		genInstanceOfTests();
-
-		System.out.println("done");
-	}
-
-	public static void genTestsOperators1() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		genTestTypeBinaryOpTypeBinaryPromotion(T_int, Op_plus, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_String, code);
-		genTestLocalVarValue(T_int, code);
-		genTestLocalVarValue(T_String, code);
-		
-		createJavaFile(code, "TestsOperators1", "EvalSimpleTests", 37, 1, 1);
-	}
-
-	public static void genTestsOperators2() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		genTestLocalVarAssignment(T_int, code);
-		genTestLocalVarAssignment(T_String, code);
-		genTestTypeAssignmentOpType(T_int, Op_plusAss, T_int, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_String, code);
-		
-		createJavaFile(code, "TestsOperators2", "EvalSimpleTests", 37, 1, 1);
-	}
-	
-	public static void genTestsArray() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		genTestArrayValue(T_int, code);
-		genTestArrayLength(T_int, code);
-		genTestArrayAssignment(T_int, code);
-		genTestArrayInitialization(T_int, code);
-
-		genTestArrayValue(T_String, code);
-		genTestArrayLength(T_String, code);
-		genTestArrayAssignment(T_String, code);
-		genTestArrayInitialization(T_String, code);
-		
-		createJavaFile(code, "TestsArrays", "EvalArrayTests", 37, 1, 1);
-	}
-
-	public static void genTestsNestedTypes1() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		NestedTypeTestGenerator.createTest('a', 2, code);
-		NestedTypeTestGenerator.createTest('d', 2, code);
-		NestedTypeTestGenerator.createTest('e', 2, code);
-		NestedTypeTestGenerator.createTest('h', 2, code);
-		NestedTypeTestGenerator.createTest('i', 2, code);
-		NestedTypeTestGenerator.createTestThis('c', 2, code);
-		NestedTypeTestGenerator.createTestThis('f', 2, code);
-		NestedTypeTestGenerator.createTestThis('j', 2, code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T, 'b', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AA, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AA, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AB, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_BB, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_this, 'c', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_this, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_this, 'a', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_this, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_this, 'e', code);
-
-		createJavaFile(code, "TestsNestedTypes1", "EvalNestedTypeTests",  252, 4, 1);
-	}
-
-	public static void genTestsNestedTypes2() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		NestedTypeTestGenerator.createTest('f', 0, code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T, 'b', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AA, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_A_AB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AA, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_A_AB, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B, 'd', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.T_B_BB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_A, 'h', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AA, 'c', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AA, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AA, 'j', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AB, 'c', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AB, 'f', code);
-		NestedTypeTestGenerator.createTestQualifier(NestedTypeTestGenerator.I_AB, 'i', code);
-
-		createJavaFile(code, "TestsNestedTypes2", "EvalNestedTypeTests",  739, 2, 1);
-	}
-
-
-	public static void genTestsTypeHierarchy1() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.IAA, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.AA, TypeHierarchyTestsGenerator.M2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.AB, TypeHierarchyTestsGenerator.S2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.AC, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.IBB, TypeHierarchyTestsGenerator.M3, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.IBC, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BB, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BB, TypeHierarchyTestsGenerator.M3, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BC, TypeHierarchyTestsGenerator.S2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.BC, TypeHierarchyTestsGenerator.S4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.ICC, TypeHierarchyTestsGenerator.M3, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.CC, TypeHierarchyTestsGenerator.M2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.CC, TypeHierarchyTestsGenerator.M4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.CC, TypeHierarchyTestsGenerator.M6, code);
-		
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_A, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_B, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_B, TypeHierarchyTestsGenerator.M2, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_B, TypeHierarchyTestsGenerator.S4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_C, TypeHierarchyTestsGenerator.M1, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_C, TypeHierarchyTestsGenerator.M4, code);
-		TypeHierarchyTestsGenerator.createTestQualifier(TypeHierarchyTestsGenerator.N_C, TypeHierarchyTestsGenerator.S6, code);
-
-		createJavaFile(code, "TestsTypeHierarchy1", "EvalTypeHierarchyTests",   146, 1, 1, false);
-	}
-
-	public static void genTestsTypeHierarchy2() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		TypeHierarchyTestsGenerator.createTest_TestC(code, TypeHierarchyTestsGenerator.CC);
-		
-		createJavaFile(code, "TestsTypeHierarchy2", "EvalTypeHierarchyTests",   119, 2, 1, false);
-	}
-
-	/**
-	 * Method genTestNumberLiteral.
-	 */
-	private static void genTestNumberLiteral() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTestNumberLiteral1("0", T_int, code);
-		createTestNumberLiteral1("00", T_int, code);
-		createTestNumberLiteral1("0x0", T_int, code);
-		createTestNumberLiteral1("-1", T_int, code);
-		createTestNumberLiteral1("1", T_int, code);
-		createTestNumberLiteral1("2147483647", T_int, code);
-		createTestNumberLiteral1("-2147483648", T_int, code);
-		createTestNumberLiteral1("0x7fffffff", T_int, code);
-		createTestNumberLiteral1("0x80000000", T_int, code);
-		createTestNumberLiteral1("0xffffffff", T_int, code);
-		createTestNumberLiteral1("017777777777", T_int, code);
-		createTestNumberLiteral1("020000000000", T_int, code);
-		createTestNumberLiteral1("037777777777", T_int, code);
-		createTestNumberLiteral1("2", T_int, code);
-		createTestNumberLiteral1("0372", T_int, code);
-		createTestNumberLiteral1("0xDadaCafe", T_int, code);
-		createTestNumberLiteral1("1996", T_int, code);
-		createTestNumberLiteral1("0x00FF00FF", T_int, code);
-		
-		createTestNumberLiteral1("0L", T_long, code);
-		createTestNumberLiteral1("00L", T_long, code);
-		createTestNumberLiteral1("0x0L", T_long, code);
-		createTestNumberLiteral1("-1L", T_long, code);
-		createTestNumberLiteral1("1L", T_long, code);
-		createTestNumberLiteral1("9223372036854775807L", T_long, code);
-		createTestNumberLiteral1("-9223372036854775808L", T_long, code);
-		createTestNumberLiteral1("0x7fffffffffffffffL", T_long, code);
-		createTestNumberLiteral1("0x8000000000000000L", T_long, code);
-		createTestNumberLiteral1("0xffffffffffffffffL", T_long, code);
-		createTestNumberLiteral1("0777777777777777777777L", T_long, code);
-		createTestNumberLiteral1("01000000000000000000000L", T_long, code);
-		createTestNumberLiteral1("01777777777777777777777L", T_long, code);
-		createTestNumberLiteral1("0777l", T_long, code);
-		createTestNumberLiteral1("0x100000000L", T_long, code);
-		createTestNumberLiteral1("2147483648L", T_long, code);
-		createTestNumberLiteral1("0xC0B0L", T_long, code);
-		
-		createTestNumberLiteral2("3.40282347e+38f", T_float, code);
-		createTestNumberLiteral2("1.40239846e-45f", T_float, code);
-		createTestNumberLiteral2("1e1f", T_float, code);
-		createTestNumberLiteral2("2.f", T_float, code);
-		createTestNumberLiteral2(".3f", T_float, code);
-		createTestNumberLiteral2("0f", T_float, code);
-		createTestNumberLiteral2("3.14f", T_float, code);
-		createTestNumberLiteral2("6.022137e+23f", T_float, code);
-
-		createTestNumberLiteral2("1.79769313486231570e+308", T_double, code);
-		createTestNumberLiteral2("4.94065645841246544e-324", T_double, code);
-		createTestNumberLiteral2("1e1", T_double, code);
-		createTestNumberLiteral2("2.", T_double, code);
-		createTestNumberLiteral2(".3", T_double, code);
-		createTestNumberLiteral2("0.0", T_double, code);
-		createTestNumberLiteral2("3.14", T_double, code);
-		createTestNumberLiteral2("1e-9d", T_double, code);
-		createTestNumberLiteral2("1e137", T_double, code);
-
-		createJavaFile(code, "TestsNumberLiteral", "EvalSimpleTests", 37, 1, 1, false);
-	}
-
-	/**
-	 * Method createTestNumberLiteral.
-	 */
-	private static void createTestNumberLiteral1(String literal, int type, StringBuffer code) {
-		String tName= fTypeName[type];
-		
-		code.append("\tpublic void test" + literal.replace('-', 'N').replace('.', '_').replace('+', 'P') + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeEval("\"" + literal + '"', true, code);
-		genCodeReturnTypeCheck(literal, tName, true, code);
-		genCodeReturnValueCheckPrimitiveType(literal, tName, typeUpperName[type], literal, true, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	/**
-	 * Method createTestNumberLiteral.
-	 */
-	private static void createTestNumberLiteral2(String literal, int type, StringBuffer code) {
-		String tName= fTypeName[type];
-		
-		code.append("\tpublic void test" + literal.replace('-', 'N').replace('.', '_').replace('+', 'P') + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeEval("\"" + literal + '"', true, code);
-		genCodeReturnTypeCheck(literal, tName, true, code);
-		genCodeReturnValueCheckFloatDoubleType(literal, tName, typeUpperName[type], literal, true, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genInstanceOfTests() throws Exception {
-	}
-
-
-	public static void createJavaFile(StringBuffer tests, String className, String testClass, int lineNumber, int numberFrames, int hitCount) throws Exception {
-		createJavaFile(tests, className, testClass, lineNumber, numberFrames, hitCount, true);
-	}
-		
-	public static void createJavaFile(StringBuffer tests, String className, String testClass, int lineNumber, int numberFrames, int hitCount, boolean importJDIObjectValue) throws Exception {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("/*******************************************************************************\n");
-		code.append(" * Copyright (c) 2002, 2003 IBM Corporation and others.\n");
-		code.append(" * All rights reserved. This program and the accompanying materials \n");
-		code.append(" * are made available under the terms of the Eclipse Public License v1.0\n");
-		code.append(" * which accompanies this distribution, and is available at\n");
-		code.append(" * http://www.eclipse.org/legal/epl-v10.html\n");
-		code.append(" * \n");
-		code.append(" * Contributors:\n");
-		code.append(" *     IBM Corporation - initial API and implementation\n");
-		code.append(" *******************************************************************************/\n");
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n\n");
-		code.append("import org.eclipse.debug.core.model.IValue;\n");
-		if (importJDIObjectValue) {
-			code.append("import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n\n");
-		}
-		code.append("public class " + className + " extends Tests {\n");
-		code.append("\t/**\n");
-		code.append("\t * Constructor for TypeHierarchy.\n");
-		code.append("\t * @param name\n");
-		code.append("\t */\n");
-		code.append("\tpublic " + className + "(String name) {\n");
-		code.append("\t\tsuper(name);\n");
-		code.append("\t}\n\n");
-		code.append("\tpublic void init() throws Exception {\n");
-		code.append("\t\tinitializeFrame(\"" + testClass + "\", " + lineNumber + ", " + numberFrames + ", " + hitCount + ");\n");
-		code.append("\t}\n\n");
-		code.append("\tprotected void end() throws Exception {\n");
-		code.append("\t\tdestroyFrame();\n");
-		code.append("\t}\n\n");
-		
-		code.append(tests.toString());
-		
-		code.append("}\n");
-		
-		Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
deleted file mode 100644
index 15762d2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
+++ /dev/null
@@ -1,1435 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class TestGenerator {
-	
-	static protected int getPromotionType(int left, int right) {
-		return fTypeTable[left][right];
-	}
-	
-	static protected int getUnaryPromotionType(int type) {
-		return fTypeTable[type][T_int];
-	}
-	
-	static protected boolean needCast(int type1, int type2) {
-		if (type1 == type2) {
-			return false;
-		}
-		switch (type1) {
-			case T_short:
-			case T_byte:
-				return type1 < type2 || type2 == T_char;
-			case T_char:
-				return true;
-			case T_int:
-				return type2 >= T_long;
-			case T_long:
-				return type2 == T_float || type2 == T_double;
-			case T_float:
-				return type2 == T_double;
-			case T_double:
-				return false;
-			default:
-				return true;
-		}
-	}
-
-	static final int T_undefined = 0;
-	static final int T_object = 1;
-	static final int T_char = 2;
-	static final int T_byte = 3;
-	static final int T_short = 4;
-	static final int T_boolean = 5;
-	static final int T_void = 6;
-	static final int T_long = 7;
-	static final int T_double = 8;
-	static final int T_float = 9;
-	static final int T_int = 10;
-	static final int T_String = 11;
-	static final int T_null = 12;
-	
-	private static final int[][] fTypeTable= {
-/* undefined */	{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined},
-/* object */	{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_String, T_undefined},
-/* char */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* byte */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* short */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* boolean */	{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_boolean, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_String, T_undefined},
-/* void */		{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined},
-/* long */		{T_undefined, T_undefined, T_long, T_long, T_long, T_undefined, T_undefined, T_long, T_double, T_float, T_long, T_String, T_undefined},
-/* double */	{T_undefined, T_undefined, T_double, T_double, T_double, T_undefined, T_undefined, T_double, T_double, T_double, T_double, T_String, T_undefined},
-/* float */		{T_undefined, T_undefined, T_float, T_float, T_float, T_undefined, T_undefined, T_float, T_double, T_float, T_float, T_String, T_undefined},
-/* int */		{T_undefined, T_undefined, T_int, T_int, T_int, T_undefined, T_undefined, T_long, T_double, T_float, T_int, T_String, T_undefined},
-/* String */	{T_undefined, T_String, T_String, T_String, T_String, T_String, T_undefined, T_String, T_String, T_String, T_String, T_String, T_String},
-/* null */		{T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_undefined, T_String, T_undefined},
-	};
-	
-	static final String[] fTypeName = new String[] {"undefined", "java.lang.Object", "char", "byte", "short", "boolean", "void", "long", "double", "float", "int", "java.lang.String", "null"};
-
-	static final String[] typeUpperName = new String[] {"Undefined", "Object", "Char", "Byte", "Short", "Boolean", "Void", "Long", "Double", "Float", "Int", "String", "Null"};
-	
-	static final int Op_plus = 0;
-	static final int Op_minus = 1;
-	static final int Op_multiply = 2;
-	static final int Op_divide = 3;
-	static final int Op_remainder = 4;
-	static final int Op_greater = 5;
-	static final int Op_greaterEqual = 6;
-	static final int Op_less = 7;
-	static final int Op_lessEqual = 8;
-	static final int Op_equalEqual = 9;
-	static final int Op_notEqual = 10;
-	static final int Op_leftShift = 11;
-	static final int Op_rightShift = 12;
-	static final int Op_unsignedRightShift = 13;
-	static final int Op_or = 14;
-	static final int Op_and = 15;
-	static final int Op_xor = 16;
-	static final int Op_twiddle = 17;
-	static final int Op_not = 18;
-	static final int Op_equal = 19;
-	static final int Op_plusAss = 20;
-	static final int Op_minusAss = 21;
-	static final int Op_multiplyAss = 22;
-	static final int Op_divideAss = 23;
-	static final int Op_remainderAss = 24;
-	static final int Op_leftShiftAss = 25;
-	static final int Op_rightShiftAss = 26;
-	static final int Op_unsignedRightShiftAss = 27;
-	static final int Op_orAss = 28;
-	static final int Op_andAss = 29;
-	static final int Op_xorAss = 30;
-	static final int Op_prefixPlusPlus = 31;
-	static final int Op_postfixPlusPlus = 32;
-	static final int Op_prefixMinusMinus = 33;
-	static final int Op_postfixMinusMinus = 34;
-	
-	static final String[] opSymbol = new String[] {"+", "-", "*", "/", "%", ">", ">=", "<", "<=", "==", "!=", "<<", ">>", ">>>", "|", "&", "^", "~", "!", "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=", "|=", "&=", "^=", "++", "++", "--", "--"};
-	
-	static final String[] opName = new String[] {"plus", "minus", "multiply", "divide", "remainder", "greater", "greaterEqual", "less", "lessEqual", "equalEqual", "notEqual", "leftShift", "rightShift", "unsignedRightShift", "or", "and", "xor", "twiddle", "not", "equal", "plusAssignment", "minusAssignment", "multiplyAssignment", "divideAssignment", "remainderAssignment", "leftShiftAssignment", "rightShiftAssignment", "unsignedRightShiftAssignment", "orAssignment", "andAssignment", "xorAssignment", "prefixPlusPlus", "postfixPlusPlus", "prefixMinusMinus", "postfixMinusMinus"};
-	
-	static final String[] opUpperName = new String[] {"Plus", "Minus", "Multiply", "Divide", "Remainder", "Greater", "GreaterEqual", "Less", "LessEqual", "EqualEqual", "NotEqual", "LeftShift", "RightShift", "UnsignedRightShift", "Or", "And", "Xor", "Twiddle", "Not", "Equal", "PlusAssignment", "MinusAssignment", "MultiplyAssignment", "DivideAssignment", "RemainderAssignment", "LeftShiftAssignment", "RightShiftAssignment", "UnsignedRightShiftAssignment", "OrAssignment", "AndAssignment", "XorAssignment", "PrefixPlusPlus", "PostfixPlusPlus", "PrefixMinusMinus", "PostfixMinusMinus"};
-	
-	static final String[] immediate = new String[] {"x", "y"};
-	
-	static final String[] fVariable = new String[] {"xVar", "yVar", "xArray", "yArray"};
-	
-	static final String[] field = new String[] {"xField", "yField", "xStaticField", "yStaticField"};
-
-	static final String[] prefixList = new String[] {"foo.", "EvalTypeTests.", ""};
-
-	/**
-	 * Set the working directory of the launch configuration to generate the files
-	 * in the correct package location.
-	 */
-	static public void main(String[] args) throws Exception {
-		
-		genTestsNumericTypeAllOpsAllTypes(T_byte);
-		genTestsNumericTypeAllOpsAllTypes(T_char);
-		genTestsNumericTypeAllOpsAllTypes(T_short);
-		genTestsNumericTypeAllOpsAllTypes(T_int);
-		genTestsNumericTypeAllOpsAllTypes(T_long);
-		genTestsNumericTypeAllOpsAllTypes(T_float);
-		genTestsNumericTypeAllOpsAllTypes(T_double);
-		genTestsBooleanAllOpsBoolean();
-		genTestsStringPlusOpAllTypes();
-		
-		genTestsLocalVarValue();
-		
-		genTestsLocalVarAssignment();
-		
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_byte);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_char);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_short);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_int);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_long);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_float);
-		genTestsNumericTypeAllAssignmentOpsAllTypes(T_double);
-		genTestsBooleanAllAssignmentOpsBoolean();
-		genTestsStringPlusAssignmentOpAllTypes();
-		
-		genTestsNumericTypeCast();
-		
-		genTestsAllIntegerTypesAllXfixOps();
-		
-		genTestsQualifiedFieldValue();
-		genTestsQualifiedStaticFieldValue();
-		genTestsFieldValue();
-		genTestsStaticFieldValue();
-		
-		genTestsArrayValue();
-		genTestsArrayAssignment();
-		genTestsArrayAllocation();
-		genTestsArrayInitialization();
-
-		System.out.println("done");
-		
-	}
-
-	//-------------------------------
-	
-	public static void genTestsNumericTypeAllOpsAllTypes(int type) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = typeUpperName[type] + "OperatorsTests";
-		
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_plus, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, Op_plus, T_String, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_minus, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_multiply, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_divide, code);
-		genTestsNumericTypeArithmeticOpNumericTypes(type, Op_remainder, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_greater, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_greaterEqual, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_less, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_lessEqual, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_equalEqual, code);
-		genTestsNumericTypeComparisonOpNumericTypes(type, Op_notEqual, code);
-		if (type != T_float && type != T_double) {
-			genTestsIntegerTypeShiftOpIntegerTypes(type, Op_leftShift, code);
-			genTestsIntegerTypeShiftOpIntegerTypes(type, Op_rightShift, code);
-			genTestsIntegerTypeShiftOpIntegerTypes(type, Op_unsignedRightShift, code);
-			genTestsIntegerTypeBooleanOpIntegerTypes(type, Op_or, code);
-			genTestsIntegerTypeBooleanOpIntegerTypes(type, Op_and, code);
-			genTestsIntegerTypeBooleanOpIntegerTypes(type, Op_xor, code);
-		}
-		
-		genTestUnaryOpNumericType(type, Op_plus, code);
-		genTestUnaryOpNumericType(type, Op_minus, code);
-		if (type != T_float && type != T_double) {
-			genTestUnaryOpNumericType(type, Op_twiddle, code);
-		}
-		
-		createJavaFile(className, "EvalSimpleTests", 15, 1, true, code);
-
-	}
-	
-	public static void genTestsBooleanAllOpsBoolean() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "BooleanOperatorsTests";
-		
-		genTestBooleanBinaryOpBoolean(Op_or, code);
-		genTestBooleanBinaryOpBoolean(Op_and, code);
-		genTestBooleanBinaryOpBoolean(Op_xor, code);
-		genTestUnaryOpBoolean(Op_not, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 15, 1, false, code);
-	}
-	
-	public static void genTestsStringPlusOpAllTypes() throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StringPlusOpTests";
-		
-		code.append("\t// " + fTypeName[T_String] + " " + opSymbol[Op_plus] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_String] + ", " + fTypeName[T_null] + "}\n" +
-					"\n");
-
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_byte, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_char, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_short, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_long, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_double, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_boolean, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_String, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(T_String, Op_plus, T_null, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 15, 1, true, false, code);
-	}
-	
-	public static void genTestsLocalVarValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "LocalVarValueTests";
-		
-		code.append("\t// \n" +
-					"\n");
-					
-		genTestLocalVarValue(T_byte, code);
-		genTestLocalVarValue(T_char, code);
-		genTestLocalVarValue(T_short, code);
-		genTestLocalVarValue(T_int, code);
-		genTestLocalVarValue(T_long, code);
-		genTestLocalVarValue(T_float, code);
-		genTestLocalVarValue(T_double, code);
-		genTestLocalVarValue(T_String, code);
-		genTestLocalVarValue(T_boolean, code);
-//		genTestLocalVarValue(T_null, code);
-
-		createJavaFile(className, "EvalSimpleTests", 37, 1, true, code);
-	}
-	
-	public static void genTestsLocalVarAssignment() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "LocalVarAssignmentTests";
-		
-		code.append("\t// \n" +
-					"\n");
-					
-		genTestLocalVarAssignment(T_byte, code);
-		genTestLocalVarAssignment(T_char, code);
-		genTestLocalVarAssignment(T_short, code);
-		genTestLocalVarAssignment(T_int, code);
-		genTestLocalVarAssignment(T_long, code);
-		genTestLocalVarAssignment(T_float, code);
-		genTestLocalVarAssignment(T_double, code);
-		genTestLocalVarAssignment(T_String, code);
-		genTestLocalVarAssignment(T_boolean, code);
-					
-		createJavaFile(className, "EvalSimpleTests", 37, 1, true, code);
-	}
-	
-	public static void genTestsNumericTypeAllAssignmentOpsAllTypes(int type) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = typeUpperName[type] + "AssignmentOperatorsTests";
-		
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_plusAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_minusAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_multiplyAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_divideAss, code);
-		genTestsNumericTypeArithmeticAssignmentOpNumericTypes(type, Op_remainderAss, code);
-		if (type != T_float && type != T_double) {
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_leftShiftAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_rightShiftAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_unsignedRightShiftAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_orAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_andAss, code);
-			genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(type, Op_xorAss, code);
-		}
-		
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, false, code);
-
-	}
-
-	public static void genTestsBooleanAllAssignmentOpsBoolean() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "BooleanAssignmentOperatorsTests";
-		
-		code.append("\t// " + fTypeName[T_boolean] + " " + opSymbol[Op_orAss] + " " + fTypeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_orAss, T_boolean, code);
-		
-		code.append("\t// " + fTypeName[T_boolean] + " " + opSymbol[Op_andAss] + " " + fTypeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_andAss, T_boolean, code);
-		
-		code.append("\t// " + fTypeName[T_boolean] + " " + opSymbol[Op_xorAss] + " " + fTypeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_xorAss, T_boolean, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, false, code);
-	}
-	
-	public static void genTestsStringPlusAssignmentOpAllTypes() throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StringPlusAssignmentOpTests";
-		
-		code.append("\t// " + fTypeName[T_String] + " " + opSymbol[Op_plusAss] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_String] + ", " + fTypeName[T_null] + "}\n" +
-					"\n");
-
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_byte, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_char, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_short, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_int, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_long, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_float, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_double, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_String, code);
-		genTestTypeAssignmentOpType(T_String, Op_plusAss, T_null, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, true, false, code);
-	}
-	
-	public static void genTestsNumericTypeCast() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "NumericTypesCastTests";
-		
-		genTestsNumericTypeCast(T_byte, code);
-		genTestsNumericTypeCast(T_char, code);
-		genTestsNumericTypeCast(T_short, code);
-		genTestsNumericTypeCast(T_int, code);
-		genTestsNumericTypeCast(T_long, code);
-		genTestsNumericTypeCast(T_float, code);
-		genTestsNumericTypeCast(T_double, code);
-					
-		createJavaFile(className, "EvalSimpleTests", 15, 1, false, code);
-	}
-	
-	public static void genTestsAllIntegerTypesAllXfixOps() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "XfixOperatorsTests";
-		
-		genTestsNumericTypeAllXfixOps(T_byte, code);
-		genTestsNumericTypeAllXfixOps(T_char, code);
-		genTestsNumericTypeAllXfixOps(T_short, code);
-		genTestsNumericTypeAllXfixOps(T_int, code);
-		genTestsNumericTypeAllXfixOps(T_long, code);
-		genTestsNumericTypeAllXfixOps(T_float, code);
-		genTestsNumericTypeAllXfixOps(T_double, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, false, code);
-	}
-	
-	public static void genTestsQualifiedFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "QualifiedFieldValueTests";
-		
-		genTestFieldValue(T_byte, 0, code);
-		genTestFieldValue(T_char, 0, code);
-		genTestFieldValue(T_short, 0, code);
-		genTestFieldValue(T_int, 0, code);
-		genTestFieldValue(T_long, 0, code);
-		genTestFieldValue(T_float, 0, code);
-		genTestFieldValue(T_double, 0, code);
-		genTestFieldValue(T_String, 0, code);
-		genTestFieldValue(T_boolean, 0, code);
-
-		createJavaFile(className, "EvalTypeTests", 73, 1, true, code);
-	}
-		
-	public static void genTestsQualifiedStaticFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "QualifiedStaticFieldValueTests";
-		
-		genTestStaticFieldValue(T_byte, 0, code);
-		genTestStaticFieldValue(T_char, 0, code);
-		genTestStaticFieldValue(T_short, 0, code);
-		genTestStaticFieldValue(T_int, 0, code);
-		genTestStaticFieldValue(T_long, 0, code);
-		genTestStaticFieldValue(T_float, 0, code);
-		genTestStaticFieldValue(T_double, 0, code);
-		genTestStaticFieldValue(T_String, 0, code);
-		genTestStaticFieldValue(T_boolean, 0, code);
-
-		createJavaFile(className, "EvalTypeTests", 73, 1, true, code);
-
-		code = new StringBuffer();
-		
-		className = "QualifiedStaticFieldValueTests2";
-		
-		genTestStaticFieldValue(T_byte, 1, code);
-		genTestStaticFieldValue(T_char, 1, code);
-		genTestStaticFieldValue(T_short, 1, code);
-		genTestStaticFieldValue(T_int, 1, code);
-		genTestStaticFieldValue(T_long, 1, code);
-		genTestStaticFieldValue(T_float, 1, code);
-		genTestStaticFieldValue(T_double, 1, code);
-		genTestStaticFieldValue(T_String, 1, code);
-		genTestStaticFieldValue(T_boolean, 1, code);
-
-		createJavaFile(className, "EvalTypeTests", 73, 1, true, code);
-	}
-		
-	public static void genTestsFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "FieldValueTests";
-		
-		genTestFieldValue(T_byte, 2, code);
-		genTestFieldValue(T_char, 2, code);
-		genTestFieldValue(T_short, 2, code);
-		genTestFieldValue(T_int, 2, code);
-		genTestFieldValue(T_long, 2, code);
-		genTestFieldValue(T_float, 2, code);
-		genTestFieldValue(T_double, 2, code);
-		genTestFieldValue(T_String, 2, code);
-		genTestFieldValue(T_boolean, 2, code);
-
-		createJavaFile(className, "EvalTypeTests", 63, 2, true, code);
-	}
-		
-	public static void genTestsStaticFieldValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StaticFieldValueTests";
-		
-		genTestStaticFieldValue(T_byte, 2, code);
-		genTestStaticFieldValue(T_char, 2, code);
-		genTestStaticFieldValue(T_short, 2, code);
-		genTestStaticFieldValue(T_int, 2, code);
-		genTestStaticFieldValue(T_long, 2, code);
-		genTestStaticFieldValue(T_float, 2, code);
-		genTestStaticFieldValue(T_double, 2, code);
-		genTestStaticFieldValue(T_String, 2, code);
-		genTestStaticFieldValue(T_boolean, 2, code);
-
-		createJavaFile(className, "EvalTypeTests", 63, 2, true, code);
-
-		className = "StaticFieldValueTests2";
-		
-		createJavaFile(className, "EvalTypeTests", 67, 2, true, code);
-	}
-		
-	public static void genTestsArrayValue() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayValueTests";
-		
-		genTestArrayLength(T_byte, code);
-		genTestArrayLength(T_char, code);
-		genTestArrayLength(T_short, code);
-		genTestArrayLength(T_int, code);
-		genTestArrayLength(T_long, code);
-		genTestArrayLength(T_float, code);
-		genTestArrayLength(T_double, code);
-		genTestArrayLength(T_String, code);
-		genTestArrayLength(T_boolean, code);
-
-		genTestArrayValue(T_byte, code);
-		genTestArrayValue(T_char, code);
-		genTestArrayValue(T_short, code);
-		genTestArrayValue(T_int, code);
-		genTestArrayValue(T_long, code);
-		genTestArrayValue(T_float, code);
-		genTestArrayValue(T_double, code);
-		genTestArrayValue(T_String, code);
-		genTestArrayValue(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, true, code);
-	}
-		
-	public static void genTestsArrayAssignment() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayAssignmentTests";
-		
-		genTestArrayAssignment(T_byte, code);
-		genTestArrayAssignment(T_char, code);
-		genTestArrayAssignment(T_short, code);
-		genTestArrayAssignment(T_int, code);
-		genTestArrayAssignment(T_long, code);
-		genTestArrayAssignment(T_float, code);
-		genTestArrayAssignment(T_double, code);
-		genTestArrayAssignment(T_String, code);
-		genTestArrayAssignment(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, true, code);
-	}
-		
-	public static void genTestsArrayAllocation() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayAllocationTests";
-		
-		genTestArrayAllocation(T_byte, code);
-		genTestArrayAllocation(T_char, code);
-		genTestArrayAllocation(T_short, code);
-		genTestArrayAllocation(T_int, code);
-		genTestArrayAllocation(T_long, code);
-		genTestArrayAllocation(T_float, code);
-		genTestArrayAllocation(T_double, code);
-		genTestArrayAllocation(T_String, code);
-		genTestArrayAllocation(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, false, code);
-	}
-		
-	public static void genTestsArrayInitialization() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayInitializationTests";
-		
-		genTestArrayInitialization(T_byte, code);
-		genTestArrayInitialization(T_char, code);
-		genTestArrayInitialization(T_short, code);
-		genTestArrayInitialization(T_int, code);
-		genTestArrayInitialization(T_long, code);
-		genTestArrayInitialization(T_float, code);
-		genTestArrayInitialization(T_double, code);
-		genTestArrayInitialization(T_String, code);
-		genTestArrayInitialization(T_boolean, code);
-
-		createJavaFile(className, "EvalArrayTests", 37, 1, true, code);
-	}
-	//----------------------------
-	
-	public static void genTestsNumericTypeArithmeticOpNumericTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_float] + ", " + fTypeName[T_double] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_char, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_short, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_long, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_float, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_double, code);
-		
-	}
-	
-	public static void genTestsNumericTypeComparisonOpNumericTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_float] + ", " + fTypeName[T_double] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_char, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_short, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_int, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_long, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_float, code);
-		genTestTypeBinaryOpTypeBooleanResult(type, op, T_double, code);
-		
-	}
-	
-	public static void genTestsIntegerTypeShiftOpIntegerTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_char, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_short, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_int, code);
-		genTestTypeBinaryOpTypeUnaryPromotion(type, op, T_long, code);
-		
-	}
-	
-	public static void genTestsIntegerTypeBooleanOpIntegerTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + "}\n" +
-					"\n");
-		
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_byte, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_char, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_short, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_int, code);
-		genTestTypeBinaryOpTypeBinaryPromotion(type, op, T_long, code);
-		
-	}
-	
-	public static void genTestsNumericTypeArithmeticAssignmentOpNumericTypes(int type, int op, StringBuffer code) {
-
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_float] + ", " + fTypeName[T_double] + "}\n" +
-					"\n");
-
-		genTestTypeAssignmentOpType(type, op, T_byte, code);
-		genTestTypeAssignmentOpType(type, op, T_char, code);
-		genTestTypeAssignmentOpType(type, op, T_short, code);
-		genTestTypeAssignmentOpType(type, op, T_int, code);
-		genTestTypeAssignmentOpType(type, op, T_long, code);
-		genTestTypeAssignmentOpType(type, op, T_float, code);
-		genTestTypeAssignmentOpType(type, op, T_double, code);
-
-	}
-	
-	public static void genTestsIntegerTypeArithmeticAssignmentOpIntegerTypes(int type, int op, StringBuffer code) {
-
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_float] + ", " + fTypeName[T_double] + "}\n" +
-					"\n");
-
-		genTestTypeAssignmentOpType(type, op, T_byte, code);
-		genTestTypeAssignmentOpType(type, op, T_char, code);
-		genTestTypeAssignmentOpType(type, op, T_short, code);
-		genTestTypeAssignmentOpType(type, op, T_int, code);
-		genTestTypeAssignmentOpType(type, op, T_long, code);
-
-	}
-	
-	public static void genTestsNumericTypeCast(int type, StringBuffer code) {
-		
-		code.append("\t// (" + fTypeName[type] + ") {" + fTypeName[T_byte] + ", " + fTypeName[T_char] + ", " + fTypeName[T_short] + ", " + fTypeName[T_int] + ", " + fTypeName[T_long] + ", " + fTypeName[T_float] + ", " + fTypeName[T_double] + "}\n" +
-					"\n");
-		
-		genTestNumericTypeCast(type, T_byte, code);
-		genTestNumericTypeCast(type, T_char, code);
-		genTestNumericTypeCast(type, T_short, code);
-		genTestNumericTypeCast(type, T_int, code);
-		genTestNumericTypeCast(type, T_long, code);
-		genTestNumericTypeCast(type, T_float, code);
-		genTestNumericTypeCast(type, T_double, code);
-		
-	}
-
-	public static void genTestsNumericTypeAllXfixOps(int type, StringBuffer code) {
-		
-		code.append("\t// {" + opSymbol[Op_prefixPlusPlus] + ", " + opSymbol[Op_prefixMinusMinus] + "} " + fTypeName[type] + "\n" +
-					"\t// " + fTypeName[type] + " {" + opSymbol[Op_postfixPlusPlus] + ", " + opSymbol[Op_postfixMinusMinus] + "}\n" +
-					"\n");
-					
-		genTestNumericTypePrefixOp(type, Op_prefixPlusPlus, code);
-		genTestNumericTypePrefixOp(type, Op_prefixMinusMinus, code);
-		genTestNumericTypePostfixOp(type, Op_postfixPlusPlus, code);
-		genTestNumericTypePostfixOp(type, Op_postfixMinusMinus, code);
-	}
-		
-	//----------------------------
-
-	public static void genTestTypeBinaryOpTypeBinaryPromotion(int type1, int op, int type2, StringBuffer code) {
-		
-		int promotedType = getPromotionType(type1, type2);
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 1, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 1, 0, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestTypeBinaryOpTypeBooleanResult(int type1, int op, int type2, StringBuffer code) {
-		
-		int promotedType = T_boolean;
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 1, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 1, 0, false, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 0, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-
-	}
-
-	public static void genTestTypeBinaryOpTypeUnaryPromotion(int type1, int op, int type2, StringBuffer code) {
-		
-		int promotedType = getUnaryPromotionType(type1);
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type1, op, type2, promotedType, 0, 1, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type1, op, type2, promotedType, 1, 0, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestBooleanBinaryOpBoolean(int op, StringBuffer code) {
-		
-		int type = T_boolean;
-		
-		String uName = typeUpperName[type];
-		String oUName = opUpperName[op];
-		
-		code.append("\t// " + fTypeName[type] + " " + opSymbol[op] + " " + fTypeName[type] + "\n" +
-					"\n");
-		
-		code.append("\tpublic void test" + uName + oUName + uName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeBinaryOp(type, op, type, type, 0, 0, true, code);
-		code.append("\n");
-		genCodeBinaryOp(type, op, type, type, 0, 1, false, code);
-		code.append("\n");
-		genCodeBinaryOp(type, op, type, type, 1, 0, false, code);
-		code.append("\n");
-		genCodeBinaryOp(type, op, type, type, 1, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-
-	}
-
-	public static void genTestUnaryOpNumericType(int type, int op, StringBuffer code) {
-		
-		int promotedType = getUnaryPromotionType(type);
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String oSymbol = opSymbol[op];
-		String oUName = opUpperName[op];
-		
-		code.append("\t// " + oSymbol + " " + tName + "\n" +
-					"\n");
-		
-		code.append("\tpublic void test" + oUName + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeUnaryOp(type, op, promotedType, 0, true, code);
-		code.append("\n");
-		genCodeUnaryOp(type, op, promotedType, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestUnaryOpBoolean(int op, StringBuffer code) {
-		
-		int type = T_boolean;
-		
-		String uName = typeUpperName[type];
-		String oUName = opUpperName[op];
-		
-		code.append("\t// " + opSymbol[op] + " " + fTypeName[type] + "\n" +
-					"\n");
-		
-		code.append("\tpublic void test" + oUName + uName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeUnaryOp(type, op, type, 0, true, code);
-		code.append("\n");
-		genCodeUnaryOp(type, op, type, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-
-	}
-
-	public static void genTestLocalVarValue(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeLocalVarValue(type, 0, true, code);
-		code.append("\n");
-		genCodeLocalVarValue(type, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestLocalVarAssignment(int type, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeLocalVarAssignment(type, 0, 0, true, code);
-		code.append("\n");
-		genCodeLocalVarAssignment(type, 0, 1, false, code);
-		code.append("\n");
-		genCodeLocalVarAssignment(type, 1, 0, false, code);
-		code.append("\n");
-		genCodeLocalVarAssignment(type, 1, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestTypeAssignmentOpType(int type1, int op, int type2, StringBuffer code) {
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		String oUName = opUpperName[op];
-		
-		code.append("\tpublic void test" + t1UName + oUName + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeSetTmp("tmp" + fVariable[0], type1, Op_equal, fVariable[0] + t1UName + "Value", true, code);
-		genCodeSetTmp("tmp" + fVariable[0], type1, op, immediate[0] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 0, 0, true, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + fVariable[0], type1, op, immediate[1] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 0, 1, false, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + fVariable[1], type1, Op_equal, fVariable[1] + t1UName + "Value", true, code);
-		genCodeSetTmp("tmp" + fVariable[1], type1, op, immediate[0] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 1, 0, false, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + fVariable[1], type1, op, immediate[1] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 1, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestNumericTypeCast(int type1, int type2, StringBuffer code) {
-		
-		String t1UName = typeUpperName[type1];
-		String t2UName = typeUpperName[type2];
-		
-		code.append("\tpublic void test" + t1UName + "Cast" + t2UName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeCast(type1, type2, 0, true, code);
-		code.append("\n");
-		genCodeCast(type1, type2, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-		
-	}
-		
-	public static void genTestNumericTypePrefixOp(int type, int op, StringBuffer code) {
-
-		String tUName = typeUpperName[type];
-		String oUName = opUpperName[op];
-
-		code.append("\tpublic void test" + oUName + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodePrefixOp(type, op, 0, true, code);
-		code.append("\n");
-		genCodePrefixOp(type, op, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestNumericTypePostfixOp(int type, int op, StringBuffer code) {
-
-		String tUName = typeUpperName[type];
-		String oUName = opUpperName[op];
-
-		code.append("\tpublic void test" + oUName + tUName + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodePostfixOp(type, op, 0, true, code);
-		code.append("\n");
-		genCodePostfixOp(type, op, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestFieldValue(int type, int prefix, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "FieldValue() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeFieldValue(type, 0, prefix, true, code);
-		code.append("\n");
-		genCodeFieldValue(type, 1, prefix, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestStaticFieldValue(int type, int prefix, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "StaticFieldValue() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeFieldValue(type, 2, prefix, true, code);
-		code.append("\n");
-		genCodeFieldValue(type, 3, prefix, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayValue(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayValue() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayValue(type, 2, 0, true, code);
-		code.append("\n");
-		genCodeArrayValue(type, 2, 1, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 2, 2, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 3, 0, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 3, 1, false, code);
-		code.append("\n");
-		genCodeArrayValue(type, 3, 2, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayLength(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayLength() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayLength(type, 2, true, code);
-		code.append("\n");
-		genCodeArrayLength(type, 3, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayAssignment(int type, StringBuffer code ) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayAssignment() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayAssignment(type, 2, 0, 0, true, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 2, 1, 1, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 2, 2, 0, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 3, 0, 1, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 3, 1, 0, false, code);
-		code.append("\n");
-		genCodeArrayAssignment(type, 3, 2, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	public static void genTestArrayAllocation(int type, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayAllocation() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayAllocation(type, 2, 0, true, code);
-		code.append("\n");
-		genCodeArrayAllocation(type, 3, 1, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	public static void genTestArrayInitialization(int type, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		
-		code.append("\tpublic void test" + tUName + "ArrayAllocation() throws Throwable {\n");
-		tryBlockBegin(code);
-		genCodeArrayInitialization(type, 2, true, code);
-		code.append("\n");
-		genCodeArrayInitialization(type, 3, false, code);
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-
-	//-------------------------------
-
-	public static void genCodeBinaryOp(int type1, int op, int type2, int resultType, int var1, int var2, boolean first, StringBuffer code) {
-		
-		String t1Name = fTypeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = fTypeName[type2];
-		String t2UName = typeUpperName[type2];
-		String resName = fTypeName[resultType];
-		String resUName = typeUpperName[resultType];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		String v1Name = immediate[var1];
-		String v2Name = immediate[var2];
-		
-		genCodeEval(v1Name + t1UName + " + " + oName + "Op + " + v2Name + t2UName, first, code);
-		genCodeReturnTypeCheck(t1Name + " " + oName + " " + t2Name, resName, first, code);
-		switch (resultType) {
-			case T_String:
-				genCodeReturnValueCheckStringType(t1Name + " " + oName + " " + t2Name, v1Name + t1UName + "Value " + oSymbol + " " + v2Name + t2UName + "Value", first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(t1Name + " " + oName + " " + t2Name, resName, resUName, v1Name + t1UName + "Value " + oSymbol + " " + v2Name + t2UName + "Value", first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(t1Name + " " + oName + " " + t2Name, resName, resUName, v1Name + t1UName + "Value " + oSymbol + " " + v2Name + t2UName + "Value", first, code);
-				break;
-		}
-	}
-
-	public static void genCodeUnaryOp(int type, int op, int resultType, int var, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String resName = fTypeName[resultType];
-		String resUName = typeUpperName[resultType];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		String vName = immediate[var];
-
-		genCodeEval(oName + "Op + " + vName + tUName, first, code);
-		genCodeReturnTypeCheck(oName + " " + tName, resName, first, code);
-		if (type == T_float || type == T_double) {
-			genCodeReturnValueCheckFloatDoubleType(oName + " " + tName, resName, resUName, oSymbol + " " + vName + tUName + "Value", first, code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType(oName + " " + tName, resName, resUName, oSymbol + " " + vName + tUName + "Value", first, code);
-		}
-	}
-	
-	public static void genCodeLocalVarValue(int type, int var, boolean first, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-
-		genCodeLocalVarValue(type,var, vName + tUName + "Value", first, code);
-	}
-
-	public static void genCodeLocalVarValue(int type, int var, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-
-		genCodeEval(vName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " local variable value", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " local variable value", referenceExpression, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " local variable value", tName, tUName, referenceExpression, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " local variable value", tName, tUName, referenceExpression, first, code);
-				break;
-		}
-	}
-	
-	public static void genCodeLocalVarAssignment(int type, int var, int imm, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-		String iName = immediate[imm];
-		String oName = opName[Op_equal];
-
-		genCodeEval(vName + tUName + " + " + oName + "Op +" + iName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " local variable assignment", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " local variable assignment", iName + tUName + "Value", first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " local variable assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " local variable assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-		}
-		genCodeLocalVarValue(type, var, iName + tUName + "Value", false, code);
-	}
-	
-	public static void genCodeAssignmentOp(int type1, int op, int type2, int var, int imm, boolean first, StringBuffer code) {
-		String t1Name = fTypeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = fTypeName[type2];
-		String t2UName = typeUpperName[type2];
-		String oName = opName[op];
-		String vName = fVariable[var];
-		String iName = immediate[imm];
-		
-		genCodeEval(vName + t1UName + " + " + oName + "Op + " + iName + t2UName, first, code);
-		genCodeReturnTypeCheck(t1Name + " " + oName + " " + t2Name, t1Name, first, code);
-		switch (type1) {
-			case T_String:
-				genCodeReturnValueCheckStringType(t1Name + " " + oName + " " + t2Name, "tmp" + vName, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(t1Name + " " + oName + " " + t2Name, t1Name, t1UName, "tmp" + vName, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(t1Name + " " + oName + " " + t2Name, t1Name, t1UName, "tmp" + vName, first, code);
-				break;
-		}
-		genCodeLocalVarValue(type1, var, "tmp" + vName, false, code);
-	}
-	
-	public static void genCodeCast(int type1, int type2, int imm, boolean first, StringBuffer code) {
-		String t1Name = fTypeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = fTypeName[type2];
-		String t2UName = typeUpperName[type2];
-		String iName = immediate[imm];
-
-		genCodeEval("\"(" + t1Name + ")\" + " + iName + t2UName, first, code);
-		genCodeReturnTypeCheck("(" + t1Name + ") " + t2Name, t1Name, first, code);
-		if (type1 == T_float || type1 == T_double) {
-			genCodeReturnValueCheckFloatDoubleType("(" + t1Name + ") " + t2Name, t1Name, t1UName, (needCast(type1, type2) ? "( " + t1Name + ") " : "") + iName + t2UName + "Value", first, code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType("(" + t1Name + ") " + t2Name, t1Name, t1UName, (needCast(type1, type2) ? "( " + t1Name + ") " : "") + iName + t2UName + "Value", first, code);
-		}
-	}
-	
-	public static void genCodePrefixOp(int type, int op, int var, boolean first, StringBuffer code) {
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		
-		genCodeSetTmp("tmp" + vName, type, Op_equal, vName + tUName + "Value", true, code);
-		genCodeEval(oName + "Op + " + vName + tUName, first, code);
-		genCodeReturnTypeCheck(oName + " " + tName, tName, first, code);
-		if (type == T_float || type == T_double) {
-			genCodeReturnValueCheckFloatDoubleType(oName + " " + tName, tName, tUName, oSymbol + "tmp" + vName, first,code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType(oName + " " + tName, tName, tUName, oSymbol + "tmp" + vName, first,code);
-		}
-		genCodeLocalVarValue(type, var, "tmp" + vName, false, code);
-	}
-	
-	public static void genCodePostfixOp(int type, int op, int var, boolean first, StringBuffer code) {
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-		String oName = opName[op];
-		String oSymbol = opSymbol[op];
-		
-		genCodeSetTmp("tmp" + vName, type, Op_equal, vName + tUName + "Value", true, code);
-		genCodeEval(vName + tUName + " + " + oName + "Op", first, code);
-		genCodeReturnTypeCheck(tName + " " + oName, tName, first, code);
-		if (type == T_float || type == T_double) {
-			genCodeReturnValueCheckFloatDoubleType(tName + " " + oName, tName, tUName, "tmp" + vName + oSymbol, first,code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType(tName + " " + oName, tName, tUName, "tmp" + vName + oSymbol, first,code);
-		}
-		genCodeLocalVarValue(type, var, "tmp" + vName, false, code);
-	}
-	
-	public static void genCodeFieldValue(int type, int var, int prefix, boolean first, StringBuffer code) {
-		String tUName = typeUpperName[type];
-		String fName = field[var];
-
-		genCodeFieldValue(type, var, prefix, fName + tUName + "Value", first, code);
-	}
-
-	public static void genCodeFieldValue(int type, int var, int prefix, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String fName = field[var];
-		String prefixVal = prefixList[prefix];
-
-		genCodeEval("\"" + prefixVal + "\" + " + fName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " field value", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " field value", referenceExpression, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " field value", tName, tUName, referenceExpression, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " field value", tName, tUName, referenceExpression, first, code);
-				break;
-		}
-	}
-	
-	public static void genCodeArrayLength(int type, int var, boolean first, StringBuffer code) {
-		
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-		
-		genCodeArrayLength(type, var, vName + tUName + "Value.length", first, code);
-		
-	}
-
-	public static void genCodeArrayLength(int type, int var, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-
-		genCodeEval(vName + tUName + " + \".length\"", first, code);
-		genCodeReturnTypeCheck(tName + " array length", fTypeName[T_int], first,code);
-		genCodeReturnValueCheckPrimitiveType(tName + " array length", fTypeName[T_int], typeUpperName[T_int], referenceExpression, first, code);
-	}
-	
-	public static void genCodeArrayValue(int type, int var, int index, boolean first, StringBuffer code) {
-		
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-
-		genCodeArrayValue(type, var, index, vName + tUName + "Value[" + index + "]", first, code);
-	}
-
-	public static void genCodeArrayValue(int type, int var, int index, String referenceExpression, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-
-		genCodeEval(vName + tUName + " + \"[" + index + "]\"", first, code);
-		genCodeReturnTypeCheck(tName + " array value", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " array value", referenceExpression, first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " array value", tName, tUName, referenceExpression, first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " array value", tName, tUName, referenceExpression, first, code);
-				break;
-		}
-	}
-	
-	public static void genCodeArrayAssignment(int type, int var, int index, int imm, boolean first, StringBuffer code) {
-		
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-		String iName = immediate[imm];
-		String oName = opName[Op_equal];
-
-		genCodeEval(vName + tUName + " + \"[" + index + "]\" + " + oName + "Op +" + iName + tUName, first, code);
-		genCodeReturnTypeCheck(tName + " array assignment", tName, first,code);
-		switch (type) {
-			case T_String:
-				genCodeReturnValueCheckStringType(tName + " array assignment", iName + tUName + "Value", first, code);
-				break;
-			case T_float:
-			case T_double:
-				genCodeReturnValueCheckFloatDoubleType(tName + " array assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-			default:
-				genCodeReturnValueCheckPrimitiveType(tName + " array assignment", tName, tUName, iName + tUName + "Value", first, code);
-				break;
-		}
-		genCodeArrayValue(type, var, index, iName + tUName + "Value", false, code);
-	}
-	
-	public static void genCodeArrayAllocation(int type, int var, int dim, boolean first, StringBuffer code) {
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String charUName = typeUpperName[T_char];
-		String vName = fVariable[var];
-		String iName = immediate[dim];
-		String oName = opName[Op_equal];
-
-		genCodeEval(vName + tUName + " + " + oName + "Op + \"new " + tName + "[\" + " + iName + charUName + " + \"]\"", first, code);
-		genCodeReturnTypeCheck(tName + " array assignment", tName + "[]", first, code);
-		if (first) {
-			genCodeSetTmp("intValue", T_int, Op_equal, "0", true, code);
-		}
-		genCodeArrayLength(type, var, iName + charUName + "Value", false, code);
-	}
-
-	public static void genCodeArrayInitialization(int type, int var, boolean first, StringBuffer code) {
-		String tName = fTypeName[type];
-		String tUName = typeUpperName[type];
-		String vName = fVariable[var];
-		String oName = opName[Op_equal];
-		String i1Name = immediate[(var + 1) % 2];
-		
-		String value = "";
-		boolean f = true;
-		for (int i = 0; i < var; i ++) {
-			if (f) {
-				f = false;
-			} else {
-				value += " + \", \" + ";
-			}
-			value += immediate[i % 2] + tUName;
-		}
-
-		genCodeEval(vName + tUName + " + " + oName + "Op + \"new " + tName + "[]{\" + " + value + " + \"}\"", first, code);
-		genCodeReturnTypeCheck(tName + " array assignment", tName + "[]", first, code);
-		if (first) {
-			genCodeSetTmp("intValue", T_int, Op_equal, "0", true, code);
-			if (type != T_int) {
-				genCodeSetTmp(((type == T_String)? "string" : tName) + "Value", type, Op_equal, i1Name + tUName + "Value", true, code);
-			}
-		}
-		genCodeArrayLength(type, var, "" + var, false, code);
-		for (int i = 0; i < var; i++) {
-			genCodeArrayValue(type, var, i, immediate[i % 2] + tUName + "Value", false, code);
-		}
-	}
-	
-	//----------------------------
-	
-	public static void genCodeEval(String expression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "IValue " : "") + "value = eval(" + expression + ");\n");
-	}
-	
-	public static void genCodeReturnTypeCheck(String test, String typeName, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "String " : "") + "typeName = value.getReferenceTypeName();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong type : \", \"" + typeName + "\", typeName);\n");
-	}
-	
-	public static void genCodeReturnValueCheckPrimitiveType(String test, String resType, String uResType, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? resType + " " : "") + resType + "Value = ((IJavaPrimitiveValue)value).get" + uResType + "Value();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \", " + referenceExpression + ", " + resType+ "Value);\n");
-	}
-
-	public static void genCodeReturnValueCheckFloatDoubleType(String test, String resType, String uResType, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? resType + " " : "") + resType + "Value = ((IJavaPrimitiveValue)value).get" + uResType + "Value();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \", " + referenceExpression + ", " + resType+ "Value, 0);\n");
-	}
-
-	public static void genCodeReturnValueCheckStringType(String test, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "String " : "") + "stringValue = ((JDIObjectValue)value).getValueString();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \", " + referenceExpression + ", " + "stringValue);\n");
-	}
-
-/*	public static void genCodeReturnValueCheckObjectType(String test, String referenceExpression, boolean first, StringBuffer code) {
-		code.append("\t\t" + ((first)? "Object " : "") + "objectValue = ((JDIObjectValue)value).getValueString();\n" +
-					"\t\tassertEquals(\"" + test + " : wrong result : \" + " + "objectValue, " + "objectValue, " + referenceExpression + ");\n");
-	}*/
-
-	public static void genCodeSetTmp(String varName, int type, int op, String value, boolean init , StringBuffer code) {
-		code.append("\t\t" + ((init)? fTypeName[type] + " " : "") + varName + " " + opSymbol[op] + " " + value + ";\n");
-	}
-	
-	
-	public static void tryBlockBegin(StringBuffer code) {
-		code.append("\t\ttry {\n\t\tinit();\n");
-	}
-
-	public static void tryBlockEnd(StringBuffer code) {
-		code.append("\t\t} finally {\n\t\tend();\n\t\t}\n");
-	}
-
-	//------------------------------
-
-	public static void createJavaFile(String className, String testClass, int breakPointLine, int frameNumber, boolean importJDIObjectValue, StringBuffer tests) throws Exception {
-		createJavaFile(className, testClass, breakPointLine, frameNumber, importJDIObjectValue, true, tests);
-	}
-	
-	public static void createJavaFile(String className, String testClass, int breakPointLine, int frameNumber, boolean importJDIObjectValue, boolean importIJavaPrimitiveValue, StringBuffer tests) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		code.append("/*******************************************************************************\n");
-		code.append(" * Copyright (c) 2002, 2003 IBM Corporation and others.\n");
-		code.append(" * All rights reserved. This program and the accompanying materials \n");
-		code.append(" * are made available under the terms of the Eclipse Public License v1.0\n");
-		code.append(" * which accompanies this distribution, and is available at\n");
-		code.append(" * http://www.eclipse.org/legal/epl-v10.html\n");
-		code.append(" * \n");
-		code.append(" * Contributors:\n");
-		code.append(" *     IBM Corporation - initial API and implementation\n");
-		code.append(" *******************************************************************************/\n");
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n" +
-					"import org.eclipse.debug.core.model.IValue;\n");
-					
-		if (importIJavaPrimitiveValue) {
-			code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n");
-		}
-		if (importJDIObjectValue) {
-			code.append("import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n");
-		}
-		code.append("\n" +
-					"public class " + className + " extends Tests {\n" +
-					"\n" +
-					"\tpublic " + className + "(String arg) {\n" +
-					"\t\tsuper(arg);\n" +
-					"\t}\n" +
-					"\n" +
-					"\tprotected void init() throws Exception {\n" +
-					"\t\tinitializeFrame(\"" + testClass + "\"," + breakPointLine + "," + frameNumber + ");\n" +
-					"\t}\n" +
-					"\n" +
-					"\tprotected void end() throws Exception {\n" +
-					"\t\tdestroyFrame();\n" +
-					"\t}\n\n");
-					
-		code.append(tests);
-					
-		code.append("\n}\n");
-					
-		Writer file = new FileWriter(new File(className + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
deleted file mode 100644
index e4d9c93..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.Writer;
-
-public class TypeHierarchyTestsGenerator extends TestGenerator {
-
-	static int IAA= 0;
-	static int IAB= 1;
-	static int IAC= 2;
-	static int AA= 3;
-	static int AB= 4;
-	static int AC= 5;
-	static int IBB= 6;
-	static int IBC= 7;
-	static int BB= 8;
-	static int BC= 9;
-	static int ICC= 10;
-	static int CC= 11;
-	static int N_A= 12;
-	static int N_B= 13;
-	static int N_C= 14;
-	
-	static int SUPER_A= 15;
-	static int SUPER_B= 16;
-	
-	static int M1= 0;
-	static int M2= 1;
-	static int S2= 2;
-	static int M3= 3;
-	static int M4= 4;
-	static int S4= 5;
-	static int M5= 6;
-	static int M6= 7;
-	static int S6= 8;
-	
-	static String[] qualifiers= new String[] {
-		"iaa", "iab", "iac",     "aa",      "ab",      "ac", "ibb", "ibc", "bb", "bc",
-		"icc", "cc",  "new A()", "new B()", "new C()" ,"super" , "super"};
-		
-	static String[] methods= new String[] {"m1", "m2", "s2", "m3", "m4", "s4", "m5", "m6", "s6"};
-	
-	static int[] staticLevel= new int[] {
-		0, 0, 0, 0, 0, 0, 1, 1, 1, 1,
-		2, 2, 0, 1, 2, 0, 1};
-
-	static int[] instanceLevel= new int[] {
-		0, 1, 2, 0, 1, 2, 1, 2, 1, 2,
-		2, 2, 0, 1, 2, 0, 1};
-		
-	static int[][] values= new int[][] {
-		{ 1, 2, 9},
-		{ 11, 22, 99, 33, 44, 88},
-		{ 111, 222, 999, 333, 444, 888, 555, 666, 777}
-	};
-
-	public static void main(String[] args) throws Exception {
-		gen_main();
-		gen_aa_testA();
-		gen_ab_testA();
-		gen_ac_testA();
-		gen_bb_testA();
-		gen_bb_testB();
-		gen_bc_testA();
-		gen_bc_testB();
-		gen_cc_testA();
-		gen_cc_testB();
-		gen_cc_testC();
-		
-		System.out.println("done");
-	}
-	
-	public static void  gen_main() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTestQualifier(IAA, M1, code);
-		createTestQualifier(IAB, M1, code);
-		createTestQualifier(IAC, M1, code);
-		createTestQualifier(AA, M1, code);
-		createTestQualifier(AA, M2, code);
-		createTestQualifier(AA, S2, code);
-		createTestQualifier(AB, M1, code);
-		createTestQualifier(AB, M2, code);
-		createTestQualifier(AB, S2, code);
-		createTestQualifier(AC, M1, code);
-		createTestQualifier(AC, M2, code);
-		createTestQualifier(AC, S2, code);
-		createTestQualifier(IBB, M1, code);
-		createTestQualifier(IBB, M3, code);
-		createTestQualifier(IBC, M1, code);
-		createTestQualifier(IBC, M3, code);
-		createTestQualifier(BB, M1, code);
-		createTestQualifier(BB, M2, code);
-		createTestQualifier(BB, S2, code);
-		createTestQualifier(BB, M3, code);
-		createTestQualifier(BB, M4, code);
-		createTestQualifier(BB, S4, code);
-		createTestQualifier(BC, M1, code);
-		createTestQualifier(BC, M2, code);
-		createTestQualifier(BC, S2, code);
-		createTestQualifier(BC, M3, code);
-		createTestQualifier(BC, M4, code);
-		createTestQualifier(BC, S4, code);
-		createTestQualifier(ICC, M1, code);
-		createTestQualifier(ICC, M3, code);
-		createTestQualifier(ICC, M5, code);
-		createTestQualifier(CC, M1, code);
-		createTestQualifier(CC, M2, code);
-		createTestQualifier(CC, S2, code);
-		createTestQualifier(CC, M3, code);
-		createTestQualifier(CC, M4, code);
-		createTestQualifier(CC, S4, code);
-		createTestQualifier(CC, M5, code);
-		createTestQualifier(CC, M6, code);
-		createTestQualifier(CC, S6, code);
-		
-		createTestQualifier(N_A, M1, code);
-		createTestQualifier(N_A, M2, code);
-		createTestQualifier(N_A, S2, code);
-		createTestQualifier(N_B, M1, code);
-		createTestQualifier(N_B, M2, code);
-		createTestQualifier(N_B, S2, code);
-		createTestQualifier(N_B, M3, code);
-		createTestQualifier(N_B, M4, code);
-		createTestQualifier(N_B, S4, code);
-		createTestQualifier(N_C, M1, code);
-		createTestQualifier(N_C, M2, code);
-		createTestQualifier(N_C, S2, code);
-		createTestQualifier(N_C, M3, code);
-		createTestQualifier(N_C, M4, code);
-		createTestQualifier(N_C, S4, code);
-		createTestQualifier(N_C, M5, code);
-		createTestQualifier(N_C, M6, code);
-		createTestQualifier(N_C, S6, code);
-
-		createJavaFile(code, 146, 1, 1);
-	}
-	
-	public static void gen_aa_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AA);
-		
-		createJavaFile(code, 32, 2, 1);
-	}
-
-	public static void gen_ab_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AB);
-		
-		createJavaFile(code, 32, 2, 2);
-	}
-
-	public static void gen_ac_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AC);
-		
-		createJavaFile(code, 32, 2, 3);
-	}
-
-	public static void gen_bb_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, BB);
-		
-		createJavaFile(code, 32, 2, 4);
-	}
-
-	public static void gen_bc_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, BC);
-		
-		createJavaFile(code, 32, 2, 5);
-	}
-
-	public static void gen_cc_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, CC);
-		
-		createJavaFile(code, 32, 2, 6);
-	}
-
-	public static void gen_bb_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, BB);
-		
-		createJavaFile(code, 68, 2, 1);
-	}
-
-	public static void gen_bc_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, BC);
-		
-		createJavaFile(code, 68, 2, 2);
-	}
-
-	public static void gen_cc_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, CC);
-		
-		createJavaFile(code, 68, 2, 3);
-	}
-
-	public static void gen_cc_testC() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestC(code, CC);
-		
-		createJavaFile(code, 119, 2, 1);
-	}
-
-	//-------------	
-
-	public static void createTest_TestA(StringBuffer code, int qualifier) {
-		createTest(instanceLevel[qualifier], M1, code);
-		createTest(instanceLevel[qualifier], M2, code);
-		createTest(0, S2, code);
-	}
-
-	public static void createTest_TestB(StringBuffer code, int qualifier) {
-		createTest(instanceLevel[qualifier], M1, code);
-		createTest(instanceLevel[qualifier], M2, code);
-		createTest(1, S2, code);
-		createTest(instanceLevel[qualifier], M3, code);
-		createTest(instanceLevel[qualifier], M4, code);
-		createTest(1, S4, code);
-		createTestQualifier(SUPER_A, M1, code);
-		createTestQualifier(SUPER_A, M2, code);
-	}
-
-	public static void createTest_TestC(StringBuffer code, int qualifier) {
-		createTest(instanceLevel[qualifier], M1, code);
-		createTest(instanceLevel[qualifier], M2, code);
-		createTest(2, S2, code);
-		createTest(instanceLevel[qualifier], M3, code);
-		createTest(instanceLevel[qualifier], M4, code);
-		createTest(2, S4, code);
-		createTest(instanceLevel[qualifier], M5, code);
-		createTest(instanceLevel[qualifier], M6, code);
-		createTest(2, S6, code);
-		createTestQualifier(SUPER_B, M1, code);
-		createTestQualifier(SUPER_B, M2, code);
-		createTestQualifier(SUPER_B, M3, code);
-		createTestQualifier(SUPER_B, M4, code);
-	}
-
-	//-------------
-
-	public static void createTest(int level, int method, StringBuffer code) {
-		String strMethod= methods[method];
-		code.append("\tpublic void testEvalNestedTypeTest_" + strMethod + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("\"" + strMethod + "()\"", true, code);
-		genCodeReturnTypeCheck(strMethod, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType(strMethod, "int", "Int", "" + values[level][method], true, code);
-
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	
-	public static void createTestQualifier(int qualifier, int method, StringBuffer code) {
-		String strQualifier= qualifiers[qualifier];
-		String nameQualifier= strQualifier.replace('(', '_').replace(')', '_').replace(' ', '_');
-		String strMethod= methods[method];
-		int[] level= ((method + 1) % 3 == 0) ? staticLevel : instanceLevel;
-		code.append("\tpublic void testEvalNestedTypeTest_" + nameQualifier + "_" + strMethod + "() throws Throwable {\n");
-		tryBlockBegin(code);
-		
-		genCodeEval("\"" + strQualifier + "." + strMethod + "()\"", true, code);
-		genCodeReturnTypeCheck(strQualifier + "." + strMethod, "int", true, code);
-		genCodeReturnValueCheckPrimitiveType(strQualifier + "." + strMethod, "int", "Int", "" + values[level[qualifier]][method], true, code);
-
-		tryBlockEnd(code);
-		code.append("\t}\n\n");
-	}
-	
-	//------------
-	
-	
-	public static void createJavaFile(StringBuffer tests, int lineNumber, int numberFrames, int hitCount) throws Exception {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("/*******************************************************************************\n");
-		code.append(" * Copyright (c) 2002, 2003 IBM Corporation and others.\n");
-		code.append(" * All rights reserved. This program and the accompanying materials \n");
-		code.append(" * are made available under the terms of the Eclipse Public License v1.0\n");
-		code.append(" * which accompanies this distribution, and is available at\n");
-		code.append(" * http://www.eclipse.org/legal/epl-v10.html\n");
-		code.append(" * \n");
-		code.append(" * Contributors:\n");
-		code.append(" *     IBM Corporation - initial API and implementation\n");
-		code.append(" *******************************************************************************/\n");
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("import org.eclipse.debug.core.model.IValue;\n");
-		code.append("import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n\n");
-		code.append("public class TypeHierarchy_" + lineNumber + "_" + hitCount + " extends Tests {\n");
-		code.append("\t/**\n");
-		code.append("\t * Constructor for TypeHierarchy.\n");
-		code.append("\t * @param name\n");
-		code.append("\t */\n");
-		code.append("\tpublic TypeHierarchy_" + lineNumber + "_" + hitCount + "(String name) {\n");
-		code.append("\t\tsuper(name);\n");
-		code.append("\t}\n\n");
-		code.append("\tpublic void init() throws Exception {\n");
-		code.append("\t\tinitializeFrame(\"EvalTypeHierarchyTests\", " + lineNumber + ", " + numberFrames + ", " + hitCount + ");\n");
-		code.append("\t}\n\n");
-		code.append("\tprotected void end() throws Exception {\n");
-		code.append("\t\tdestroyFrame();\n");
-		code.append("\t}\n\n");
-		
-		code.append(tests.toString());
-		
-		code.append("}\n");
-		
-		Writer file = new FileWriter(new File("TypeHierarchy_" + lineNumber + "_" + hitCount + ".java").getAbsoluteFile());
-		
-		file.write(code.toString());
-		
-		file.close();
-		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java
deleted file mode 100644
index 6ecbcfd..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfBreakpointTests.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.debug.tests.performance;
-
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointListener;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.test.performance.Dimension;
-
-public class PerfBreakpointTests extends AbstractDebugPerformanceTest implements IBreakpointListener {
-
-    int breakpointCount = 0;
-
-    public PerfBreakpointTests(String name) {
-        super(name);
-    }
-
-    public void testLineBreakpointCreation() throws Exception {
-        tagAsSummary("Install Line Breakpoints", Dimension.ELAPSED_PROCESS);
-        String typeName = "LargeSourceFile";
-        IResource resource = getBreakpointResource(typeName);
-
-        IJavaLineBreakpoint bp = createLineBreakpoint(14, typeName);
-        IJavaThread thread = launchToBreakpoint(typeName);
-        bp.delete();
-        
-        try {
-            DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this);
-
-            int[] lineNumbers = new int[150];
-            for (int i = 0; i < lineNumbers.length; i++) {
-                lineNumbers[i] = 15 + i;
-            }
-            
-            for (int i = 0; i < 5; i++) {
-                createLineBreakpoints(resource, typeName, lineNumbers);
-                waitForBreakpointCount(lineNumbers.length);
-                removeAllBreakpoints();
-                waitForBreakpointCount(0);
-                breakpointCount = 0;  
-            }
-
-            for (int i = 0; i < 10; i++) {
-                System.gc();
-                startMeasuring();
-                createLineBreakpoints(resource, typeName, lineNumbers);
-                waitForBreakpointCount(lineNumbers.length);
-                stopMeasuring();
-                removeAllBreakpoints();
-                waitForBreakpointCount(0);
-                breakpointCount = 0;
-            }
-            commitMeasurements();
-            assertPerformance();
-        } finally {
-            DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-            removeAllBreakpoints();
-            terminateAndRemove(thread);
-        }
-    }
-
-    public void testBreakpointRemoval() throws Exception {
-        tagAsSummary("Remove Line Breakpoints", Dimension.ELAPSED_PROCESS);
-        String typeName = "LargeSourceFile";
-        IResource resource = getBreakpointResource(typeName);
-
-        IJavaLineBreakpoint bp = createLineBreakpoint(14, typeName);
-        IJavaThread thread = launchToBreakpoint(typeName);
-        bp.delete();
-
-        IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
-        try {
-            manager.addBreakpointListener(this);
-
-            int[] lineNumbers = new int[50];
-            for (int i = 0; i < lineNumbers.length; i++) {
-                lineNumbers[i] = 15 + i;
-            }
-
-            for (int i = 0; i < 5; i++) {
-                createLineBreakpoints(resource, typeName, lineNumbers);
-                waitForBreakpointCount(lineNumbers.length);
-                IBreakpoint[] breakpoints = manager.getBreakpoints();
-                manager.removeBreakpoints(breakpoints, true);
-                waitForBreakpointCount(0);
-            }
-
-            lineNumbers = new int[250];
-            for (int i = 0; i < lineNumbers.length; i++) {
-                lineNumbers[i] = 15 + i;
-            }
-
-            for (int i = 0; i < 10; i++) {
-                createLineBreakpoints(resource, typeName, lineNumbers);
-                waitForBreakpointCount(lineNumbers.length);
-                IBreakpoint[] breakpoints = manager.getBreakpoints();
-                System.gc();
-                startMeasuring();
-                manager.removeBreakpoints(breakpoints, true);
-                waitForBreakpointCount(0);
-                stopMeasuring();
-            }
-            commitMeasurements();
-            assertPerformance();
-        } finally {
-            manager.removeBreakpointListener(this);
-            removeAllBreakpoints();
-            terminateAndRemove(thread);
-        }
-    }
-    
-
-
-    public void testMethodEntryBreakpointCreation() throws Exception {
-        tagAsSummary("Install Method Entry Breakpoints", Dimension.ELAPSED_PROCESS);
-        String typeName = "LargeSourceFile";
-        IProject project = getJavaProject().getProject();
-        
-        IJavaLineBreakpoint bp = createLineBreakpoint(14, typeName);
-        IJavaThread thread = launchToBreakpoint(typeName);
-        bp.delete();
-
-        IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
-        try {
-            manager.addBreakpointListener(this);
-
-            String[] methods = new String[300];
-            for (int i = 0; i < methods.length; i++) {
-                methods[i] = "method"+(i+1);
-            }
-
-            for (int i = 0; i < 2; i++) {
-                createMethodEntryBreakpoints(project, typeName, methods);
-                waitForBreakpointCount(methods.length);
-                removeAllBreakpoints();
-                waitForBreakpointCount(0);
-            }
-
-            for (int i = 0; i < 10; i++) {
-                System.gc();
-                startMeasuring();
-                createMethodEntryBreakpoints(project, typeName, methods);
-                waitForBreakpointCount(methods.length);
-                stopMeasuring();
-                removeAllBreakpoints();
-                breakpointCount = 0;
-            }
-            commitMeasurements();
-            assertPerformance();
-        } finally {
-            DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-            removeAllBreakpoints();
-            terminateAndRemove(thread);
-        }        
-    }
-
-    public void testWatchpointCreation() throws Exception {
-        tagAsSummary("Install Watchpoints", Dimension.ELAPSED_PROCESS);
-        String typeName = "LotsOfFields";
-        IResource resource = getBreakpointResource(typeName);
-        
-        IJavaLineBreakpoint bp = createLineBreakpoint(516, typeName);
-        IJavaThread thread = launchToBreakpoint(typeName);
-        bp.delete();
-
-        IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
-        try {
-            manager.addBreakpointListener(this);
-
-            String[] fields = new String[300];
-            for (int i = 0; i < fields.length; i++) {
-                fields[i] = "field_"+(i+1);
-            }
-
-            for (int i = 0; i < 2; i++) {
-                createWatchpoints(resource, typeName, fields);
-                waitForBreakpointCount(fields.length);
-                removeAllBreakpoints();
-                waitForBreakpointCount(0);
-            }
-
-            for (int i = 0; i < 10; i++) {
-                System.gc();
-                startMeasuring();
-                createWatchpoints(resource, typeName, fields);
-                waitForBreakpointCount(fields.length);
-                stopMeasuring();
-                removeAllBreakpoints();
-                breakpointCount = 0;
-            }
-            commitMeasurements();
-            assertPerformance();
-        } finally {
-            DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-            removeAllBreakpoints();
-            terminateAndRemove(thread);
-        }        
-    }
-    
-    private synchronized void waitForBreakpointCount(int i) throws Exception {
-        long end = System.currentTimeMillis() + 60000;
-        while (breakpointCount != i && System.currentTimeMillis() < end) {
-            wait(30000);
-        }
-        assertEquals("Expected " + i + " breakpoints, notified of " + breakpointCount, i, breakpointCount);
-    }
-
-    private void createLineBreakpoints(IResource resource, String typeName, int[] lineNumbers) throws CoreException {
-        for (int i = 0; i < lineNumbers.length; i++) {
-            JDIDebugModel.createLineBreakpoint(resource, typeName, lineNumbers[i], -1, -1, 0, true, null);
-        }
-    }
-
-    private void createMethodEntryBreakpoints(IProject project, String typeName, String[] methods) throws CoreException {
-        for (int i = 0; i < methods.length; i++) {
-            String methodName = methods[i];
-            JDIDebugModel.createMethodBreakpoint(project, typeName, methodName, "()V", true, false, false, -1, -1, -1, 0, true, null);
-        }
-    }
-    
-    private void createWatchpoints(IResource resource, String typeName, String[] fields) throws Exception {
-        for(int i = 0; i < fields.length; i++) {
-            IJavaWatchpoint wp = JDIDebugModel.createWatchpoint(getBreakpointResource(typeName), typeName, fields[i], -1, -1, -1, 0, true, null);
-            wp.setAccess(true);
-            wp.setModification(true);
-        }
-    }
-    
-    public synchronized void breakpointAdded(IBreakpoint breakpoint) {
-        breakpointCount++;
-        notifyAll();
-    }
-
-    public synchronized void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
-        breakpointCount--;
-        notifyAll();
-    }
-
-    public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java
deleted file mode 100644
index 2e3786b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConditionalBreakpointsTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.performance;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.test.performance.Dimension;
-
-/**
- * Tests performance of conditional breakpoints.
- */
-public class PerfConditionalBreakpointsTests extends AbstractDebugPerformanceTest {
-    private String fTypeName = "PerfLoop";
-
-    private int fHitCount = 0;
-
-    private IJavaLineBreakpoint fBP;
-
-    private IJavaDebugTarget fTarget;
-
-    private Exception fException;
-
-    private boolean fConditionalBreakpointSet = false;
-
-    private boolean fWarmUpComplete = false;
-
-    private int fWarmUpRuns = 2;
-
-    private int fMeasuredRuns = 10;
-
-    private class BreakpointListener implements IDebugEventSetListener {
-        public void handleDebugEvents(DebugEvent[] events) {
-            for (int i = 0; i < events.length; i++) {
-                DebugEvent event = events[i];
-                if (event.getKind() == DebugEvent.SUSPEND && event.getDetail() == DebugEvent.BREAKPOINT) {
-                    IJavaThread source = (IJavaThread) event.getSource();
-                    breakpointHit(source);
-                }
-            }
-        }
-    };
-
-    public PerfConditionalBreakpointsTests(String name) {
-        super(name);
-    }
-
-    public void testConditionalBreakpoints() throws Exception {
-        tagAsGlobalSummary("Conditional Breakpoint Test", Dimension.ELAPSED_PROCESS);
-        // just in case
-        removeAllBreakpoints();
-
-        fBP = createLineBreakpoint(22, fTypeName);
-
-        BreakpointListener listener = new BreakpointListener();
-        DebugPlugin.getDefault().addDebugEventListener(listener);
-        ILaunchConfiguration config = getLaunchConfiguration(fTypeName);
-        try {
-            fTarget = launchAndTerminate(config, 5 * 60 * 1000);
-
-            if (fException != null) {
-                throw fException;
-            }
-
-            commitMeasurements();
-            assertPerformance();
-
-            removeAllBreakpoints();
-        } finally {
-            DebugPlugin.getDefault().removeDebugEventListener(listener);
-        }
-    }
-
-    private synchronized void breakpointHit(IJavaThread thread) {
-        try {
-            if (!fConditionalBreakpointSet) {
-                fBP.delete();
-                fBP = createConditionalLineBreakpoint(22, fTypeName, "i%100==0", true);
-                fConditionalBreakpointSet = true;
-            } else if (!fWarmUpComplete) {
-                fHitCount++;
-                if (fHitCount == fWarmUpRuns) {
-                    fWarmUpComplete = true;
-                    fHitCount = 0;
-                }
-                return;
-            } else {
-                if (fHitCount > 0) {
-                    stopMeasuring();
-                }
-                fHitCount++;
-                if (fHitCount <= fMeasuredRuns) {
-                    System.gc();
-                    startMeasuring();
-                } else {
-                    fBP.delete();
-                }
-            }
-        } catch (Exception e) {
-            fException = e;
-            removeAllBreakpoints();
-        } finally {
-            try {
-                thread.resume();
-            } catch (DebugException e) {
-                fException = e;
-            }
-        }
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java
deleted file mode 100644
index 1165cbd..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfConsoleTests.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.performance;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTrackerExtension;
-import org.eclipse.jdt.debug.testplugin.ConsoleLineTracker;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.test.performance.Dimension;
-
-/**
- * Tests performance of the console.
- */
-public class PerfConsoleTests extends AbstractDebugPerformanceTest implements IConsoleLineTrackerExtension {
-
-    protected boolean fWarmingUp = false;
-
-    protected boolean fStarted = false;
-
-    protected boolean fStopped = false;
-
-    protected Object fLock = new Object();
-
-    public PerfConsoleTests(String name) {
-        super(name);
-    }
-
-
-    public void testProcessConsolePlainOutput10000Lines() throws Exception {
-        tagAsSummary("Process Console 10,000 lines: plain output", Dimension.ELAPSED_PROCESS);
-        runConsole80CharsTest(10000, 10);
-    }
-    
-    public void testProcessConsoleStackTraceOutput10000Lines() throws Exception {
-        tagAsSummary("Process Console 10,000 lines: stack trace output", Dimension.ELAPSED_PROCESS);
-        setComment("3.1 uses regex pattern matching support to detect hyperlinks.");
-        runStackTrace(5000, 10); // 2 lines * 5000 repeats = 10000 lines
-    }
-
-    public void testProcessConsoleWrappedOutput10000Lines() throws Exception {
-        tagAsSummary("Process Console 10,000 lines: wrapped output", Dimension.ELAPSED_PROCESS);
-        runVariableLength(2500, 10); // 4 lines * 2500 repeats = 10000 lines
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        fStarted = false;
-        fStopped = false;
-        ConsoleLineTracker.setDelegate(this);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see junit.framework.TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        ConsoleLineTracker.setDelegate(null);
-    }
-
-    protected void runConsole80CharsTest(int lines, int repeatTest) throws Exception {
-        String typeName = "Console80Chars";
-        ILaunchConfiguration configuration = getLaunchConfiguration(typeName);
-        ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy();
-        workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, Integer.toString(lines));
-
-        warmupRun(workingCopy);
-
-        for (int i = 0; i < repeatTest; i++) {
-            launchWorkingCopyAndWait(workingCopy);
-            assertTrue("Never received 'start' notification", fStarted);
-            assertTrue("Never received 'stopped' notification", fStopped);
-            fStopped = false;
-        }
-        commitMeasurements();
-        assertPerformance();
-    }
-
-    /*
-     * prints (2*prints)+2 lines
-     */
-    protected void runStackTrace(int prints, int repeatTest) throws Exception {
-        String typeName = "ConsoleStackTrace";
-        ILaunchConfiguration configuration = getLaunchConfiguration(typeName);
-        ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy();
-        workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, Integer.toString(prints));
-
-        warmupRun(workingCopy);
-
-        for (int i = 0; i < repeatTest; i++) {
-            launchWorkingCopyAndWait(workingCopy);
-            assertTrue("Never received 'start' notification", fStarted);
-            assertTrue("Never received 'stopped' notification", fStopped);
-            fStopped = false;
-
-        }
-        commitMeasurements();
-        assertPerformance();
-    }
-
-    /*
-     * prints (4*prints)+2 lines
-     */
-    protected void runVariableLength(int prints, int repeatTest) throws Exception {
-        String typeName = "ConsoleVariableLineLength";
-        ILaunchConfiguration configuration = getLaunchConfiguration(typeName);
-        ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy();
-        workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, Integer.toString(prints));
-        IPreferenceStore debugUIPreferences = DebugUIPlugin.getDefault().getPreferenceStore();
-        try {
-            debugUIPreferences.setValue(IDebugPreferenceConstants.CONSOLE_WRAP, true);
-            workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, Integer.toString(prints));
-
-            warmupRun(workingCopy);
-
-            for (int i = 0; i < repeatTest; i++) {
-                launchWorkingCopyAndWait(workingCopy);
-                assertTrue("Never received 'start' notification", fStarted);
-                assertTrue("Never received 'stopped' notification", fStopped);
-                fStopped = false;
-            }
-            commitMeasurements();
-            assertPerformance();
-        } finally {
-            debugUIPreferences.setValue(IDebugPreferenceConstants.CONSOLE_WRAP, false);
-        }
-    }
-
-    protected void warmupRun(ILaunchConfigurationWorkingCopy workingCopy) throws Exception {
-        fWarmingUp = true;
-        for (int i = 0; i < 5; i++) {
-            launchWorkingCopyAndWait(workingCopy);
-            fStopped = false;
-        }
-        fWarmingUp = false;
-    }
-
-    protected void launchWorkingCopyAndWait(final ILaunchConfigurationWorkingCopy workingCopy) throws Exception {
-        Runnable runnable = new Runnable() {
-            public void run() {
-                DebugUITools.launch(workingCopy, ILaunchManager.RUN_MODE);
-            }
-        };
-        
-        DebugUIPlugin.getStandardDisplay().asyncExec(runnable);
-        
-        synchronized (fLock) {
-            if (!fStopped) {
-                fLock.wait(360000);
-            }
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.debug.ui.console.IConsoleLineTrackerExtension#consoleClosed()
-     */
-    public void consoleClosed() {
-        if (fStarted) {
-            stopMeasuring();
-        }
-        synchronized (fLock) {
-            fStopped = true;
-            fLock.notifyAll();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-     */
-    public void init(IConsole console) {
-        if (!fWarmingUp) {
-            fStarted = true;
-            startMeasuring();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-     */
-    public void lineAppended(IRegion line) {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-     */
-    public void dispose() {
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java
deleted file mode 100644
index cbe91cb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfContextualLaunchMenu.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.performance;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.ui.actions.ContextualLaunchAction;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.test.performance.Dimension;
-
-public class PerfContextualLaunchMenu extends AbstractDebugPerformanceTest {
-    
-    public PerfContextualLaunchMenu(String name) {
-        super(name);
-    }
-
-    public void testContextualLaunchMenu() throws Exception {
-        tagAsGlobalSummary("Fill Contextual Launch Menu", Dimension.ELAPSED_PROCESS);
-        final PerfTestContextualLaunchAction action = new PerfTestContextualLaunchAction();
-        
-        ICompilationUnit cu = getCompilationUnit(getJavaProject(), "src", "org.eclipse.debug.tests.targets", "SourceLookup.java");        
-        StructuredSelection selection = new StructuredSelection(new Object[] {cu});
-        action.selectionChanged(new BogusAction(), selection);
-        
-        DebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
-            public void run() {
-                Shell shell = DebugUIPlugin.getStandardDisplay().getActiveShell();
-                Menu menu = action.getMenu(new Menu(shell));
-                showMenu(action, menu, 5);
-                
-                for(int i=0; i<10; i++) {
-                    try {
-                    System.gc();
-                    startMeasuring();
-                    showMenu(action, menu, 40);
-                    stopMeasuring();
-                    } catch (Throwable t) {
-                        System.err.println("Error on iteration: " + i);
-                        t.printStackTrace();
-                        break;
-                    }
-                }
-            }
-
-            private void showMenu(PerfTestContextualLaunchAction action, Menu menu, int repeat) {
-                for (int j = 0; j < repeat; j++) {
-                    action.showMenu(menu);
-                }
-            }
-        });
-
-
-        commitMeasurements();
-        assertPerformance();
-    }
-    
-    private class BogusAction extends Action {
-    }
-    
-    private class PerfTestContextualLaunchAction extends ContextualLaunchAction {
-
-        public PerfTestContextualLaunchAction() {
-            super(ILaunchManager.RUN_MODE);
-        }
-        
-        void showMenu(Menu menu) {
-            fillMenu(menu);
-        }
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfDebugBaselineTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfDebugBaselineTest.java
deleted file mode 100644
index e1373e9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfDebugBaselineTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.performance;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class PerfDebugBaselineTest extends PerformanceTestCase {
-
-    public void testBaseline() {
-        tagAsSummary("Baseline Test", Dimension.ELAPSED_PROCESS);
-        Performance perf = Performance.getDefault();
-        StringBuffer buffer = new StringBuffer();
-        for (int i = 0; i < 10000; i++) {
-            buffer.append("at org.eclipse.jdt.internal.debug.core.model.JDILocalVariable.retrieveValue(JDILocalVariable.java:56\n");
-        }
-        String text = buffer.toString();
-        
-        //ensure class loading and JIT is done.
-        for (int i= 0; i < 5; i++) {
-            int matches = findMatches(text);
-        }
-        
-        try {
-            for (int i= 0; i < 10; i++) {
-                fPerformanceMeter.start();
-                int matches = findMatches(text);
-                fPerformanceMeter.stop();
-            }
-            fPerformanceMeter.commit();
-            perf.assertPerformance(fPerformanceMeter);
-        } finally {
-            fPerformanceMeter.dispose();
-        }
-    }
-
-    /*
-     * Pattern does not match the input - input is missing paren before newline.
-     * Strangely, the matching completes much quicker when there are 1000 matches
-     * than when there are none.
-     */
-    private int findMatches(String text) {
-        Pattern pattern = Pattern.compile("\\w\\S*\\(\\S*\\.java:\\S*\\)");
-        Matcher matcher = pattern.matcher(text);
-        
-        int count = 0;
-        while (matcher.find()) {
-            count++;
-        }
-        return count;
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java
deleted file mode 100644
index 2f5ad1f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfSteppingTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.performance;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventFilter;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.test.performance.Dimension;
-
-/**
- * Tests performance of stepping.
- */
-public class PerfSteppingTests extends AbstractDebugPerformanceTest {
-	
-	public PerfSteppingTests(String name) {
-		super(name);
-	}
-	
-	class MyFilter implements IDebugEventFilter {
-		
-		private IJavaThread fThread = null;
-		private Object fLock;
-		private DebugEvent[] EMPTY = new DebugEvent[0];
-
-		public MyFilter(IJavaThread thread, Object lock) {
-			fThread = thread;
-			fLock = lock;
-		}
-		
-		public DebugEvent[] filterDebugEvents(DebugEvent[] events) {
-			for (int i = 0; i < events.length; i++) {
-				DebugEvent event = events[i];
-				if (event.getSource() == fThread) {
-					if (event.getKind() == DebugEvent.SUSPEND && event.getDetail() == DebugEvent.STEP_END) {
-						synchronized (fLock) {
-							fLock.notifyAll();
-						}
-					}
-					return EMPTY;
-				}
-			}
-			return events;
-		}
-		
-		public void step() {
-			synchronized (fLock) {
-				try {
-					fThread.stepOver();
-				} catch (DebugException e) {
-					assertTrue(e.getMessage(), false);
-				}
-				try {
-					fLock.wait();
-				} catch (InterruptedException e) {
-					assertTrue(e.getMessage(), false);
-				}
-			}
-			 
-		}
-		
-	}
-
-	/**
-	 * Tests stepping over without taking into account event processing in the UI.
-	 * 
-	 * @throws Exception
-	 */
-	public void testBareStepOver() throws Exception {
-		tagAsSummary("Bare Step Over", Dimension.ELAPSED_PROCESS);
-		String typeName = "PerfLoop";
-		IJavaLineBreakpoint bp = createLineBreakpoint(20, typeName);
-		
-		IJavaThread thread= null;
-		try {			
-			thread= launchToBreakpoint(typeName, false);
-			
-			// warm up
-			Object lock = new Object();
-			MyFilter filter = new MyFilter(thread, lock);
-			DebugPlugin.getDefault().addDebugEventFilter(filter);
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			for (int n= 0; n < 10; n++) {
-				for (int i = 0; i < 100; i++) {
-					filter.step();
-				}
-			}			
-			DebugPlugin.getDefault().removeDebugEventFilter(filter);			
-			
-			// real test
-			lock = new Object();
-			filter = new MyFilter(thread, lock);
-			DebugPlugin.getDefault().addDebugEventFilter(filter);
-			
-			frame = (IJavaStackFrame)thread.getTopStackFrame();
-			for (int n= 0; n < 10; n++) {
-				startMeasuring();
-				for (int i = 0; i < 500; i++) {
-					filter.step();
-				}
-				stopMeasuring();
-			}
-			commitMeasurements();
-			assertPerformance();
-			
-			DebugPlugin.getDefault().removeDebugEventFilter(filter);
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java
deleted file mode 100644
index 62be46d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/performance/PerfVariableDetailTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.performance;
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IValueDetailListener;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.IJavaVariable;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.test.performance.Dimension;
-
-/**
- * Tests performance of conditional breakpoints.
- */
-public class PerfVariableDetailTests extends AbstractDebugPerformanceTest implements IValueDetailListener {
-
-    private IJavaDebugTarget fTarget;
-    private Object fLock = new Object();
-    
-    public PerfVariableDetailTests(String name) {
-        super(name);
-    }
-
-    public void detailComputed(IValue value, String result) {
-    	synchronized (fLock) {
-    		fLock.notifyAll();
-		}
-	}
-    
-    public void testToStringDetails() throws Exception {
-        // just in case
-    	tagAsSummary("Computing variable toString() details iteratively", Dimension.ELAPSED_PROCESS);
-        removeAllBreakpoints();
-        String typeName = "VariableDetails";
-        IJavaLineBreakpoint breakpoint = createLineBreakpoint(24, typeName);
-        IJavaThread thread = null;
-        try {
-        	thread = launchToBreakpoint(typeName);
-        	IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
-        	assertNotNull("Missing top stack frame", frame);
-        	IJavaVariable variable = frame.findVariable("v");
-        	assertNotNull("Missing variable 'v'", variable);
-        	IDebugModelPresentation presentation = DebugUITools.newDebugModelPresentation("org.eclipse.jdt.debug");
-        	IValue value = variable.getValue();
-        	
-        	// warm up
-        	for (int i = 0; i < 100; i++) {
-        		synchronized (fLock) {
-        			presentation.computeDetail(value, this);
-        			fLock.wait(30000);
-        		}
-        	}
-        	
-        	// test
-        	for (int i = 0; i < 10; i++) {
-        		startMeasuring();
-        		for (int j = 0; j < 150; j++) {
-	        		synchronized (fLock) {
-	        			presentation.computeDetail(value, this);
-	        			fLock.wait(30000);
-	        		}
-        		}
-        		stopMeasuring();
-        	}
-        	
-        	commitMeasurements();
-        	assertPerformance();
-        	
-        } finally {
-        	removeAllBreakpoints();
-        	terminateAndRemove(thread);
-        }
-    }
-
-	
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java
deleted file mode 100644
index 8b4f2a6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/JavaApplicationStatusHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.debug.tests.ui.performance;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-
-public class JavaApplicationStatusHandler implements IStatusHandler {
-
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object)
-     */
-    public Object handleStatus(IStatus status, Object source) throws CoreException {
-        ILaunchConfigurationDialog dialog = (ILaunchConfigurationDialog)source;
-		dialog.setActiveTab(3);
-		return null;
-    }
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/OpenLaunchConfigurationDialogTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/OpenLaunchConfigurationDialogTests.java
deleted file mode 100644
index 6b3df07..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/performance/OpenLaunchConfigurationDialogTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.debug.tests.ui.performance;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog;
-import org.eclipse.jdt.debug.tests.AbstractDebugPerformanceTest;
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-public class OpenLaunchConfigurationDialogTests extends AbstractDebugPerformanceTest {
-
-    public OpenLaunchConfigurationDialogTests(String name) {
-        super(name);
-    }
-
-    public static String fgIdentifier= "org.eclipse.jdt.launching.localJavaApplication";
-    
-    public void testOpenJavaProgramLaunchConfigurationDialog1() {
-        // cold run
-        ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		IStructuredSelection selection= new StructuredSelection(config);
-		for (int i = 0; i < 100; i++) {
-		    openLCD(selection, fgIdentifier); 
-        }
-		
-		commitMeasurements();
-		assertPerformance();
-    }
-    
-    public void testOpenJavaProgramLaunchConfigurationDialog2() {
-        // warm run..depends on testOpenJavaProgramLaunchConfigurationDialog1 for cold start
-        ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		IStructuredSelection selection = new StructuredSelection(config);
-		openLCD(selection, fgIdentifier);
-    }
-
-    private void openLCD(final IStructuredSelection selection, final String groupIdentifier) {
-       
-        //set a status to go to the classpath tab
-	    IStatus status = new Status(IStatus.INFO, IJavaDebugUIConstants.PLUGIN_ID, 1000, "", null); //$NON-NLS-1$
-		LaunchConfigurationsDialog dialog= new LaunchConfigurationsDialog(DebugUIPlugin.getShell(), DebugUIPlugin.getDefault().getLaunchConfigurationManager().getLaunchGroup(groupIdentifier));
-		dialog.setBlockOnOpen(false);
-		dialog.setOpenMode(LaunchConfigurationsDialog.LAUNCH_CONFIGURATION_DIALOG_OPEN_ON_SELECTION);
-		dialog.setInitialSelection(selection);
-		dialog.setInitialStatus(status);
-		startMeasuring();
-		dialog.open();
-		dialog.close();
-		stopMeasuring();
-    }
-}
diff --git a/org.eclipse.jdt.debug/buildnotes_jdt-debug.html b/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
index 50b3f5b..fb39a7e 100644
--- a/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
+++ b/org.eclipse.jdt.debug/buildnotes_jdt-debug.html
@@ -50,7 +50,7 @@
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25362">25362</a>: Cannot evaluate in the context of an array<br>
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106091">106091</a>: Code assist for eval in context of an array<br> 
 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106243">106243</a>: clear detail formatter cache when 'max detail length' pref changes<br>
-
+<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=106361">106361</a>: NPE when adding a new JRE<br>
 
 <h2>Aug 2, 2005</h2>
 <h3>Enhancements</h3>
diff --git a/org.eclipse.jdt.launching.macosx/.classpath b/org.eclipse.jdt.launching.macosx/.classpath
deleted file mode 100644
index 230dc67..0000000
--- a/org.eclipse.jdt.launching.macosx/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="macosx"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.launching.macosx/.cvsignore b/org.eclipse.jdt.launching.macosx/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.launching.macosx/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.launching.macosx/.project b/org.eclipse.jdt.launching.macosx/.project
deleted file mode 100644
index 74cfe59..0000000
--- a/org.eclipse.jdt.launching.macosx/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.launching.macosx</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.jface</project>
-		<project>org.eclipse.ui</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 422e1e8..0000000
--- a/org.eclipse.jdt.launching.macosx/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Tue Nov 30 15:51:23 CET 2004
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
deleted file mode 100644
index f797d74..0000000
--- a/org.eclipse.jdt.launching.macosx/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jdt.launching.macosx; singleton:=true
-Bundle-Version: 3.1.0
-Bundle-Activator: org.eclipse.jdt.internal.launching.macosx.MacOSXLaunchingPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.debug.core,
- org.eclipse.jdt.debug,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui
-Eclipse-AutoStart: true
-Eclipse-PlatformFilter: (osgi.os=macosx)
diff --git a/org.eclipse.jdt.launching.macosx/about.html b/org.eclipse.jdt.launching.macosx/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/org.eclipse.jdt.launching.macosx/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching.macosx/build.properties b/org.eclipse.jdt.launching.macosx/build.properties
deleted file mode 100644
index bb24933..0000000
--- a/org.eclipse.jdt.launching.macosx/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = icons/,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               .,\
-               META-INF/
-source.. = macosx/
diff --git a/org.eclipse.jdt.launching.macosx/icons/full/ctool16/exportappbundle_wiz.gif b/org.eclipse.jdt.launching.macosx/icons/full/ctool16/exportappbundle_wiz.gif
deleted file mode 100644
index 6388d79..0000000
--- a/org.eclipse.jdt.launching.macosx/icons/full/ctool16/exportappbundle_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.launching.macosx/icons/full/wizban/exportapp_wiz.gif b/org.eclipse.jdt.launching.macosx/icons/full/wizban/exportapp_wiz.gif
deleted file mode 100644
index 7ba5382..0000000
--- a/org.eclipse.jdt.launching.macosx/icons/full/wizban/exportapp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
deleted file mode 100644
index f0a1421..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.internal.launching.StandardVMDebugger;
-import org.eclipse.jdt.launching.IVMInstall;
-
-public class MacOSXDebugVMRunner extends StandardVMDebugger {
-	
-	public MacOSXDebugVMRunner(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-	
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		return super.exec(MacOSXLaunchingPlugin.wrap(getClass(), cmdLine), workingDirectory);
-	}
-	
-	protected Process exec(String[] cmdLine, File workingDirectory, String[] envp) throws CoreException {
-		return super.exec(MacOSXLaunchingPlugin.wrap(getClass(), cmdLine), workingDirectory, envp);
-	}	
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
deleted file mode 100644
index 382b64a..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2002, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Andre Weinand - Initial implementation
-###############################################################################
-			
-MacOSXVMType.jvmName= JVM {0}
-MacOSXVMType.jvmDefaultName= JVM {0} (MacOS X Default)
-MacOSXVMType.error.notRoot=Not a JDK Root; MacOS X executable was not found
-MacOSXVMType.name=MacOS X VM
-
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
deleted file mode 100644
index a367f33..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.IOException;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.util.Assert;
-
-
-public class MacOSXLaunchingPlugin extends Plugin {
-	
-	private static MacOSXLaunchingPlugin fgPlugin;
-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.launching.macosx.MacOSXLauncherMessages";//$NON-NLS-1$
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-	public MacOSXLaunchingPlugin() {
-		super();
-		Assert.isTrue(fgPlugin == null);
-		fgPlugin= this;
-	}
-	
-	public static MacOSXLaunchingPlugin getDefault() {
-		return fgPlugin;
-	}
-	
-	static String getString(String key) {
-		try {
-			return fgResourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * Convenience method which returns the unique identifier of this plugin.
-	 */
-	static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return "org.eclipse.jdt.launching.macosx"; //$NON-NLS-1$
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	static String[] wrap(Class clazz, String[] cmdLine) {
-		
-		for (int i= 0; i < cmdLine.length; i++) {
-			// test whether we depend on SWT
-			if (useSWT(cmdLine[i]))
-				return createSWTlauncher(clazz, cmdLine, cmdLine[0]);
-		}
-		return cmdLine;
-	}
-	
-	/*
-	 * Heuristics: returns true if given argument refers to SWT. 
-	 */
-	private static boolean useSWT(String arg) {
-		return arg.indexOf("swt.jar") >= 0 ||	//$NON-NLS-1$
-			   arg.indexOf("org.eclipse.swt") >= 0 ||	//$NON-NLS-1$
-			   "-ws".equals(arg);	//$NON-NLS-1$
-	}
-	
-	/*
-	 * Returns path to executable.
-	 */
-	static String[] createSWTlauncher(Class clazz, String[] cmdLine, String vmVersion) {
-		
-		// the following property is defined if Eclipse is started via java_swt
-		String java_swt= System.getProperty("org.eclipse.swtlauncher");	//$NON-NLS-1$
-		
-		if (java_swt == null) {	
-			// not started via java_swt -> now we require that the VM supports the "-XstartOnFirstThread" option
-			String[] newCmdLine= new String[cmdLine.length+1];
-			int argCount= 0;
-			newCmdLine[argCount++]= cmdLine[0];
-			newCmdLine[argCount++]= "-XstartOnFirstThread"; //$NON-NLS-1$
-			for (int i= 1; i < cmdLine.length; i++)
-				newCmdLine[argCount++]= cmdLine[i];
-			return newCmdLine;
-		}
-		
-		try {
-			// copy java_swt to /tmp in order to get the app name right
-			Process process= Runtime.getRuntime().exec(new String[] { "/bin/cp", java_swt, "/tmp" }); //$NON-NLS-1$ //$NON-NLS-2$
-			process.waitFor();
-			java_swt= "/tmp/java_swt"; //$NON-NLS-1$
-		} catch (IOException e) {
-			// ignore and run java_swt in place
-		} catch (InterruptedException e) {
-			// ignore and run java_swt in place
-		}
-		
-		String[] newCmdLine= new String[cmdLine.length+1];
-		int argCount= 0;
-		newCmdLine[argCount++]= java_swt;
-		newCmdLine[argCount++]= "-XXvm=" + vmVersion; //$NON-NLS-1$
-		for (int i= 1; i < cmdLine.length; i++)
-			newCmdLine[argCount++]= cmdLine[i];
-		
-		return newCmdLine;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
deleted file mode 100644
index 9a8404f..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching.macosx;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.launching.AbstractVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.IVMRunner;
-
-public class MacOSXVMInstall extends AbstractVMInstall {
-
-	MacOSXVMInstall(IVMInstallType type, String id) {
-		super(type, id);
-	}
-
-	public IVMRunner getVMRunner(String mode) {
-		if (ILaunchManager.RUN_MODE.equals(mode))
-			return new MacOSXVMRunner(this);
-		
-		if (ILaunchManager.DEBUG_MODE.equals(mode))
-			return new MacOSXDebugVMRunner(this);
-		
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
deleted file mode 100644
index 31217e1..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jeff Myers myersj@gmail.com - fix for #75201
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.internal.launching.LibraryInfo;
-import org.eclipse.jdt.internal.launching.StandardVMType;
-
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMStandin;
-
-/**
- * This plugins into the org.eclipse.jdt.launching.vmInstallTypes extension point
- */
-public class MacOSXVMInstallType extends StandardVMType {
-	
-	/*
-	 * The directory structure for Java VMs is as follows:
-	 * 
-	 * 	/System/Library/Frameworks/JavaVM.framework/Versions/
-	 * 		1.3.1
-	 * 			Classes
-	 * 				classes.jar
-	 * 				ui.jar
-	 * 			Home
-	 * 				src.jar
-	 * 		1.4.1
-	 * 			Classes
-	 * 				classes.jar
-	 * 				ui.jar
-	 * 			Home
-	 * 				src.jar
-	 * 		CurrentJDK -> 1.3.1
-	 */
-	 
-	private static final String JAVA_VM_NAME= "Java HotSpot(TM) Client VM";	//$NON-NLS-1$
-	
-	/** The OS keeps all the JVM versions in this directory */
-	private static final String JVM_VERSION_LOC= "/System/Library/Frameworks/JavaVM.framework/Versions/";	//$NON-NLS-1$
-	/** The name of a Unix link to MacOS X's default VM */
-	private static final String CURRENT_JVM= "CurrentJDK";	//$NON-NLS-1$
-	/** The root of a JVM */
-	private static final String JVM_ROOT= "Home";	//$NON-NLS-1$
-	/** The doc (for all JVMs) lives here (if the developer kit has been expanded)*/
-	private static final String JAVADOC_LOC= "/Developer/Documentation/Java/Reference/";	//$NON-NLS-1$
-	/** The doc for 1.4.1 is kept in a sub directory of the above. */ 
-	private static final String JAVADOC_SUBDIR= "/doc/api";	//$NON-NLS-1$
-		
-				
-	public String getName() {
-		return MacOSXLaunchingPlugin.getString("MacOSXVMType.name"); //$NON-NLS-1$
-	}
-	
-	public IVMInstall doCreateVMInstall(String id) {
-		return new MacOSXVMInstall(this, id);
-	}
-			
-	/*
-	 * @see IVMInstallType#detectInstallLocation()
-	 */
-	public File detectInstallLocation() {
-		
-		String javaVMName= System.getProperty("java.vm.name");	//$NON-NLS-1$
-		if (javaVMName == null || !JAVA_VM_NAME.equals(javaVMName)) 
-			return null;
-
-		// find all installed VMs
-		File defaultLocation= null;
-		File versionDir= new File(JVM_VERSION_LOC);
-		if (versionDir.exists() && versionDir.isDirectory()) {
-			File currentJDK= new File(versionDir, CURRENT_JVM);
-			try {
-				currentJDK= currentJDK.getCanonicalFile();
-			} catch (IOException ex) {
-				// NeedWork
-			}
-			File[] versions= versionDir.listFiles();
-			for (int i= 0; i < versions.length; i++) {
-				String version= versions[i].getName();
-				File home= new File(versions[i], JVM_ROOT);
-				if (home.exists()) {
-					boolean isDefault= currentJDK.equals(versions[i]);
-					IVMInstall install= findVMInstall(version);
-					if (install == null && !CURRENT_JVM.equals(version)) {
-						VMStandin vm= new VMStandin(this, version);
-						vm.setInstallLocation(home);
-						String format= MacOSXLaunchingPlugin.getString(isDefault
-													? "MacOSXVMType.jvmDefaultName"		//$NON-NLS-1$
-													: "MacOSXVMType.jvmName");				//$NON-NLS-1$
-						vm.setName(MessageFormat.format(format, new Object[] { version } ));
-						vm.setLibraryLocations(getDefaultLibraryLocations(home));
-						URL doc= getDefaultJavadocLocation(home);
-						if (doc != null)
-							vm.setJavadocLocation(doc);
-						
-						IVMInstall rvm= vm.convertToRealVM();					
-						if (isDefault) {
-							defaultLocation= home;
-							try {
-								JavaRuntime.setDefaultVMInstall(rvm, null);
-							} catch (CoreException e) {
-								LaunchingPlugin.log(e);
-							}
-						}
-					} else {
-						if (isDefault) {
-							defaultLocation= home;
-							try {
-								JavaRuntime.setDefaultVMInstall(install, null);
-							} catch (CoreException e) {
-								LaunchingPlugin.log(e);
-							}
-						}
-					}
-				}
-			}
-		}
-		return defaultLocation;
-	}
-
-	/**
-	 * Returns default library info for the given install location.
-	 * 
-	 * @param installLocation
-	 * @return LibraryInfo
-	 */
-	protected LibraryInfo getDefaultLibraryInfo(File installLocation) {
-
-		File classes = new File(installLocation, "../Classes"); //$NON-NLS-1$
-		File lib1= new File(classes, "classes.jar"); //$NON-NLS-1$
-		File lib2= new File(classes, "ui.jar"); //$NON-NLS-1$
-		
-		String[] libs = new String[] { lib1.toString(),lib2.toString() };
-		
-		File lib = new File(installLocation, "lib"); //$NON-NLS-1$
-		File extDir = new File(lib, "ext"); //$NON-NLS-1$
-		String[] dirs = null;
-		if (extDir == null)
-			dirs = new String[0];
-		else
-			dirs = new String[] {extDir.getAbsolutePath()};
-
-		File endDir = new File(lib, "endorsed"); //$NON-NLS-1$
-		String[] endDirs = null;
-		if (endDir == null)
-			endDirs = new String[0]; 
-		else
-			endDirs = new String[] {endDir.getAbsolutePath()};
-		
-		return new LibraryInfo("???", libs, dirs, endDirs);		 //$NON-NLS-1$
-	}
-	
-	protected IPath getDefaultSystemLibrarySource(File libLocation) {
-		File parent= libLocation.getParentFile();
-		while (parent != null) {
-			File home= new File(parent, JVM_ROOT);
-			File parentsrc= new File(home, "src.jar"); //$NON-NLS-1$
-			if (parentsrc.isFile()) {
-				setDefaultRootPath("src");//$NON-NLS-1$
-				return new Path(parentsrc.getPath());
-			}
-			parentsrc= new File(home, "src.zip"); //$NON-NLS-1$
-			if (parentsrc.isFile()) {
-				setDefaultRootPath(""); //$NON-NLS-1$
-				return new Path(parentsrc.getPath());
-			}
-			parent = parent.getParentFile();
-		}
-		setDefaultRootPath(""); //$NON-NLS-1$
-		return Path.EMPTY; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jdt.launching.IVMInstallType#validateInstallLocation(java.io.File)
-	 */
-	public IStatus validateInstallLocation(File javaHome) {
-		String id= MacOSXLaunchingPlugin.getUniqueIdentifier();
-		File java= new File(javaHome, "bin"+File.separator+"java"); //$NON-NLS-2$ //$NON-NLS-1$
-		if (java.isFile())
-			return new Status(IStatus.OK, id, 0, "ok", null); //$NON-NLS-1$
-		return new Status(IStatus.ERROR, id, 0, MacOSXLaunchingPlugin.getString("MacOSXVMType.error.notRoot"), null); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.jdt.launching.AbstractVMInstallType#getDefaultJavadocLocation(java.io.File)
-	 */
-	public URL getDefaultJavadocLocation(File installLocation) {
-		
-		// try in local filesystem
-		String id= null;	
-		try {
-			String post= File.separator + JVM_ROOT;
-			String path= installLocation.getCanonicalPath();
-			if (path.startsWith(JVM_VERSION_LOC) && path.endsWith(post))
-				id= path.substring(JVM_VERSION_LOC.length(), path.length()-post.length());
-		} catch (IOException ex) {
-			// we use the fall back from below
-		}
-		if (id != null) {
-			String s= JAVADOC_LOC + id + JAVADOC_SUBDIR;	//$NON-NLS-1$
-			File docLocation= new File(s);
-			if (!docLocation.exists()) {
-				s= JAVADOC_LOC + id;
-				docLocation= new File(s);
-				if (!docLocation.exists())
-					s= null;
-			}
-			if (s != null) {
-				try {
-					return new URL("file", "", s);	//$NON-NLS-1$ //$NON-NLS-2$
-				} catch (MalformedURLException ex) {
-					// we use the fall back from below
-				}
-			}
-		}
-		
-		// fall back
-		return super.getDefaultJavadocLocation(installLocation);
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
deleted file mode 100644
index ca7f9fd..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.*;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.internal.launching.StandardVMRunner;
-import org.eclipse.jdt.launching.IVMInstall;
-
-public class MacOSXVMRunner extends StandardVMRunner {
-	
-	public MacOSXVMRunner(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-	
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		return super.exec(MacOSXLaunchingPlugin.wrap(getClass(), cmdLine), workingDirectory);
-	}
-
-	protected Process exec(String[] cmdLine, File workingDirectory, String[] envp) throws CoreException {
-		return super.exec(MacOSXLaunchingPlugin.wrap(getClass(), cmdLine), workingDirectory, envp);
-	}	
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java
deleted file mode 100644
index 22f360f..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleAttributes.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-   
-/**
- * All keys used in the BundleDescription.
- */
-public interface BundleAttributes {
-	static final String LAUNCHER = "CFBundleExecutable"; //$NON-NLS-1$
-	
-	static final String ALL= "ALL"; //$NON-NLS-1$
-	
-	static final String GETINFO = "GetInfo"; //$NON-NLS-1$
-	static final String IDENTIFIER = "Identifier"; //$NON-NLS-1$
-	static final String ICONFILE = "IconFile"; //$NON-NLS-1$
-	static final String VMOPTIONS = "VMOptions"; //$NON-NLS-1$
-	static final String ARGUMENTS = "Arguments"; //$NON-NLS-1$
-	static final String WORKINGDIR = "WorkingDir"; //$NON-NLS-1$
-	static final String VERSION = "Version"; //$NON-NLS-1$
-	static final String MAINCLASS = "MainClass"; //$NON-NLS-1$
-	static final String SIGNATURE = "Signature"; //$NON-NLS-1$
-	static final String DESTINATIONDIRECTORY = "DestinationDirectory"; //$NON-NLS-1$
-	static final String APPNAME = "AppName"; //$NON-NLS-1$
-	static final String JVMVERSION = "JVMVersion"; //$NON-NLS-1$
-	static final String USES_SWT = "UsesSWT"; //$NON-NLS-1$
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
deleted file mode 100644
index 4a6d1db..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleBuilder.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import java.io.*;
-import java.util.*;
-import java.util.List;
-
-import javax.xml.parsers.*;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.transform.*;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.*;
-import org.w3c.dom.Document;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-public class BundleBuilder implements BundleAttributes {
-	
-	private List fProcesses= new ArrayList();
-	private BundleDescription fBundleDescription;
-	
-	
-	public void createBundle(BundleDescription bd, IProgressMonitor pm) throws IOException {
-		
-		fBundleDescription= bd;
-		
-		File tmp_dir= new File(bd.get(DESTINATIONDIRECTORY));
-		String app_dir_name= bd.get(APPNAME) + ".app";	//$NON-NLS-1$
-		File app_dir= new File(tmp_dir, app_dir_name);
-		if (app_dir.exists())
-			deleteDir(app_dir);
-		app_dir= createDir(tmp_dir, app_dir_name, false);	//$NON-NLS-1$
-		
-		File contents_dir= createDir(app_dir, "Contents", false);	//$NON-NLS-1$
-		createPkgInfo(contents_dir);
-
-		File macos_dir= createDir(contents_dir, "MacOS", false);	//$NON-NLS-1$
-		String launcher_path= bd.get(LAUNCHER);
-		if (launcher_path == null)
-			throw new IOException();		
-		String launcher= copyFile(macos_dir, launcher_path, null);
-		
-		File resources_dir= createDir(contents_dir, "Resources", false);	//$NON-NLS-1$
-		File java_dir= createDir(resources_dir, "Java", false);	//$NON-NLS-1$
-				
-		createInfoPList(contents_dir, resources_dir, java_dir, launcher);
-		
-		Iterator iter= fProcesses.iterator();
-		while (iter.hasNext()) {
-			Process p= (Process) iter.next();
-			try {
-				p.waitFor();
-			} catch (InterruptedException e) {
-				// silently ignore
-			}
-		}		
-	}
-	
-	private void createInfoPList(File contents_dir, File resources_dir, File java_dir, String launcher) throws IOException {
-		
-		File info= new File(contents_dir, "Info.plist"); //$NON-NLS-1$
-		FileOutputStream fos= new FileOutputStream(info);
-		BufferedOutputStream fOutputStream= new BufferedOutputStream(fos);
-		
-		DocumentBuilder docBuilder= null;
-		DocumentBuilderFactory factory= DocumentBuilderFactory.newInstance();
-		factory.setValidating(false);
-		try {   	
-			docBuilder= factory.newDocumentBuilder();
-		} catch (ParserConfigurationException ex) {
-			System.err.println("createInfoPList: could not get XML builder"); //$NON-NLS-1$
-		}
-		Document doc= docBuilder.newDocument();
-		
-		Element plist= doc.createElement("plist"); //$NON-NLS-1$
-		doc.appendChild(plist);
-		plist.setAttribute("version", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		Element dict= doc.createElement("dict"); //$NON-NLS-1$
-		plist.appendChild(dict);
-		
-		pair(dict, "CFBundleExecutable", null, launcher); //$NON-NLS-1$
-		pair(dict, "CFBundleGetInfoString", GETINFO, null); //$NON-NLS-1$
-		pair(dict, "CFBundleInfoDictionaryVersion", null, "6.0"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		String iconName= null;
-		String appName= fBundleDescription.get(APPNAME, null);
-		if (appName != null)
-			iconName= appName + ".icns"; //$NON-NLS-1$
-		String fname= copyFile(resources_dir, fBundleDescription.get(ICONFILE, null), iconName);
-		if (fname != null)
-			pair(dict, "CFBundleIconFile", null, fname); //$NON-NLS-1$
-		
-		pair(dict, "CFBundleIdentifier", IDENTIFIER, null); //$NON-NLS-1$
-		pair(dict, "CFBundleName", APPNAME, null); //$NON-NLS-1$
-		pair(dict, "CFBundlePackageType", null, "APPL"); //$NON-NLS-1$ //$NON-NLS-2$
-		pair(dict, "CFBundleShortVersionString", VERSION, null); //$NON-NLS-1$
-		pair(dict, "CFBundleSignature", SIGNATURE, "????"); //$NON-NLS-1$ //$NON-NLS-2$
-		pair(dict, "CFBundleVersion", null, "1.0.1"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		Element jdict= doc.createElement("dict"); //$NON-NLS-1$
-		add(dict, "Java", jdict); //$NON-NLS-1$
-		
-		pair(jdict, "JVMVersion", JVMVERSION, null); //$NON-NLS-1$
-		pair(jdict, "MainClass", MAINCLASS, null); //$NON-NLS-1$
-		pair(jdict, "WorkingDirectory", WORKINGDIR, null); //$NON-NLS-1$
-		
-		if (fBundleDescription.get(USES_SWT, false))
-			addTrue(jdict, "StartOnMainThread"); //$NON-NLS-1$
-		
-		String arguments= fBundleDescription.get(ARGUMENTS, null);
-		if (arguments != null) {
-			Element argArray= doc.createElement("array");	//$NON-NLS-1$
-			add(jdict, "Arguments", argArray);	//$NON-NLS-1$
-			StringTokenizer st= new StringTokenizer(arguments);	
-			while (st.hasMoreTokens()) {
-				String arg= st.nextToken();
-				Element type= doc.createElement("string"); //$NON-NLS-1$
-				argArray.appendChild(type);	
-				type.appendChild(doc.createTextNode(arg));			
-			}
-		}
-		
-		pair(jdict, "VMOptions", VMOPTIONS, null); //$NON-NLS-1$
-		
-		int[] id= new int[] { 0 };
-		ResourceInfo[] ris= fBundleDescription.getResources(true);
-		if (ris.length > 0) {
-			StringBuffer cp= new StringBuffer();
-			for (int i= 0; i < ris.length; i++) {
-				ResourceInfo ri= ris[i];
-				String e= processClasspathEntry(java_dir, ri.fPath, id);
-				if (cp.length() > 0)
-					cp.append(':');
-				cp.append(e);
-			}
-			add(jdict, "ClassPath", cp.toString()); //$NON-NLS-1$
-		}
-
-		ris= fBundleDescription.getResources(false);
-		if (ris.length > 0) {
-			for (int i= 0; i < ris.length; i++) {
-				ResourceInfo ri= ris[i];
-				processClasspathEntry(java_dir, ri.fPath, id);
-			}
-		}
-
-		try {
-			// Write the document to the stream
-			Transformer transformer= TransformerFactory.newInstance().newTransformer();
-			transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "-//Apple Computer//DTD PLIST 1.0//EN"); //$NON-NLS-1$
-			transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://www.apple.com/DTDs/PropertyList-1.0.dtd"); //$NON-NLS-1$
- 			transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-			transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-			DOMSource source= new DOMSource(doc);
-			StreamResult result= new StreamResult(fOutputStream);
-			transformer.transform(source, result);
-		} catch (TransformerException e) {
-			System.err.println("createInfoPList: could not transform to XML"); //$NON-NLS-1$
-		}
-	}
-	
-	private void add(Element dict, String key, Element value) {
-		Document document= dict.getOwnerDocument();
-		Element k= document.createElement("key"); //$NON-NLS-1$
-		dict.appendChild(k);
-		k.appendChild(document.createTextNode(key));
-		dict.appendChild(value);
-	}
-	
-	private void create(Element parent, String s) {
-		Document document= parent.getOwnerDocument();
-		Element type= document.createElement("string"); //$NON-NLS-1$
-		parent.appendChild(type);	
-		type.appendChild(document.createTextNode(s));
-	}
-
-	private void createTrue(Element parent) {
-		Document document= parent.getOwnerDocument();
-		Element type= document.createElement("true"); //$NON-NLS-1$
-		parent.appendChild(type);	
-	}
-
-	private void add(Element dict, String key, String value) {
-		Document document= dict.getOwnerDocument();
-		Element k= document.createElement("key"); //$NON-NLS-1$
-		dict.appendChild(k);
-		k.appendChild(document.createTextNode(key));
-		create(dict, value);
-	}
-	
-	private void addTrue(Element dict, String key) {
-		Document document= dict.getOwnerDocument();
-		Element k= document.createElement("key"); //$NON-NLS-1$
-		dict.appendChild(k);
-		k.appendChild(document.createTextNode(key));
-		createTrue(dict);
-	}
-	
-	private void pair(Element dict, String outkey, String inkey, String dflt) {
-		String value= null;
-		if (inkey != null)
-			value= fBundleDescription.get(inkey, dflt);
-		else
-			value= dflt;
-		if (value != null && value.trim().length() > 0) {
-			add(dict, outkey, value);
-		}
-	}
-	
-	private String processClasspathEntry(File java_dir, String name, int[] id_ref) throws IOException {
-		File f= new File(name);
-		if (f.isDirectory()) {
-			int id= id_ref[0]++;
-			String archivename= "jar_" + id + ".jar"; //$NON-NLS-1$ //$NON-NLS-2$
-			File to= new File(java_dir, archivename);
-			zip(name, to.getAbsolutePath());
-			name= archivename;
-		} else {
-			name= copyFile(java_dir, name, null);
-		}
-		return "$JAVAROOT/" + name; //$NON-NLS-1$
-	}
-	
-	private void createPkgInfo(File contents_dir) throws IOException {
-		File pkgInfo= new File(contents_dir, "PkgInfo"); //$NON-NLS-1$
-		FileOutputStream os= new FileOutputStream(pkgInfo);
-		os.write(("APPL" + fBundleDescription.get(SIGNATURE, "????")).getBytes());	//$NON-NLS-1$ //$NON-NLS-2$
-		os.close();
-	}
-		
-	private static void deleteDir(File dir) {
-		File[] files= dir.listFiles();
-		if (files != null) {
-			for (int i= 0; i < files.length; i++)
-				deleteDir(files[i]);
-		}
-		dir.delete();
-	}
-	
-	private File createDir(File parent_dir, String dir_name, boolean remove) throws IOException {
-		File dir= new File(parent_dir, dir_name);
-		if (dir.exists()) {
-			if (!remove)
-				return dir;
-			deleteDir(dir);
-		}
-		if (! dir.mkdir())
-			throw new IOException("cannot create dir " + dir_name); //$NON-NLS-1$
-		return dir;
-	}
-	
-	private String copyFile(File todir, String fromPath, String toname) throws IOException {
-		if (toname == null) {
-			int pos= fromPath.lastIndexOf('/');
-			if (pos >= 0)
-				toname= fromPath.substring(pos+1);
-			else
-				toname= fromPath;
-		}
-		File to= new File(todir, toname);
-		fProcesses.add(Runtime.getRuntime().exec(new String[] { "/bin/cp", fromPath, to.getAbsolutePath() }));	//$NON-NLS-1$
-		return toname;
-	}
-
-	private void zip(String dir, String dest) throws IOException {
-		fProcesses.add(Runtime.getRuntime().exec(new String[] { "/usr/bin/jar", "cf", dest, "-C", dir, "." })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
deleted file mode 100644
index dd69c29..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import java.io.*;
-import java.io.File;
-import java.util.*;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.util.ListenerList;
-
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-
-
-class BundleDescription implements BundleAttributes {
-	
-	private static final String STUB= "/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/JavaApplicationStub"; //$NON-NLS-1$
-	private static final String ICON= "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Resources/GenericApp.icns"; //$NON-NLS-1$
-		
-	private ListenerList fListeners= new ListenerList();
-	private Properties fProperties= new Properties();
-	private List fClassPath= new ArrayList();
-	private List fResources= new ArrayList();
-	Properties fProperties2= new Properties();
-	
-	
-	BundleDescription() {
-		clear();
-	}
-	
-	void clear() {
-		fProperties.clear();
-		fClassPath.clear();
-		fResources.clear();
-		fProperties2.clear();
-		fProperties.put(SIGNATURE, "????"); //$NON-NLS-1$
-		fProperties.put(ICONFILE, ICON);
-	}
-	
-	void addResource(ResourceInfo ri, boolean onClasspath) {
-		if (onClasspath)
-			fClassPath.add(ri);
-		else
-			fResources.add(ri);
-	}
-	
-	boolean removeResource(ResourceInfo ri, boolean onClasspath) {
-		if (onClasspath)
-			return fClassPath.remove(ri);
-		return fResources.remove(ri);	
-	}
-
-	ResourceInfo[] getResources(boolean onClasspath) {
-		if (onClasspath)
-			return (ResourceInfo[]) fClassPath.toArray(new ResourceInfo[fClassPath.size()]);
-		return (ResourceInfo[]) fResources.toArray(new ResourceInfo[fResources.size()]);
-	}
-	
-	void addListener(IPropertyChangeListener listener) {
-		fListeners.add(listener);
-	}
-	
-	void removeListener(IPropertyChangeListener listener) {
-		fListeners.remove(listener);
-	}
-	
-	String get(String key) {
-		return fProperties.getProperty(key);
-	}
-	
-	public String get(String key, String dflt) {
-		return fProperties.getProperty(key, dflt);
-	}
-	
-	public boolean get(String key, boolean dflt) {
-		Boolean v= (Boolean) fProperties.get(key);
-		if (v == null)
-			return dflt;
-		return v.booleanValue();
-	}
-	
-	void setValue(String key, Object value) {
-		fProperties.put(key, value);
-	}
-	
-	void inititialize(ILaunchConfiguration lc) {
-		AbstractJavaLaunchConfigurationDelegate lcd;
-		try {
-			lcd= (AbstractJavaLaunchConfigurationDelegate) lc.getType().getDelegate(ILaunchManager.RUN_MODE);
-		} catch (CoreException e) {
-			return;
-		}
-		
-		String appName= lc.getName();
-		fProperties.put(APPNAME, appName);
-		fProperties.put(GETINFO, appName + Util.getString("BundleDescription.copyright.format")); //$NON-NLS-1$
-		
-		try {
-			fProperties.put(MAINCLASS, lcd.getMainTypeName(lc));
-		} catch (CoreException e) {
-			fProperties.put(MAINCLASS, ""); //$NON-NLS-1$
-		}
-		try {
-			fProperties.put(ARGUMENTS, lcd.getProgramArguments(lc));
-		} catch (CoreException e) {
-			fProperties.put(ARGUMENTS, ""); //$NON-NLS-1$
-		}
-		String wd= null;
-		try {
-			wd= lcd.getWorkingDirectory(lc).getAbsolutePath();
-//			fProperties.put(WORKINGDIR, wd); //$NON-NLS-1$
-		} catch (CoreException e) {
-//			fProperties.put(WORKINGDIR, ""); //$NON-NLS-1$
-		}
-		try {
-			fProperties.put(MAINCLASS, lcd.getMainTypeName(lc));
-		} catch (CoreException e) {
-			fProperties.put(MAINCLASS, ""); //$NON-NLS-1$
-		}
-		
-		try {
-			String[] classpath= lcd.getClasspath(lc);
-			for (int i= 0; i < classpath.length; i++)
-				addResource(new ResourceInfo(classpath[i]), true); //$NON-NLS-1$
-		} catch (CoreException e) {
-			//
-		}
-		
-		String vmOptions2= ""; //$NON-NLS-1$
-		String vmOptions= null;
-		try {
-			vmOptions= lcd.getVMArguments(lc);
-		} catch (CoreException e) {
-			//
-		}
-		if (vmOptions != null) {
-			StringTokenizer st= new StringTokenizer(vmOptions);
-			while (st.hasMoreTokens()) {
-				String token= st.nextToken();
-				int pos= token.indexOf('=');
-				if (pos > 2 && token.startsWith("-D")) { //$NON-NLS-1$
-					String key= token.substring(2, pos).trim();
-					String value= token.substring(pos+1).trim();
-					int l= value.length();
-					if (l >= 2 && value.charAt(0) == '"' && value.charAt(l-1) == '"')
-						value= value.substring(1, l-1);
-					if ("java.library.path".equals(key)) { //$NON-NLS-1$
-						addDllDir(wd, value);
-					} else {
-						fProperties2.put(key, value);
-					}
-				} else {
-					vmOptions2= vmOptions2 + token + ' ';
-				}
-			}
-		}
-
-		fProperties.put(VMOPTIONS, vmOptions2);
-		
-		boolean isSWT= false;
-		Iterator iter= fResources.iterator();
-		while (iter.hasNext()) {
-			ResourceInfo ri= (ResourceInfo) iter.next();
-			if (ri.fPath.indexOf("libswt-carbon") >= 0) {	//$NON-NLS-1$
-				isSWT= true;
-				break;
-			}
-		}
-		fProperties.put(USES_SWT, Boolean.valueOf(isSWT));
-		
-		String launcher= null;
-		if (isSWT)
-			launcher= System.getProperty("org.eclipse.swtlauncher");	//$NON-NLS-1$
-		
-		if (launcher == null) {
-			setValue(JVMVERSION, "1.4*"); //$NON-NLS-1$
-			launcher= STUB;	//$NON-NLS-1$			
-		}
-		setValue(LAUNCHER, launcher);
-
-		
-		IJavaProject p= null;
-		try {
-			p= lcd.getJavaProject(lc);
-		} catch (CoreException e) {
-			// ignore
-		}
-		if (p != null)
-			fProperties.put(IDENTIFIER, p.getElementName());
-		else
-			fProperties.put(IDENTIFIER, ""); //$NON-NLS-1$
-				
-		fireChange();
-	}
-	
-	void fireChange() {
-		PropertyChangeEvent e= new PropertyChangeEvent(this, ALL, null, null);
-		Object[] listeners= fListeners.getListeners();
-		for (int i= 0; i < listeners.length; i++)
-			((IPropertyChangeListener)listeners[i]).propertyChange(e);
-	}
-
-	private void addDllDir(String wd, String path) {
-		File lib_dir;
-		if (path.startsWith("../")) { //$NON-NLS-1$
-			lib_dir= new File(wd, path);
-		} else {
-			lib_dir= new File(path);			
-		}
-		if (lib_dir.isDirectory()) {
-			File[] dlls= lib_dir.listFiles();
-			for (int j= 0; j < dlls.length; j++) {
-				try {
-					String name= dlls[j].getCanonicalPath();
-					if (name.endsWith(".jnilib")) //$NON-NLS-1$
-						addResource(new ResourceInfo(name), false); //$NON-NLS-1$
-				} catch (IOException e) {
-					// NeedWork Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	static boolean verify(ILaunchConfiguration lc) {
-		String name= lc.getName();
-		if (name.indexOf("jpage") >= 0) //$NON-NLS-1$
-			return false;
-		AbstractJavaLaunchConfigurationDelegate lcd;
-		try {
-			lcd= (AbstractJavaLaunchConfigurationDelegate) lc.getType().getDelegate(ILaunchManager.RUN_MODE);
-			if (lcd.getMainTypeName(lc) == null)
-				return false;
-			return true;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-	
-	static boolean matches(ILaunchConfiguration lc, IJavaProject project) {
-		AbstractJavaLaunchConfigurationDelegate lcd;
-		try {
-			lcd= (AbstractJavaLaunchConfigurationDelegate) lc.getType().getDelegate(ILaunchManager.RUN_MODE);
-		} catch (CoreException e) {
-			return false;
-		}
-		IJavaProject p= null;
-		try {
-			p= lcd.getJavaProject(lc);
-		} catch (CoreException e) {
-			return false;
-		}
-		return project != null && project.equals(p);
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleMessages.properties b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleMessages.properties
deleted file mode 100644
index fba088d..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleMessages.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-###############################################################################
-# Copyright (c) 2002, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Andre Weinand - Initial implementation
-###############################################################################
-		
-MacBundleWizard.title=Application Bundle Export
-			
-page1.title=Basic Properties and Location
-page1.message=Message1
-page1.description= Specify basic properties and location
-page1.launchConfig.label=Use this launch configuration:
-page1.mainClass.label=Main class:
-page1.mainClass.chooseButton.label=Search...
-page1.mainClass.dialog.title=Choose Main Type
-page1.mainClass.dialog.message=Not yet implemented
-page1.arguments.label=Arguments:
-page1.appName.label=Application name:
-page1.appFolder.label=Folder:
-page1.appFolder.browseButton.label=Browse...
-page1.appFolder.browseDialog.message=Choose the folder in which to create the application
-page1.appFolder.browseDialog.title=Choose Folder
-page1.jvm.label=JVM version:
-page1.useSWT.label=Use SWT:
-page1.appIcon.label=Icon:
-page1.appIcon.chooseButton.label=Choose...
-page1.appIcon.chooseDialog.title=Choose a *.icns file
-
-page2.title= Classpath and Libraries
-page2.message=Message2
-page2.description= Specify files to copy into application bundle
-page2.workingDirectory.label=Working directory:
-page2.addToClasspath.group.label=Add to classpath
-page2.addToBundle.group.label=Add to bundle
-page2.addFile.button.label=Add file...
-page2.chooseFileDialog.title=Choose a file
-page2.addFolder.button.label=Add folder...
-page2.chooseFolder.dialog.title=Choose a folder
-page2.remove.button.label=Remove
-
-page3.title= Properties and Options
-page3.message=Message3
-page3.description= Specify properties and options
-page3.identifier.label=Identifier:
-page3.signature.label=Signature:
-page3.vmOptions.label=VM options:
-page3.propertiesGroup.label=Properties
-page3.keys.column.label=Keys
-page3.values.column.label=Values
-
-BundleDescription.copyright.format=1.0, Copyright {user} 2004. All rights reserved.
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
deleted file mode 100644
index bc4b594..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardBasePage.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.wizard.*;
-
-
-public abstract class BundleWizardBasePage extends DialogPage implements IWizardPage, BundleAttributes, IPropertyChangeListener {
-	
-	/**
-	 * The page that was shown right before this page became visible;
-	 * <code>null</code> if none.
-	 */
-	private IWizardPage fPreviousPage;
-	/**
-	 * This page's message key.
-	 */
-	private String fKey;
-	/**
-	 * The wizard to which this page belongs; <code>null</code>
-	 * if this page has yet to be added to a wizard.
-	 */
-	private IWizard fWizard;
-	
-	BundleDescription fBundleDescription;
-
-	
-	BundleWizardBasePage(String key, BundleDescription bd) {
-		super(Util.getString(key + ".title")); //$NON-NLS-1$
-		fKey= key;
-		fBundleDescription= bd;
-		//setMessage(Util.getString(fKey + ".message")); //$NON-NLS-1$
-		setDescription(Util.getString(fKey + ".description")); //$NON-NLS-1$
-		
-		bd.addListener(this);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in WizardPage
-	 */
-	public void setVisible(boolean visible) {
-		if (visible)
-			enterPage();
-		else
-			leavePage();
-		super.setVisible(visible);
-	}
-	
-	void enterPage() {
-		//System.out.println("enterPage: " + getName());
-	}
-
-	void leavePage() {
-		//System.out.println("leavePage: " + getName());
-	}
-
-    public Image getImage() {
-        Image result = super.getImage();
-
-        if (result == null && fWizard != null)
-            return fWizard.getDefaultPageImage();
-
-        return result;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	final public void createControl(Composite parent) {
-		
-		Composite c= new Composite(parent, SWT.NULL);
-		c.setLayout(new GridLayout(1, false));
-		setControl(c);
-		
-		createContents(c);
-
-		checkIfPageComplete();
-	}
-	
-	abstract public void createContents(Composite parent);
-	
-	static void setHeightHint(Control control, int height) {
-		GridData gd1= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		gd1.heightHint= height;
-		control.setLayoutData(gd1);
-	}
-
-	static Label createLabel(Composite parent, String text, int align) {
-		Label l= new Label(parent, SWT.NONE);
-		l.setText(text);
-		l.setLayoutData(new GridData(align));
-		return l;
-	}
-
-	static Composite createComposite(Composite parent, int columns) {
-		Composite c= new Composite(parent, SWT.NONE);
-		c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		GridLayout gl= new GridLayout(columns, false);
-		gl.marginWidth= 0;
-		c.setLayout(gl);
-		return c;
-	}
-
-	Text createText(Composite parent, String key, int lines) {
-		Text t= new Text(parent, SWT.BORDER);
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL);
-		if (lines == 2)
-			gd.heightHint= 30;
-		t.setLayoutData(gd);	
-		hookField(t, key);
-		return t;
-	}
-
-	Combo createCombo(Composite parent, String key) {
-		Combo c= new Combo(parent, SWT.BORDER);
-		c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		hookField(c, key);
-		return c;
-	}
-
-	static Group createGroup(Composite parent, String text, int columns) {
-		Group g= new Group(parent, SWT.NONE);
-		g.setText(text);
-		g.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		g.setLayout(new GridLayout(columns, false));
-		return g;
-	}
-
-	Button createButton(Composite parent, int flags, String text) {
-		Button b= new Button(parent, flags);
-		if (text != null)
-			b.setText(text);
-		return b;
-	}
-
-	static Composite createHBox(Composite parent) {
-		Composite c= new Composite(parent, SWT.NONE);
-		c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		GridLayout gl= new GridLayout(2, false);
-		gl.marginWidth= gl.marginHeight= 0;
-		c.setLayout(gl);
-		return c;
-	}
-	
-	void hookField(final Text tf, final String key) {
-		tf.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				fBundleDescription.setValue(key, tf.getText());
-				checkIfPageComplete();
-			}
-		});
-	}
-		
-	void hookField(final Combo tf, final String key) {
-		tf.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				fBundleDescription.setValue(key, tf.getText());
-				checkIfPageComplete();
-			}
-		});
-	}
-	
-	void hookButton(final Button b, final String key) {
-		b.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fBundleDescription.setValue(key, new Boolean(b.getSelection()));
-				checkIfPageComplete();
-			}
-		});
-	}
-	
-	final void checkIfPageComplete() {
-		IWizardContainer c= (fWizard != null) ? fWizard.getContainer() : null;
-		if (c != null && this == c.getCurrentPage())
-			c.updateButtons();
-	}
-
-	/////////////////////////////////////////////////////////
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		return isPageComplete() && getNextPage() != null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#getName()
-	 */
-	public String getName() {
-		return Util.getString(fKey + ".title"); //$NON-NLS-1$;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		if (fWizard == null)
-			return null;
-		return fWizard.getNextPage(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#getPreviousPage()
-	 */
-	public IWizardPage getPreviousPage() {
-		if (fPreviousPage != null)
-			return fPreviousPage;
-		if (fWizard != null)
-			return fWizard.getPreviousPage(this);
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#getWizard()
-	 */
-	public IWizard getWizard() {
-		return fWizard;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
-	 */
-	public void setPreviousPage(IWizardPage page) {
-		fPreviousPage= page;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizardPage#setWizard(org.eclipse.jface.wizard.IWizard)
-	 */
-	public void setWizard(IWizard newWizard) {
-		fWizard= newWizard;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
deleted file mode 100644
index 7524aaf..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage1.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-
-public class BundleWizardPage1 extends BundleWizardBasePage {
-	
-	static String[] JVMS= {
-		"1.3+",	//$NON-NLS-1$
-		"1.3*",	//$NON-NLS-1$
-		"1.4.1",	//$NON-NLS-1$
-		"1.4+",	//$NON-NLS-1$
-		"1.4*"	//$NON-NLS-1$
-	};
-
-	ILaunchConfiguration[] fConfigurations= new ILaunchConfiguration[0];
-	Combo fLocation;	
-	Combo fLaunchConfigs;
-	Combo fJVMVersion;
-	Text fAppName;
-	Text fMainClass;
-	Text fArguments;
-	Text fIconFileName;
-	Button fUseSWT;
-	
-	
-	public BundleWizardPage1(BundleDescription bd) {
-		super("page1", bd); //$NON-NLS-1$
-	}
-
-	public void createContents(Composite c) {
-		
-		final Shell shell= c.getShell();
-				
-		Composite c1= createComposite(c, 2);
-			createLabel(c1, Util.getString("page1.launchConfig.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-		
-			fLaunchConfigs= new Combo(c1, SWT.READ_ONLY);
-			fillCombo(fLaunchConfigs);
-			fLaunchConfigs.addSelectionListener(
-				new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						int ix= fLaunchConfigs.getSelectionIndex();
-						if (ix > 0 && ix < fConfigurations.length) {
-							fBundleDescription.clear();
-							fBundleDescription.inititialize(fConfigurations[ix]);
-						}
-					}
-				}
-			);
-			
-					
-		Group c2= createGroup(c, "Main", 2); //$NON-NLS-1$
-			createLabel(c2, Util.getString("page1.mainClass.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			Composite c7a= createHBox(c2);
-			
-				fMainClass= createText(c7a, MAINCLASS, 1);
-				Button b1= createButton(c7a, SWT.NONE, Util.getString("page1.mainClass.chooseButton.label")); //$NON-NLS-1$
-				b1.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						MessageBox mb= new MessageBox(shell, SWT.ICON_INFORMATION | SWT.OK);
-						mb.setMessage(Util.getString("page1.mainClass.dialog.message")); //$NON-NLS-1$
-						mb.setText(Util.getString("page1.mainClass.dialog.title")); //$NON-NLS-1$
-						mb.open();
-					}
-				});
-				
-				createLabel(c2, Util.getString("page1.arguments.label"), GridData.VERTICAL_ALIGN_BEGINNING); //$NON-NLS-1$
-				fArguments= createText(c2, ARGUMENTS, 2);
-					
-		Group c5= createGroup(c, "Destination", 2); //$NON-NLS-1$	
-			createLabel(c5, Util.getString("page1.appName.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			fAppName= createText(c5, APPNAME, 1);
-		
-			createLabel(c5, Util.getString("page1.appFolder.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			Composite c3a= createHBox(c5);
-			
-				fLocation= createCombo(c3a, DESTINATIONDIRECTORY);
-				
-				final Button browse= createButton(c3a, SWT.NONE, Util.getString("page1.appFolder.browseButton.label")); //$NON-NLS-1$
-				browse.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						DirectoryDialog dd= new DirectoryDialog(browse.getShell(), SWT.SAVE);
-						dd.setMessage(Util.getString("page1.appFolder.browseDialog.message")); //$NON-NLS-1$
-						dd.setText(Util.getString("page1.appFolder.browseDialog.title")); //$NON-NLS-1$
-						String name= dd.open();
-						if (name != null)
-							fLocation.setText(name);
-					}
-				});
-		
-		Group g6= createGroup(c, "Options", 2); //$NON-NLS-1$
-		
-			createLabel(g6, Util.getString("page1.jvm.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			
-			Composite c8= createComposite(g6, 4);
-			
-				fJVMVersion= new Combo(c8, SWT.READ_ONLY);
-				for (int i= 0; i < JVMS.length; i++)
-					fJVMVersion.add(JVMS[i]);
-				fJVMVersion.setText(JVMS[4]);
-				hookField(fJVMVersion, JVMVERSION);
-				createLabel(c8, "      ", GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-				createLabel(c8, Util.getString("page1.useSWT.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-				fUseSWT= createButton(c8, SWT.CHECK, null); //$NON-NLS-1$
-				hookButton(fUseSWT, USES_SWT);
-			
-			createLabel(g6, Util.getString("page1.appIcon.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			Composite c7= createComposite(g6, 2);
-				fIconFileName= createText(c7, ICONFILE, 1);
-				final Button b= createButton(c7, SWT.NONE, Util.getString("page1.appIcon.chooseButton.label")); //$NON-NLS-1$
-				b.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						FileDialog fd= new FileDialog(b.getShell(), SWT.OPEN);
-						fd.setText(Util.getString("page1.appIcon.chooseDialog.title")); //$NON-NLS-1$
-						fd.setFilterExtensions(new String[] { "icns" }); //$NON-NLS-1$
-						String name= fd.open();
-						if (name != null)
-							fIconFileName.setText(name);
-					}
-				});
-			
-	}
-	
-	void enterPage() {
-		super.enterPage();
-		initCombo(fLaunchConfigs);
-	}
-	
-	public void propertyChange(PropertyChangeEvent event) {
-		if (fAppName != null)
-			fAppName.setText(fBundleDescription.get(APPNAME, "")); //$NON-NLS-1$
-		if (fMainClass != null)
-			fMainClass.setText(fBundleDescription.get(MAINCLASS, "")); //$NON-NLS-1$
-		if (fJVMVersion != null)
-			fJVMVersion.setText(fBundleDescription.get(JVMVERSION, "")); //$NON-NLS-1$
-		if (fUseSWT != null)
-			fUseSWT.setSelection(fBundleDescription.get(USES_SWT, false)); //$NON-NLS-1$
-	}
-	
-	public boolean isPageComplete() {
-		return fAppName != null && fAppName.getText().length() > 0 && fLocation.getText().length() > 0;
-	}
-
-	// private stuff
-	
-	private void collectLaunchConfigs() {
-		ArrayList configs= new ArrayList();
-		ILaunchManager manager= DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type= manager.getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		try {
-			ILaunchConfiguration[] configurations= manager.getLaunchConfigurations(type);
-			for (int i= 0; i < configurations.length; i++) {
-				ILaunchConfiguration configuration= configurations[i];
-				if (BundleDescription.verify(configuration))
-					configs.add(configuration);
-			}
-		} catch (CoreException e) {
-			//
-		}
-		fConfigurations= (ILaunchConfiguration[]) configs.toArray(new ILaunchConfiguration[configs.size()]);
-		Arrays.sort(fConfigurations, new Comparator() {
-			public int compare(Object o1, Object o2) {
-				ILaunchConfiguration lc1= (ILaunchConfiguration) o1;
-				ILaunchConfiguration lc2= (ILaunchConfiguration) o2;
-				return lc1.getName().compareTo(lc2.getName());
-			}
-
-			public boolean equals(Object obj) {
-				return false;
-			}
-		});
-	}
-	
-	private void fillCombo(Combo c) {
-		collectLaunchConfigs();
-		for (int i= 0; i < fConfigurations.length; i++) {
-			ILaunchConfiguration configuration= fConfigurations[i];
-			c.add(configuration.getName());
-		}
-	}
-	
-	private void initCombo(Combo c) {
-		IStructuredSelection sel= ((MacBundleWizard)getWizard()).getSelection();
-		Object o= sel.getFirstElement();
-		if (o instanceof IJavaElement) {
-			IJavaProject project= ((IJavaElement) o).getJavaProject();
-			if (project != null) {
-				for (int i= 0; i < fConfigurations.length; i++) {
-					ILaunchConfiguration configuration= fConfigurations[i];
-					if (BundleDescription.matches(configuration, project)) {
-						c.setText(configuration.getName());
-						fBundleDescription.inititialize(configuration);
-						return;
-					}
-				}
-			}
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
deleted file mode 100644
index a4ec59a..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage2.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-
-public class BundleWizardPage2 extends BundleWizardBasePage {
-	
-	Text fWorkingDir;
-	Table fClassPath;
-	Table fResources;
-	
-
-	protected BundleWizardPage2(BundleDescription bd) {
-		super("page2", bd); //$NON-NLS-1$
-	}
-
-	public void createContents(Composite parent) {
-		
-		Composite c= createComposite(parent, 2);
-			createLabel(c, Util.getString("page2.workingDirectory.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			fWorkingDir= createText(c, WORKINGDIR, 1);
-
-		fClassPath= createTableGroup(parent, Util.getString("page2.addToClasspath.group.label"), true); //$NON-NLS-1$
-		fResources= createTableGroup(parent, Util.getString("page2.addToBundle.group.label"), false); //$NON-NLS-1$
-	}
-	
-	Table createTableGroup(Composite parent, String groupName, final boolean onClasspath) {
-		Group g1= createGroup(parent, groupName, 1);
-			final Table table= new Table(g1, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
-			setHeightHint(table, 80);
-			Composite c1= createComposite(g1, 3);
-			final Button addButton1= createButton(c1, SWT.NONE, Util.getString("page2.addFile.button.label")); //$NON-NLS-1$
-			addButton1.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					FileDialog fd= new FileDialog(addButton1.getShell(), SWT.OPEN);
-					fd.setText(Util.getString("page2.chooseFileDialog.title")); //$NON-NLS-1$
-					String path= fd.open();
-					if (path != null) {
-						ResourceInfo ri= new ResourceInfo(path);
-						fBundleDescription.addResource(ri, onClasspath);
-						add(table, ri);
-					}
-				}
-			});
-			final Button addButton2= createButton(c1, SWT.NONE, Util.getString("page2.addFolder.button.label")); //$NON-NLS-1$
-			addButton2.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					DirectoryDialog fd= new DirectoryDialog(addButton2.getShell(), SWT.OPEN);
-					fd.setText(Util.getString("page2.chooseFolder.dialog.title")); //$NON-NLS-1$
-					String path= fd.open();
-					if (path != null) {
-						ResourceInfo ri= new ResourceInfo(path);
-						fBundleDescription.addResource(ri, onClasspath);
-						add(table, ri);
-					}
-				}
-			});
-			final Button removeButton= createButton(c1, SWT.NONE, Util.getString("page2.remove.button.label")); //$NON-NLS-1$
-			removeButton.setEnabled(false);
-			removeButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					remove(table, onClasspath, removeButton);
-				}
-			});
-			table.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					removeButton.setEnabled(table.getSelectionCount() > 0);
-				}
-			});
-		return table;
-	}
-	
-	private void add(Table t, ResourceInfo ri) {
-		TableItem ti= new TableItem(t, SWT.NONE);
-		ti.setData(ri);
-		ti.setText(ri.fPath);
-	}
-		
-	private void remove(Table table, boolean b, Button removeButton) {
-		TableItem[] selection= table.getSelection();
-		for (int i= 0; i < selection.length; i++) {
-			TableItem ti= selection[i];
-			ResourceInfo ri= (ResourceInfo) ti.getData();
-			if (fBundleDescription.removeResource(ri, b)) {
-				int ix= table.indexOf(ti);
-				if (ix >= 0)
-					table.remove(ix);
-			}
-		}
-		removeButton.setEnabled(table.getSelectionCount() > 0);
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		if (fWorkingDir != null)
-			fWorkingDir.setText(fBundleDescription.get(WORKINGDIR, "")); //$NON-NLS-1$
-
-		if (fClassPath != null) {
-			fClassPath.removeAll();
-			ResourceInfo[] ris= fBundleDescription.getResources(true);
-			for (int i= 0; i < ris.length; i++)
-				add(fClassPath, ris[i]);
-		}
-		
-		if (fResources != null) {
-			fResources.removeAll();
-			ResourceInfo[] ris= fBundleDescription.getResources(false);
-			for (int i= 0; i < ris.length; i++)
-				add(fResources, ris[i]);
-		}
-	}
-		
-	public boolean isPageComplete() {
-		return true;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
deleted file mode 100644
index 915e2e1..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/BundleWizardPage3.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import java.util.Enumeration;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Composite;
-
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-
-public class BundleWizardPage3 extends BundleWizardBasePage {
-
-	Text fIdentifier;
-	Text fSignature;
-	Text fVMOptions;
-	Table fProperties;
-
-	protected BundleWizardPage3(BundleDescription bd) {
-		super("page3", bd); //$NON-NLS-1$
-	}
-
-	public void createContents(Composite c) {
-
-		Composite c1= createComposite(c, 4);
-			
-			createLabel(c1, Util.getString("page3.identifier.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			fIdentifier= createText(c1, IDENTIFIER, 1);
-		
-			createLabel(c1, Util.getString("page3.signature.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-			fSignature= createText(c1, SIGNATURE, 1);
-
-		createLabel(c, Util.getString("page3.vmOptions.label"), GridData.VERTICAL_ALIGN_CENTER); //$NON-NLS-1$
-		fVMOptions= createText(c, VMOPTIONS, 2);
-		
-		Group g= createGroup(c, Util.getString("page3.propertiesGroup.label"), 1); //$NON-NLS-1$
-		fProperties= new Table(g, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
-		fProperties.setHeaderVisible(true);
-		fProperties.setLinesVisible(true);
-		fProperties.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				//
-			}
-		});
-		setHeightHint(fProperties, 60);
-		
-		TableColumn col0= new TableColumn(fProperties, SWT.NONE);
-		col0.setText(Util.getString("page3.keys.column.label")); //$NON-NLS-1$
-		col0.setWidth(150);
-		
-		TableColumn col1= new TableColumn(fProperties, SWT.NONE);
-		col1.setText(Util.getString("page3.values.column.label")); //$NON-NLS-1$
-		col1.setWidth(150);
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		if (fProperties == null)
-			return;
-		fIdentifier.setText(fBundleDescription.get(IDENTIFIER, "")); //$NON-NLS-1$
-		fSignature.setText(fBundleDescription.get(SIGNATURE, "")); //$NON-NLS-1$
-		fVMOptions.setText(fBundleDescription.get(VMOPTIONS, "")); //$NON-NLS-1$
-
-		fProperties.removeAll();
-		if (fBundleDescription.fProperties2 != null && fBundleDescription.fProperties2.size() > 0) {
-			Enumeration iter= fBundleDescription.fProperties2.keys();
-			for (int i= 0; iter.hasMoreElements(); i++) {
-				String key= (String) iter.nextElement();
-				String value= (String) fBundleDescription.fProperties2.get(key);
-				TableItem ti= new TableItem(fProperties, SWT.NONE);
-				ti.setText(0, key);
-				ti.setText(1, value);
-			}
-		}		
-	}
-	
-	public boolean isPageComplete() {
-		return true;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
deleted file mode 100644
index 92d854c..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/MacBundleWizard.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jdt.internal.launching.macosx.MacOSXLaunchingPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IExportWizard;
-
-
-public class MacBundleWizard extends Wizard implements IExportWizard, BundleAttributes {
-	
-	IWorkbench fWorkbench;
-	IStructuredSelection fSelection;
-	BundleDescription fBundleDescription= new BundleDescription();
-
-	public MacBundleWizard() {
-		setDefaultPageImageDescriptor(createWizardImageDescriptor("exportapp_wiz.gif")); //$NON-NLS-1$
- 		setWindowTitle(Util.getString("MacBundleWizard.title")); //$NON-NLS-1$	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fWorkbench= workbench;
-		fSelection= selection;
-	}
-	
-	IStructuredSelection getSelection() {
-		return fSelection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * Method declared on IWizard.
-	 */
-	public void addPages() {
-		super.addPages();
-		addPage(new BundleWizardPage1(fBundleDescription));
-		addPage(new BundleWizardPage2(fBundleDescription));
-		addPage(new BundleWizardPage3(fBundleDescription));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {		
-		try {
-			BundleBuilder bb= new BundleBuilder();
-			bb.createBundle(fBundleDescription, null);
-		} catch (IOException e) {
-			// NeedWork Auto-generated catch block
-			e.printStackTrace();
-		}
-		return true;
-	}
-
-	private static ImageDescriptor createWizardImageDescriptor(String name) {
-		try {
-			URL baseUrl= MacOSXLaunchingPlugin.getDefault().getBundle().getEntry("/icons/full/wizban/"); //$NON-NLS-1$	
-			if (baseUrl != null)
-				return ImageDescriptor.createFromURL(new URL(baseUrl, name));
-		} catch (MalformedURLException e) {
-			// fall through
-		}
-		return ImageDescriptor.getMissingImageDescriptor();
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java
deleted file mode 100644
index 939e102..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/ResourceInfo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-public class ResourceInfo {
-	
-	String fPath;
-	
-	ResourceInfo(String path) {
-		fPath= path;
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/Util.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/Util.java
deleted file mode 100644
index 484e186..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/ui/macbundler/Util.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.ui.macbundler;
-
-import java.util.*;
-import java.util.ResourceBundle;
-
-
-public class Util {
-	
-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.ui.macbundler.BundleMessages";	//$NON-NLS-1$
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-
-	static String getString(String key) {
-		try {
-			return fgResourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/plugin.properties b/org.eclipse.jdt.launching.macosx/plugin.properties
deleted file mode 100644
index f926030..0000000
--- a/org.eclipse.jdt.launching.macosx/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Mac OS X Launcher
-providerName=Eclipse.org
-
-#
-# Mac OS X Application Bundle Export Wizard
-#
-MacOSXAppBundleExporter.label=Mac OS X application bundle
-MacOSXAppBundleExporter.description=Package resources into a Mac OS X application bundle on the local file system
diff --git a/org.eclipse.jdt.launching.macosx/plugin.xml b/org.eclipse.jdt.launching.macosx/plugin.xml
deleted file mode 100644
index dd3f491..0000000
--- a/org.eclipse.jdt.launching.macosx/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.jdt.launching.vmInstallTypes">
-      <vmInstallType
-            class="org.eclipse.jdt.internal.launching.macosx.MacOSXVMInstallType"
-            id="org.eclipse.jdt.internal.launching.macosx.MacOSXType">
-      </vmInstallType>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-			name="%MacOSXAppBundleExporter.label"
-			icon="icons/full/ctool16/exportappbundle_wiz.gif"
-			class="org.eclipse.jdt.internal.ui.macbundler.MacBundleWizard"
-			id="org.eclipse.jdt.internal.ui.macbundler.MacBundleWizard">
-         <description>
-			%MacOSXAppBundleExporter.description
-         </description>
-         <selection
-			class="org.eclipse.jdt.core.IJavaElement">
-         </selection>
-      </wizard>
-   </extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml b/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
deleted file mode 100644
index 961fe83..0000000
--- a/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- build script to create a plugin from org.eclipse.jdt.launching.macosx -->
-
-<project name="org.eclipse.jdt.launching.macosx" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="tempdir" value="../../tmp" />
-		<property name="plugin"  value="org.eclipse.jdt.launching.macosx" />
-		<property name="dest"  value="${destdir}/${plugin}_3.1.0" />
-		<property name="destjar"  value="${destdir}/${plugin}_3.1.0.jar" />
-		</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<delete dir="${tempdir}" />
-		<mkdir dir="${tempdir}" />	
-		<mkdir dir="${destdir}" />
-		<delete file="${destjar}" />
-		<zip zipfile="${tempdir}/src.zip">
-		    <fileset dir="macosx" />
-  		</zip>
-		<zip zipfile="${destjar}">
-			<fileset dir=".">
-			  <include name="plugin.xml" />
-			  <include name="plugin.properties" />
-			  <include name="icons/**" />
-			  <include name="META-INF/**" />
-			</fileset>
-			<fileset dir="bin" />
-			<fileset file="${tempdir}/src.zip" />
-		</zip>
-		<delete file="${tempdir}/src.zip" />
-	</target>
-</project>
diff --git a/org.eclipse.jdt.launching/.classpath b/org.eclipse.jdt.launching/.classpath
deleted file mode 100644
index f2223ae..0000000
--- a/org.eclipse.jdt.launching/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="launching"/>
-	<classpathentry kind="src" path="support"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.launching/.cvsignore b/org.eclipse.jdt.launching/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/org.eclipse.jdt.launching/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/org.eclipse.jdt.launching/.externalToolBuilders/Build Launching Support JAR.launch b/org.eclipse.jdt.launching/.externalToolBuilders/Build Launching Support JAR.launch
deleted file mode 100644
index a61e6cc..0000000
--- a/org.eclipse.jdt.launching/.externalToolBuilders/Build Launching Support JAR.launch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot; editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.jdt.launching/support&quot; type=&quot;2&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.jdt.launching&quot; type=&quot;4&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
-</launchConfiguration>
diff --git a/org.eclipse.jdt.launching/.project b/org.eclipse.jdt.launching/.project
deleted file mode 100644
index 892095c..0000000
--- a/org.eclipse.jdt.launching/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.launching</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Build Launching Support JAR.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7b4f031..0000000
--- a/org.eclipse.jdt.launching/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,69 +0,0 @@
-#Mon Nov 01 18:51:37 GMT-08:00 2004

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=warning

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-eclipse.preferences.version=1

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=disabled

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

-org.eclipse.jdt.core.incompleteClasspath=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

diff --git a/org.eclipse.jdt.launching/.settings/org.eclipse.pde.prefs b/org.eclipse.jdt.launching/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 64289f9..0000000
--- a/org.eclipse.jdt.launching/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Wed Nov 24 22:35:40 GMT-08:00 2004

-compilers.p.unused-element-or-attribute=1

-compilers.p.unresolved-ex-points=0

-compilers.p.deprecated=1

-compilers.p.unknown-element=0

-compilers.p.unknown-resource=1

-compilers.p.unknown-class=1

-compilers.p.unknown-attribute=0

-compilers.p.no-required-att=0

-eclipse.preferences.version=1

-compilers.p.unresolved-import=0

-compilers.p.not-externalized-att=1

-compilers.p.illegal-att-value=0

-compilers.use-project=true

diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
deleted file mode 100644
index 21428c8..0000000
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.1.0
-Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jdt.internal.launching;x-internal:=true,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.launching.sourcelookup,
- org.eclipse.jdt.launching.sourcelookup.containers
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.debug.core,
- org.eclipse.jdt.debug,
- org.eclipse.core.variables,
- org.eclipse.core.runtime
-Eclipse-AutoStart: true
diff --git a/org.eclipse.jdt.launching/about.html b/org.eclipse.jdt.launching/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/org.eclipse.jdt.launching/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching/build.properties b/org.eclipse.jdt.launching/build.properties
deleted file mode 100644
index 84c4faf..0000000
--- a/org.eclipse.jdt.launching/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               java.policy.applet,\
-               .,\
-               lib/*.jar,\
-               META-INF/
-source.. = launching/
-
-source.lib/launchingsupport.jar = support/
-
-src.includes = about.html,\
-               schema/
-
-jars.compile.order=.,lib/launchingsupport.jar
diff --git a/org.eclipse.jdt.launching/component.xml b/org.eclipse.jdt.launching/component.xml
deleted file mode 100644
index 8588ee7..0000000
--- a/org.eclipse.jdt.launching/component.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/component"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
-   name="Eclipse Java Debug">
- <plugin id="org.eclipse.jdt.launching" />
-
- <package name="org.eclipse.jdt.launching">
- 	<type name="AbstractJavaLaunchConfigurationDelegate" />
- 	<type name="AbstractVMInstall" />
- 	<type name="AbstractVMInstallType" />
- 	<type name="AbstractVMRunner" />
- 	<type name="ExecutionArguments" subclass="false" />
- 	<type name="IJavaLaunchConfigurationConstants" implement="false" />
- 	<type name="IRuntimeClasspathEntry" implement="false" />
- 	<type name="IRuntimeClasspathEntry2" implement="false" />
- 	<type name="IRuntimeClasspathEntryResolver" />
- 	<type name="IRuntimeClasspathProvider" />
- 	<type name="IRuntimeContainerComparator" />
- 	<type name="IVMConnector" />
- 	<type name="IVMInstall" />
- 	<type name="IVMInstall2" />
- 	<type name="IVMInstallChangedListener" />
- 	<type name="IVMInstallType" />
- 	<type name="IVMRunner" />
- 	<type name="JavaLaunchDelegate" />
- 	<type name="JavaRuntime" instantiate="false" subclass="false" />
- 	<type name="LibraryLocation" subclass="false" />
- 	<type name="PropertyChangeEvent" subclass="false" />
- 	<type name="SocketUtil" subclass="false" instantiate="false" />
- 	<type name="StandardClasspathProvider" />
- 	<type name="StandardSourcePathProvider" />
- 	<type name="VMRunnerConfiguration" subclass="false" />
- 	<type name="VMStandin" subclass="false" />
- </package>
- <package name="org.eclipse.jdt.launching.sourcelookup">
- 	<type name="ArchiveSourceLocation" subclass="false" />
- 	<type name="DirectorySourceLocation" subclass="false" />
- 	<type name="IJavaSourceLocation" />
- 	<type name="JavaProjectSourceLocation" subclass="false" />
- 	<type name="JavaSourceLocator" subclass="false" />
- 	<type name="LocalFileStorage" subclass="false" />
- 	<type name="PackageFragmentRootSourceLocation" subclass="false" />
- 	<type name="ZipEntryStorage" subclass="false" />
- </package>
- <package name="org.eclipse.jdt.launching.sourcelookup.containers">
- 	<type name="ClasspathContainerSourceContainer" subclass="false" />
- 	<type name="ClasspathVariableSourceContainer" subclass="false" />
- 	<type name="JavaProjectSourceContainer" subclass="false" />
- 	<type name="JavaSourceLookupParticipant" subclass="false" />
- 	<type name="JavaSourcePathComputer" />
- 	<type name="PackageFragmentRootSourceContainer" subclass="false" />
- </package>
- 
- <component-depends unrestricted="true"/>
-
-</component>
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching/doc/.cvsignore b/org.eclipse.jdt.launching/doc/.cvsignore
deleted file mode 100644
index 731cc1f..0000000
--- a/org.eclipse.jdt.launching/doc/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-book.css
-org_eclipse_jdt_launching_classpathProviders.html
-org_eclipse_jdt_launching_runtimeClasspathEntryResolvers.html
-org_eclipse_jdt_launching_vmConnectors.html
-org_eclipse_jdt_launching_vmInstallTypes.html
-schema.css
diff --git a/org.eclipse.jdt.launching/java.policy.applet b/org.eclipse.jdt.launching/java.policy.applet
deleted file mode 100644
index 35527af..0000000
--- a/org.eclipse.jdt.launching/java.policy.applet
+++ /dev/null
@@ -1,7 +0,0 @@
-/* AUTOMATICALLY GENERATED ON Tue Apr 16 17:20:59 EDT 2002*/

-/* DO NOT EDIT */

-

-grant {

-  permission java.security.AllPermission;

-};

-

diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java
deleted file mode 100644
index af60d82..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/AbstractRuntimeClasspathEntry.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry2;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Common function for runtime classpath entries.
- * <p>
- * Clients implementing runtime classpath entries must subclass this
- * class.
- * </p>
- * @since 3.0
- */
-public abstract class AbstractRuntimeClasspathEntry extends PlatformObject implements IRuntimeClasspathEntry2 {
-	
-	private IPath sourceAttachmentPath = null;
-	private IPath rootSourcePath = null;
-	private int classpathProperty = IRuntimeClasspathEntry.USER_CLASSES;
-	/**
-	 * Associated Java project, or <code>null</code>
-	 */
-	private IJavaProject fJavaProject;
-	
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>false</code>.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.internal.launching.IRuntimeClasspathEntry2#isComposite()
-	 */
-	public boolean isComposite() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns an empty collection.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.internal.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries()
-	 */
-	public IRuntimeClasspathEntry[] getRuntimeClasspathEntries() throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-	
-	/**
-	 * Throws an exception with the given message and underlying exception.
-	 * 
-	 * @param message error message
-	 * @param exception underlying exception or <code>null</code> if none
-	 * @throws CoreException
-	 */
-	protected void abort(String message, Throwable exception) throws CoreException {
-		IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, exception);
-		throw new CoreException(status);
-	}
-
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation generates a string containing an XML
-	 * document. Subclasses should override <code>buildMemento</code>
-	 * to specify the contents of the required <code>memento</code>
-	 * node.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		Document doc= DebugPlugin.newDocument();
-		Element root = doc.createElement("runtimeClasspathEntry"); //$NON-NLS-1$
-		doc.appendChild(root);
-		root.setAttribute("id", getTypeId()); //$NON-NLS-1$
-		Element memento = doc.createElement("memento"); //$NON-NLS-1$
-		root.appendChild(memento);
-		buildMemento(doc, memento);
-		return DebugPlugin.serializeDocument(doc);
-	}
-	
-	/**
-	 * Constructs a memento for this classpath entry in the given 
-	 * document and element. The memento element has already been
-	 * appended to the document.
-	 * 
-	 * @param document XML document
-	 * @param memento element node for client specific attributes
-	 * @throws CoreException if unable to create a memento 
-	 */
-	protected abstract void buildMemento(Document document, Element memento) throws CoreException;
-	
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getPath()
-	 */
-	public IPath getPath() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getResource()
-	 */
-	public IResource getResource() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentPath()
-	 */
-	public IPath getSourceAttachmentPath() {
-		return sourceAttachmentPath;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentPath(org.eclipse.core.runtime.IPath)
-	 */
-	public void setSourceAttachmentPath(IPath path) {
-		sourceAttachmentPath = path;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentRootPath()
-	 */
-	public IPath getSourceAttachmentRootPath() {
-		return rootSourcePath;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setSourceAttachmentRootPath(org.eclipse.core.runtime.IPath)
-	 */
-	public void setSourceAttachmentRootPath(IPath path) {
-		rootSourcePath = path;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathProperty()
-	 */
-	public int getClasspathProperty() {
-		return classpathProperty;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#setClasspathProperty(int)
-	 */
-	public void setClasspathProperty(int property) {
-		classpathProperty = property;
-	}
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getLocation()
-	 */
-	public String getLocation() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentLocation()
-	 */
-	public String getSourceAttachmentLocation() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getSourceAttachmentRootLocation()
-	 */
-	public String getSourceAttachmentRootLocation() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getVariableName()
-	 */
-	public String getVariableName() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * 
-	 * Default implementation returns <code>null</code>.
-	 * Subclasses should override if required.
-	 * 
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getClasspathEntry()
-	 */
-	public IClasspathEntry getClasspathEntry() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getJavaProject()
-	 */
-	public IJavaProject getJavaProject() {
-		return fJavaProject;
-	}
-	
-	/**
-	 * Sets the Java project associated with this entry.
-	 * 
-	 * @param javaProject
-	 */
-	protected void setJavaProject(IJavaProject javaProject) {
-		fJavaProject = javaProject;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java
deleted file mode 100644
index f4dd479..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathContainerSourceContainerTypeDelegate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.eclipse.jdt.launching.sourcelookup.containers.ClasspathContainerSourceContainer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Classpath container source container type.
- * 
- * @since 3.0
- */
-public class ClasspathContainerSourceContainerTypeDelegate extends AbstractSourceContainerTypeDelegate {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element)node;
-			if ("classpathContainer".equals(element.getNodeName())) { //$NON-NLS-1$
-				String string = element.getAttribute("path"); //$NON-NLS-1$
-				if (string == null || string.length() == 0) {
-					abort(LaunchingMessages.ClasspathContainerSourceContainerTypeDelegate_5, null); 
-				}
-				return new ClasspathContainerSourceContainer(new Path(string));
-			} 
-			abort(LaunchingMessages.ClasspathContainerSourceContainerTypeDelegate_6, null); 
-		}
-		abort(LaunchingMessages.ClasspathContainerSourceContainerTypeDelegate_7, null); 
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
-	public String getMemento(ISourceContainer container) throws CoreException {
-		ClasspathContainerSourceContainer var =  (ClasspathContainerSourceContainer) container;
-		Document document = newDocument();
-		Element element = document.createElement("classpathContainer"); //$NON-NLS-1$
-		element.setAttribute("path", var.getPath().toString()); //$NON-NLS-1$
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java
deleted file mode 100644
index aba2802..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ClasspathVariableSourceContainerTypeDelegate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.eclipse.jdt.launching.sourcelookup.containers.ClasspathVariableSourceContainer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Classpath variable source container type.
- * 
- * @since 3.0
- */
-public class ClasspathVariableSourceContainerTypeDelegate extends AbstractSourceContainerTypeDelegate {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element)node;
-			if ("classpathVariable".equals(element.getNodeName())) { //$NON-NLS-1$
-				String string = element.getAttribute("path"); //$NON-NLS-1$
-				if (string == null || string.length() == 0) {
-					abort(LaunchingMessages.ClasspathVariableSourceContainerTypeDelegate_5, null); 
-				}
-				return new ClasspathVariableSourceContainer(new Path(string));
-			} 
-			abort(LaunchingMessages.ClasspathVariableSourceContainerTypeDelegate_6, null); 
-		}
-		abort(LaunchingMessages.ClasspathVariableSourceContainerTypeDelegate_7, null); 
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
-	public String getMemento(ISourceContainer container) throws CoreException {
-		ClasspathVariableSourceContainer var =  (ClasspathVariableSourceContainer) container;
-		Document document = newDocument();
-		Element element = document.createElement("classpathVariable"); //$NON-NLS-1$
-		element.setAttribute("path", var.getPath().toString()); //$NON-NLS-1$
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java
deleted file mode 100644
index e3e0f31..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import java.util.ArrayList;
-
-/**
- * Utility class for id's made of multiple Strings
- */
-public class CompositeId {
-	private String[] fParts;
-	
-	public CompositeId(String[] parts) {
-		fParts= parts;
-	}
-	
-	public static CompositeId fromString(String idString) {
-		ArrayList parts= new ArrayList();
-		int commaIndex= idString.indexOf(',');
-		while (commaIndex > 0) {
-			int length= Integer.valueOf(idString.substring(0, commaIndex)).intValue();
-			String part= idString.substring(commaIndex+1, commaIndex+1+length);
-			parts.add(part);
-			idString= idString.substring(commaIndex+1+length);
-			commaIndex= idString.indexOf(',');
-		}
-		String[] result= (String[])parts.toArray(new String[parts.size()]);
-		return new CompositeId(result);
-	}
-	
-	public String toString() {
-		StringBuffer buf= new StringBuffer();
-		for (int i= 0; i < fParts.length; i++) {
-			buf.append(fParts[i].length());
-			buf.append(',');
-			buf.append(fParts[i]);
-		}
-		return buf.toString();
-	}
-	
-	public String get(int index) {
-		return fParts[index];
-	}
-	
-	public int getPartCount() {
-		return fParts.length;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java
deleted file mode 100644
index 34f86ed..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultEntryResolver.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.*;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Default resolver for a contributed classpath entry
- */
-public class DefaultEntryResolver implements IRuntimeClasspathEntryResolver {
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
-		IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2)entry;
-		IRuntimeClasspathEntry[] entries = entry2.getRuntimeClasspathEntries(configuration);
-		List resolved = new ArrayList();
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry[] temp = JavaRuntime.resolveRuntimeClasspathEntry(entries[i], configuration);
-			for (int j = 0; j < temp.length; j++) {
-				resolved.add(temp[j]);
-			}
-		}
-		return (IRuntimeClasspathEntry[]) resolved.toArray(new IRuntimeClasspathEntry[resolved.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.jdt.core.IJavaProject)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		IRuntimeClasspathEntry2 entry2 = (IRuntimeClasspathEntry2)entry;
-		IRuntimeClasspathEntry[] entries = entry2.getRuntimeClasspathEntries(null);
-		List resolved = new ArrayList();
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry[] temp = JavaRuntime.resolveRuntimeClasspathEntry(entries[i], project);
-			for (int j = 0; j < temp.length; j++) {
-				resolved.add(temp[j]);
-			}
-		}
-		return (IRuntimeClasspathEntry[]) resolved.toArray(new IRuntimeClasspathEntry[resolved.size()]);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveVMInstall(org.eclipse.jdt.core.IClasspathEntry)
-	 */
-	public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
deleted file mode 100644
index 3096185..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/DefaultProjectClasspathEntry.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeContainerComparator;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Default user classpath entries for a Java project
- */
-public class DefaultProjectClasspathEntry extends AbstractRuntimeClasspathEntry {
-	
-	public static final String TYPE_ID = "org.eclipse.jdt.launching.classpathentry.defaultClasspath"; //$NON-NLS-1$
-	
-	/**
-	 * Default constructor need to instantiate extensions
-	 */
-	public DefaultProjectClasspathEntry() {
-	}
-	
-	/**
-	 * Constructs a new classpath entry for the given project.
-	 * 
-	 * @param project Java project
-	 */
-	public DefaultProjectClasspathEntry(IJavaProject project) {
-		setJavaProject(project);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.launching.AbstractRuntimeClasspathEntry#buildMemento(org.w3c.dom.Document, org.w3c.dom.Element)
-	 */
-	protected void buildMemento(Document document, Element memento) throws CoreException {
-		memento.setAttribute("project", getJavaProject().getElementName()); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#initializeFrom(org.w3c.dom.Element)
-	 */
-	public void initializeFrom(Element memento) throws CoreException {
-		String name = memento.getAttribute("project"); //$NON-NLS-1$
-		if (name == null) {
-			abort(LaunchingMessages.DefaultProjectClasspathEntry_3, null); 
-		}		
-		IJavaProject project = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot().getProject(name));
-		setJavaProject(project);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getTypeId()
-	 */
-	public String getTypeId() {
-		return TYPE_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
-	 */
-	public int getType() {
-		return OTHER;
-	}
-	
-	protected IProject getProject() {
-		return getJavaProject().getProject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getLocation()
-	 */
-	public String getLocation() {
-		return getProject().getLocation().toOSString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getPath()
-	 */
-	public IPath getPath() {
-		return getProject().getFullPath();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getResource()
-	 */
-	public IResource getResource() {
-		return getProject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException {
-		IClasspathEntry entry = JavaCore.newProjectEntry(getJavaProject().getProject().getFullPath());
-		List classpathEntries = new ArrayList(5);
-		List expanding = new ArrayList(5);
-		expandProject(entry, classpathEntries, expanding);
-		IRuntimeClasspathEntry[] runtimeEntries = new IRuntimeClasspathEntry[classpathEntries == null ? 0 : classpathEntries.size()];
-		for (int i = 0; i < runtimeEntries.length; i++) {
-			Object e = classpathEntries.get(i);
-			if (e instanceof IClasspathEntry) {
-				IClasspathEntry cpe = (IClasspathEntry)e;
-				runtimeEntries[i] = new RuntimeClasspathEntry(cpe);
-			} else {
-				runtimeEntries[i] = (IRuntimeClasspathEntry)e;				
-			}
-		}
-		// remove bootpath entries - this is a default user classpath
-		List ordered = new ArrayList(runtimeEntries.length);
-		for (int i = 0; i < runtimeEntries.length; i++) {
-			if (runtimeEntries[i].getClasspathProperty() == IRuntimeClasspathEntry.USER_CLASSES) {
-				ordered.add(runtimeEntries[i]);
-			} 
-		}
-		return (IRuntimeClasspathEntry[]) ordered.toArray(new IRuntimeClasspathEntry[ordered.size()]);		
-	}
-	
-	/**
-	 * Returns the transitive closure of classpath entries for the
-	 * given project entry.
-	 * 
-	 * @param projectEntry project classpath entry
-	 * @param expandedPath a list of entries already expanded, should be empty
-	 * to begin, and contains the result
-	 * @param expanding a list of projects that have been or are currently being
-	 * expanded (to detect cycles)
-	 * @exception CoreException if unable to expand the classpath
-	 */
-	private static void expandProject(IClasspathEntry projectEntry, List expandedPath, List expanding) throws CoreException {
-		expanding.add(projectEntry);
-		// 1. Get the raw classpath
-		// 2. Replace source folder entries with a project entry
-		IPath projectPath = projectEntry.getPath();
-		IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(projectPath.lastSegment());
-		if (res == null) {
-			// add project entry and return
-			expandedPath.add(projectEntry);
-			return;
-		}
-		IJavaProject project = (IJavaProject)JavaCore.create(res);
-		if (project == null || !project.getProject().isOpen() || !project.exists()) {
-			// add project entry and return
-			expandedPath.add(projectEntry);
-			return;
-		}
-		
-		IClasspathEntry[] buildPath = project.getRawClasspath();
-		List unexpandedPath = new ArrayList(buildPath.length);
-		boolean projectAdded = false;
-		for (int i = 0; i < buildPath.length; i++) {
-			if (buildPath[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-				if (!projectAdded) {
-					projectAdded = true;
-					unexpandedPath.add(projectEntry);
-				}
-			} else {
-				unexpandedPath.add(buildPath[i]);
-			}
-		}
-		// 3. expand each project entry (except for the root project)
-		// 4. replace each container entry with a runtime entry associated with the project
-		Iterator iter = unexpandedPath.iterator();
-		while (iter.hasNext()) {
-			IClasspathEntry entry = (IClasspathEntry)iter.next();
-			if (entry == projectEntry) {
-				expandedPath.add(entry);
-			} else {
-				switch (entry.getEntryKind()) {
-					case IClasspathEntry.CPE_PROJECT:
-						if (!expanding.contains(entry)) {
-							expandProject(entry, expandedPath, expanding);
-						}
-						break;
-					case IClasspathEntry.CPE_CONTAINER:
-						IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-						int property = -1;
-						if (container != null) {
-							switch (container.getKind()) {
-								case IClasspathContainer.K_APPLICATION:
-									property = IRuntimeClasspathEntry.USER_CLASSES;
-									break;
-								case IClasspathContainer.K_DEFAULT_SYSTEM:
-									property = IRuntimeClasspathEntry.STANDARD_CLASSES;
-									break;	
-								case IClasspathContainer.K_SYSTEM:
-									property = IRuntimeClasspathEntry.BOOTSTRAP_CLASSES;
-									break;
-							}
-							IRuntimeClasspathEntry r = JavaRuntime.newRuntimeContainerClasspathEntry(entry.getPath(), property, project);
-							// check for duplicate/redundant entries 
-							boolean duplicate = false;
-							ClasspathContainerInitializer initializer = JavaCore.getClasspathContainerInitializer(r.getPath().segment(0));
-							for (int i = 0; i < expandedPath.size(); i++) {
-								Object o = expandedPath.get(i);
-								if (o instanceof IRuntimeClasspathEntry) {
-									IRuntimeClasspathEntry re = (IRuntimeClasspathEntry)o;
-									if (re.getType() == IRuntimeClasspathEntry.CONTAINER) {
-										if (container instanceof IRuntimeContainerComparator) {
-											duplicate = ((IRuntimeContainerComparator)container).isDuplicate(re.getPath());
-										} else {
-											ClasspathContainerInitializer initializer2 = JavaCore.getClasspathContainerInitializer(re.getPath().segment(0));
-											Object id1 = null;
-											Object id2 = null;
-											if (initializer == null) {
-												id1 = r.getPath().segment(0);
-											} else {
-												id1 = initializer.getComparisonID(r.getPath(), project);
-											}
-											if (initializer2 == null) {
-												id2 = re.getPath().segment(0);
-											} else {
-												id2 = initializer2.getComparisonID(re.getPath(), project);
-											}
-											if (id1 == null) {
-												duplicate = id2 == null;
-											} else {
-												duplicate = id1.equals(id2);
-											}
-										}
-										if (duplicate) {
-											break;
-										}
-									}
-								}
-							}
-							if (!duplicate) {
-								expandedPath.add(r);
-							}	
-						}
-						break;
-					case IClasspathEntry.CPE_VARIABLE:
-						if (entry.getPath().segment(0).equals(JavaRuntime.JRELIB_VARIABLE)) {
-							IRuntimeClasspathEntry r = JavaRuntime.newVariableRuntimeClasspathEntry(entry.getPath());
-							r.setSourceAttachmentPath(entry.getSourceAttachmentPath());
-							r.setSourceAttachmentRootPath(entry.getSourceAttachmentRootPath());
-							r.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-							if (!expandedPath.contains(r)) {
-								expandedPath.add(r);
-							}
-							break;
-						}
-						// fall through if not the special JRELIB variable
-					default:
-						if (!expandedPath.contains(entry)) {
-							expandedPath.add(entry);
-						}
-						break;
-				}
-			}
-		}
-		return;
-	}	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#isComposite()
-	 */
-	public boolean isComposite() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getName()
-	 */
-	public String getName() {
-		return MessageFormat.format(LaunchingMessages.DefaultProjectClasspathEntry_4, new String[] {getJavaProject().getElementName()}); 
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		return obj instanceof DefaultProjectClasspathEntry &&
-		 ((DefaultProjectClasspathEntry)obj).getJavaProject().equals(getJavaProject());
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getJavaProject().hashCode();
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
deleted file mode 100644
index beed6c6..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallChangedListener;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.PropertyChangeEvent;
-
-/** 
- * JRE Container - resolves a classpath container variable to a JRE
- */
-public class JREContainer implements IClasspathContainer {
-
-	/**
-	 * Corresponding JRE
-	 */
-	private IVMInstall fVMInstall = null;
-	
-	/**
-	 * Container path used to resolve to this JRE
-	 */
-	private IPath fPath = null;
-	
-	/**
-	 * Cache of classpath entries per VM install. Cleared when a VM changes.
-	 */
-	private static Map fgClasspathEntries = null;
-	
-	private static IAccessRule[] EMPTY_RULES = new IAccessRule[0];
-	
-	/**
-	 * Returns the classpath entries associated with the given VM.
-	 * 
-	 * @param vm
-	 * @return classpath entries
-	 */
-	private static IClasspathEntry[] getClasspathEntries(IVMInstall vm) {
-		if (fgClasspathEntries == null) {
-			fgClasspathEntries = new HashMap(10);
-			// add a listener to clear cached value when a VM changes or is removed
-			IVMInstallChangedListener listener = new IVMInstallChangedListener() {
-				public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
-				}
-
-				public void vmChanged(PropertyChangeEvent event) {
-					if (event.getSource() != null) {
-						fgClasspathEntries.remove(event.getSource());
-					}
-				}
-
-				public void vmAdded(IVMInstall newVm) {
-				}
-
-				public void vmRemoved(IVMInstall removedVm) {
-					fgClasspathEntries.remove(removedVm);
-				}
-			};
-			JavaRuntime.addVMInstallChangedListener(listener);
-		}
-		IClasspathEntry[] entries = (IClasspathEntry[])fgClasspathEntries.get(vm);
-		if (entries == null) {
-			entries = computeClasspathEntries(vm);
-			fgClasspathEntries.put(vm, entries);
-		}
-		return entries;
-	}
-	
-	/**
-	 * Computes the classpath entries associated with a VM - one entry per library.
-	 * 
-	 * @param vm
-	 * @return classpath entries
-	 */
-	private static IClasspathEntry[] computeClasspathEntries(IVMInstall vm) {
-		LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
-		List entries = new ArrayList(libs.length);
-		for (int i = 0; i < libs.length; i++) {
-			if (!libs[i].getSystemLibraryPath().isEmpty()) {
-				IPath sourcePath = libs[i].getSystemLibrarySourcePath();
-				if (sourcePath.isEmpty()) {
-					sourcePath = null;
-				}
-				IPath rootPath = libs[i].getPackageRootPath();
-				if (rootPath.isEmpty()) {
-					rootPath = null;
-				}
-				URL javadocLocation = libs[i].getJavadocLocation();
-				if (javadocLocation == null) {
-					javadocLocation = vm.getJavadocLocation();
-				}
-				IClasspathAttribute[] attributes = null;
-				if (javadocLocation == null) {
-					attributes = new IClasspathAttribute[0];
-				} else {
-					attributes = new IClasspathAttribute[]{JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadocLocation.toExternalForm())};
-				}
-				entries.add(JavaCore.newLibraryEntry(libs[i].getSystemLibraryPath(), sourcePath, rootPath, EMPTY_RULES, attributes, false));
-			}
-		}
-		return (IClasspathEntry[])entries.toArray(new IClasspathEntry[entries.size()]);		
-	}
-	
-	/**
-	 * Constructs a JRE classpath conatiner on the given VM install
-	 * 
-	 * @param vm vm install - cannot be <code>null</code>
-	 * @param path container path used to resolve this JRE
-	 */
-	public JREContainer(IVMInstall vm, IPath path) {
-		fVMInstall = vm;
-		fPath = path;
-	}
-	
-	/**
-	 * @see IClasspathContainer#getClasspathEntries()
-	 */
-	public IClasspathEntry[] getClasspathEntries() {
-		return getClasspathEntries(fVMInstall);
-	}
-
-	/**
-	 * @see IClasspathContainer#getDescription()
-	 */
-	public String getDescription() {
-		StringBuffer desc = new StringBuffer(LaunchingMessages.JREContainer_JRE_System_Library_1); 
-		desc.append(" ["); //$NON-NLS-1$
-		desc.append(fVMInstall.getName());
-		desc.append("]"); //$NON-NLS-1$
-		return desc.toString();
-	}
-
-	/**
-	 * @see IClasspathContainer#getKind()
-	 */
-	public int getKind() {
-		return IClasspathContainer.K_DEFAULT_SYSTEM;
-	}
-
-	/**
-	 * @see IClasspathContainer#getPath()
-	 */
-	public IPath getPath() {
-		return fPath;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java
deleted file mode 100644
index b64471f..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.VMStandin;
-
-/**
- * Resolves a container for a JRE classpath container entry.
- */
-public class JREContainerInitializer extends ClasspathContainerInitializer {
-
-	/**
-	 * @see ClasspathContainerInitializer#initialize(IPath, IJavaProject)
-	 */
-	public void initialize(IPath containerPath, IJavaProject project) throws CoreException {		
-		int size = containerPath.segmentCount();
-		if (size > 0) {
-			if (containerPath.segment(0).equals(JavaRuntime.JRE_CONTAINER)) {
-				IVMInstall vm = resolveVM(containerPath);
-				JREContainer container = null;
-				if (vm != null) {
-					container = new JREContainer(vm, containerPath);
-				}
-				JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {project}, new IClasspathContainer[] {container}, null);
-			}
-		}
-	}
-	
-	/**
-	 * Returns the VM install associated with the container path, or <code>null</code>
-	 * if it does not exist.
-	 */
-	public static IVMInstall resolveVM(IPath containerPath) {
-		IVMInstall vm = null;
-		if (containerPath.segmentCount() > 1) {
-			// specific JRE
-			String vmTypeId = getVMTypeId(containerPath);
-			String vmName = getVMName(containerPath);
-			IVMInstallType vmType = JavaRuntime.getVMInstallType(vmTypeId);
-			if (vmType != null) {
-				vm = vmType.findVMInstallByName(vmName);
-			}
-		} else {
-			// workspace default JRE
-			vm = JavaRuntime.getDefaultVMInstall();
-		}		
-		return vm;
-	}
-	
-	/**
-	 * Returns the VM type identifier from the given container ID path.
-	 * 
-	 * @return the VM type identifier from the given container ID path
-	 */
-	public static String getVMTypeId(IPath path) {
-		return path.segment(1);
-	}
-	
-	/**
-	 * Returns the VM name from the given container ID path.
-	 * 
-	 * @return the VM name from the given container ID path
-	 */
-	public static String getVMName(IPath path) {
-		return path.removeFirstSegments(2).toString();
-	}	
-	
-	/**
-	 * The container can be updated if it refers to an existing VM.
-	 * 
-	 * @see org.eclipse.jdt.core.ClasspathContainerInitializer#canUpdateClasspathContainer(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
-	 */
-	public boolean canUpdateClasspathContainer(IPath containerPath, IJavaProject project) {
-		if (containerPath != null && containerPath.segmentCount() > 0) {
-			if (JavaRuntime.JRE_CONTAINER.equals(containerPath.segment(0))) {
-				return resolveVM(containerPath) != null;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jdt.core.ClasspathContainerInitializer#requestClasspathContainerUpdate(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject, org.eclipse.jdt.core.IClasspathContainer)
-	 */
-	public void requestClasspathContainerUpdate(IPath containerPath, IJavaProject project, IClasspathContainer containerSuggestion) throws CoreException {
-		IVMInstall vm = resolveVM(containerPath);
-		if (vm == null) { 
-			IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST, MessageFormat.format(LaunchingMessages.JREContainerInitializer_JRE_referenced_by_classpath_container__0__does_not_exist__1, new String[]{containerPath.toString()}), null); 
-			throw new CoreException(status);
-		}
-		// update of the vm with new library locations
-		
-		IClasspathEntry[] entries = containerSuggestion.getClasspathEntries();
-		LibraryLocation[] libs = new LibraryLocation[entries.length];
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-				IPath path = entry.getPath();
-				File lib = path.toFile();
-				if (lib.exists() && lib.isFile()) {
-					IPath srcPath = entry.getSourceAttachmentPath();
-					if (srcPath == null) {
-						srcPath = Path.EMPTY;
-					}
-					IPath rootPath = entry.getSourceAttachmentRootPath();
-					if (rootPath == null) {
-						rootPath = Path.EMPTY;
-					}
-					URL javadocLocation = null;
-					IClasspathAttribute[] extraAttributes = entry.getExtraAttributes();
-					for (int j = 0; j < extraAttributes.length; j++) {
-						IClasspathAttribute attribute = extraAttributes[j];
-						if (attribute.getName().equals(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME)) {
-							String url = attribute.getValue();
-							if (url != null && url.trim().length() > 0) {
-								try {
-									javadocLocation = new URL(url);
-								} catch (MalformedURLException e) {
-									LaunchingPlugin.log(e);
-								}
-							}
-						}
-					}
-					libs[i] = new LibraryLocation(path, srcPath, rootPath, javadocLocation);
-				} else {
-					IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, MessageFormat.format(LaunchingMessages.JREContainerInitializer_Classpath_entry__0__does_not_refer_to_an_existing_library__2, new String[]{entry.getPath().toString()}), null); 
-					throw new CoreException(status);
-				}
-			} else {
-				IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, MessageFormat.format(LaunchingMessages.JREContainerInitializer_Classpath_entry__0__does_not_refer_to_a_library__3, new String[]{entry.getPath().toString()}), null); 
-				throw new CoreException(status);
-			}
-		}
-		VMStandin standin = new VMStandin(vm);
-		standin.setLibraryLocations(libs);
-		standin.convertToRealVM();
-		JavaRuntime.saveVMConfiguration();
-	}
-
-	/**
-	 * @see org.eclipse.jdt.core.ClasspathContainerInitializer#getDescription(org.eclipse.core.runtime.IPath, org.eclipse.jdt.core.IJavaProject)
-	 */
-	public String getDescription(IPath containerPath, IJavaProject project) {
-		if (containerPath.segmentCount() == 3) {
-			StringBuffer desc = new StringBuffer(LaunchingMessages.JREContainer_JRE_System_Library_1); 
-			desc.append(" ["); //$NON-NLS-1$
-			desc.append(containerPath.segment(2));
-			desc.append("]"); //$NON-NLS-1$
-			return desc.toString();
-		} 
-		return LaunchingMessages.JREContainerInitializer_Default_System_Library_1; 
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java
deleted file mode 100644
index 3a10c92..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREPreferenceModifyListener.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IPreferenceNodeVisitor;
-import org.eclipse.core.runtime.preferences.PreferenceModifyListener;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Manages import of installed JREs. Merges valid impoted JREs with existing JREs.
- * 
- * @since 3.1
- */
-public class JREPreferenceModifyListener extends PreferenceModifyListener {
-	
-	class Visitor implements IPreferenceNodeVisitor {
-
-		public boolean visit(IEclipsePreferences node) throws BackingStoreException {
-			if (node.name().equals(LaunchingPlugin.getUniqueIdentifier())) {
-				String jresXML = node.get(JavaRuntime.PREF_VM_XML, null);
-				if (jresXML != null) {
-					VMDefinitionsContainer vms = new VMDefinitionsContainer();
-					String pref = LaunchingPlugin.getDefault().getPluginPreferences().getString(JavaRuntime.PREF_VM_XML);
-					Set names = new HashSet();
-					Set locations = new HashSet();
-					if (pref.length() > 0) {
-						try {
-							VMDefinitionsContainer container = VMDefinitionsContainer.parseXMLIntoContainer(new ByteArrayInputStream(pref.getBytes()));
-							List validVMList = container.getValidVMList();
-							Iterator iterator = validVMList.iterator();
-							while (iterator.hasNext()) {
-								IVMInstall vm = (IVMInstall) iterator.next();
-								names.add(vm.getName());
-								locations.add(vm.getInstallLocation());
-								vms.addVM(vm);
-							}
-							vms.setDefaultVMInstallCompositeID(container.getDefaultVMInstallCompositeID());
-							vms.setDefaultVMInstallConnectorTypeID(container.getDefaultVMInstallConnectorTypeID());
-						} catch (IOException e) {
-							LaunchingPlugin.log(e);
-							return false;
-						}
-					}
-					// merge valid VMs with existing VMs
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(jresXML.getBytes());
-					try {
-						VMDefinitionsContainer container = VMDefinitionsContainer.parseXMLIntoContainer(inputStream);
-						List validVMList = container.getValidVMList();
-						Iterator iterator = validVMList.iterator();
-						while (iterator.hasNext()) {
-							IVMInstall vm = (IVMInstall) iterator.next();
-							if (!names.contains(vm.getName()) && !locations.contains(vm.getInstallLocation())) {
-								vms.addVM(vm);
-							}
-						}
-					} catch (IOException e) {
-						LaunchingPlugin.log(e);
-						return false;
-					}
-					try {
-						String xml = vms.getAsXML();
-						node.put(JavaRuntime.PREF_VM_XML, xml);
-					} catch (ParserConfigurationException e) {
-						LaunchingPlugin.log(e);
-						return false;
-					} catch (IOException e) {
-						LaunchingPlugin.log(e);
-						return false;
-					} catch (TransformerException e) {
-						LaunchingPlugin.log(e);
-						return false;
-					}
-				}
-				return false;
-			}
-			return true;
-		}
-		
-	}
-
-	public IEclipsePreferences preApply(IEclipsePreferences node) {
-		try {
-			node.accept(new Visitor());
-		} catch (BackingStoreException e) {
-            LaunchingPlugin.log(e);
-		}
-		return node;
-	}
-
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
deleted file mode 100644
index 53b5c11..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * Resolves for JRELIB_VARIABLE and JRE_CONTAINER
- */
-public class JRERuntimeClasspathEntryResolver implements IRuntimeClasspathEntryResolver {
-
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
-		IVMInstall jre = null;
-		if (entry.getType() == IRuntimeClasspathEntry.CONTAINER && entry.getPath().segmentCount() > 1) {
-			// a specific VM
-			jre = JREContainerInitializer.resolveVM(entry.getPath()); 
-		} else {
-			// default VM for config
-			jre = JavaRuntime.computeVMInstall(configuration);
-		}
-		if (jre == null) {
-			// cannot resolve JRE
-			return new IRuntimeClasspathEntry[0];
-		}
-		return resolveLibraryLocations(jre, entry.getClasspathProperty());
-	}
-	
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, IJavaProject)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		IVMInstall jre = null;
-		if (entry.getType() == IRuntimeClasspathEntry.CONTAINER && entry.getPath().segmentCount() > 1) {
-			// a specific VM
-			jre = JREContainerInitializer.resolveVM(entry.getPath()); 
-		} else {
-			// default VM for project
-			jre = JavaRuntime.getVMInstall(project);
-		}
-		if (jre == null) {
-			// cannot resolve JRE
-			return new IRuntimeClasspathEntry[0];
-		}		
-		return resolveLibraryLocations(jre, entry.getClasspathProperty());
-	}
-
-	/**
-	 * Resolves libray locations for the given VM install
-	 */
-	protected IRuntimeClasspathEntry[] resolveLibraryLocations(IVMInstall vm, int kind) {
-		if (kind == IRuntimeClasspathEntry.BOOTSTRAP_CLASSES) {
-			File vmInstallLocation= vm.getInstallLocation();
-			if (vmInstallLocation != null) {
-				LibraryInfo libraryInfo= LaunchingPlugin.getLibraryInfo(vmInstallLocation.getAbsolutePath());
-				if (libraryInfo != null) {
-					// only return bootstrap classpath entries if we have the info
-					String[] bootpath= libraryInfo.getBootpath();
-					int length= bootpath.length;
-					// use libs to set source attachment properly
-					LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
-					List resolvedEntries = new ArrayList(length);
-					for (int i= 0; i < length; i++) {
-						IPath libPath = new Path(bootpath[i]);
-						if (libPath.toFile().exists()) {
-							IRuntimeClasspathEntry resolved = JavaRuntime.newArchiveRuntimeClasspathEntry(libPath);
-							resolved.setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-							for (int j = 0; j < libs.length; j++) {
-								String resolvedPath = resolved.getPath().toString();
-								if (libs[j].getSystemLibraryPath().toString().equalsIgnoreCase(resolvedPath)) {
-									IPath path = libs[j].getSystemLibrarySourcePath();
-									if (path != null && !path.isEmpty()) {
-										resolved.setSourceAttachmentPath(path);
-										resolved.setSourceAttachmentRootPath(libs[j].getPackageRootPath());
-									}
-									break;
-								}
-							}
-							resolvedEntries.add(resolved);
-						}
-					}
-					return (IRuntimeClasspathEntry[]) resolvedEntries.toArray(new IRuntimeClasspathEntry[resolvedEntries.size()]);
-				}
-			}
-		}
-		LibraryLocation[] libs = vm.getLibraryLocations();
-		LibraryLocation[] defaultLibs = vm.getVMInstallType().getDefaultLibraryLocations(vm.getInstallLocation());
-		if (libs == null) {
-			// default system libs
-			libs = defaultLibs;
-		} else if (!isSameArchives(libs, defaultLibs)) {
-			// determine if bootpath should be explicit
-			kind = IRuntimeClasspathEntry.BOOTSTRAP_CLASSES;
-		}
-		List resolvedEntries = new ArrayList(libs.length);
-		for (int i = 0; i < libs.length; i++) {
-			IPath systemLibraryPath = libs[i].getSystemLibraryPath();
-			if (systemLibraryPath.toFile().exists()) {
-				IRuntimeClasspathEntry resolved = JavaRuntime.newArchiveRuntimeClasspathEntry(systemLibraryPath);
-				IPath path = libs[i].getSystemLibrarySourcePath();
-				if (path != null && !path.isEmpty()) {
-					resolved.setSourceAttachmentPath(path);
-					resolved.setSourceAttachmentRootPath(libs[i].getPackageRootPath());
-				}
-				resolved.setClasspathProperty(kind);
-				resolvedEntries.add(resolved);
-			}
-		}
-		return (IRuntimeClasspathEntry[]) resolvedEntries.toArray(new IRuntimeClasspathEntry[resolvedEntries.size()]);
-	}
-		
-	/**
-	 * Return whether the given list of libraries refer to the same archives in the same
-	 * order. Only considers the binary archive (not source or javadoc locations). 
-	 *  
-	 * @param libs
-	 * @param defaultLibs
-	 * @return whether the given list of libraries refer to the same archives in the same
-	 * order
-	 */
-	public static boolean isSameArchives(LibraryLocation[] libs, LibraryLocation[] defaultLibs) {
-		if (libs.length != defaultLibs.length) {
-			return false;
-		}
-		for (int i = 0; i < defaultLibs.length; i++) {
-			LibraryLocation def = defaultLibs[i];
-			LibraryLocation lib = libs[i];
-			if (!def.getSystemLibraryPath().equals(lib.getSystemLibraryPath())) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveVMInstall(IClasspathEntry)
-	 */
-	public IVMInstall resolveVMInstall(IClasspathEntry entry) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_VARIABLE:
-				if (entry.getPath().segment(0).equals(JavaRuntime.JRELIB_VARIABLE)) {
-					return JavaRuntime.getDefaultVMInstall();
-				}
-				break;
-			case IClasspathEntry.CPE_CONTAINER:
-				if (entry.getPath().segment(0).equals(JavaRuntime.JRE_CONTAINER)) {
-					return JREContainerInitializer.resolveVM(entry.getPath());
-				}
-				break;
-			default:
-				break;
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java
deleted file mode 100644
index 3a5eb05..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaAppletLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-public class JavaAppletLaunchConfigurationDelegate extends JavaLaunchDelegate implements IDebugEventSetListener {
-		
-	/**
-	 * Mapping of ILaunch objects to File objects that represent the .html file
-	 * used to initiate the applet launch.  This is used to delete the .html
-	 * file when the launch terminates.
-	 */
-	private static Map fgLaunchToFileMap = new HashMap();
-	
-	/**
-	 * Used to map temp file to launch obejct.
-	 */
-	private ILaunch fLaunch;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public synchronized void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		try {
-			fLaunch = launch;
-			super.launch(configuration, mode, launch, monitor);
-		} catch (CoreException e) {
-			cleanup(launch);
-			throw e;
-		}
-		fLaunch = null;
-	}
-
-	/**
-	 * Returns the system property string for the policy file
-	 * 
-	 * @param workingDir the working directory
-	 * @return system property for the policy file
-	 */
-	public String getJavaPolicyFile(File workingDir) {
-			File file = new File(workingDir, "java.policy.applet");//$NON-NLS-1$ 
-			if (!file.exists()) {
-				// copy it to the working directory
-				File test = LaunchingPlugin.getFileInPlugin(new Path("java.policy.applet")); //$NON-NLS-1$
-				BufferedOutputStream outputStream= null;
-				try {
-					byte[] bytes = getFileByteContent(test);
-					outputStream = new BufferedOutputStream(new FileOutputStream(file));
-					outputStream.write(bytes);
-				} catch (IOException e) {
-					return "";//$NON-NLS-1$
-				} finally {
-					if (outputStream != null) {
-						try {
-							outputStream.close();
-						} catch (IOException e1) {
-						}
-					}
-				}
-			}
-		return "-Djava.security.policy=java.policy.applet";//$NON-NLS-1$
-	}
-
-	/**
-	 * Using the specified launch configuration, build an HTML file that specifies the
-	 * applet to launch.  Return the name of the HTML file.
-	 * 
-	 * @param dir the directory in which to make the file
-	 */
-	private File buildHTMLFile(ILaunchConfiguration configuration, File dir) {
-		FileWriter writer = null;
-		File tempFile = null;
-		try {
-			String name = getAppletMainTypeName(configuration);
-			tempFile = new File(dir, name + System.currentTimeMillis() + ".html"); //$NON-NLS-1$ 
-			writer = new FileWriter(tempFile);
-			writer.write("<html>\n"); //$NON-NLS-1$
-			writer.write("<body>\n"); //$NON-NLS-1$
-			writer.write("<applet code="); //$NON-NLS-1$
-			writer.write(name);
-			writer.write(".class "); //$NON-NLS-1$
-			String appletName = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_NAME, ""); //$NON-NLS-1$
-			if (appletName.length() != 0) {
-				writer.write("NAME =\"" + appletName + "\" "); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			writer.write("width=\""); //$NON-NLS-1$
-			writer.write(Integer.toString(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_WIDTH, 200))); 
-			writer.write("\" height=\""); //$NON-NLS-1$
-			writer.write(Integer.toString(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_HEIGHT, 200))); 
-			writer.write("\" >\n"); //$NON-NLS-1$
-			Map parameters = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_PARAMETERS, new HashMap());
-			if (parameters.size() != 0) {
-				Iterator iterator= parameters.entrySet().iterator();
-				while(iterator.hasNext()) {
-		 			Map.Entry next = (Map.Entry) iterator.next();
-					writer.write("<param name="); //$NON-NLS-1$
-					writer.write(getQuotedString((String)next.getKey()));
-					writer.write(" value="); //$NON-NLS-1$
-					writer.write(getQuotedString((String)next.getValue()));
-					writer.write(">\n"); //$NON-NLS-1$
-				}
-			}
-			writer.write("</applet>\n"); //$NON-NLS-1$
-			writer.write("</body>\n"); //$NON-NLS-1$
-			writer.write("</html>\n"); //$NON-NLS-1$
-		} catch(IOException e) {
-		} catch(CoreException e) {
-		} finally {
-			if (writer != null) {
-				try {
-					writer.close();
-				} catch(IOException e) {
-				}
-			}
-		}
-		
-		return tempFile;
-	}
-	
-	private String getQuotedString(String string) {
-		if (string.indexOf('"') == -1) {
-			return '"' + string + '"';
-		} 
-		return '\'' + string + '\'';
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
-	 */
-	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			DebugEvent event = events[i];
-			Object eventSource = event.getSource();
-			switch(event.getKind()) {
-				
-				// Delete the HTML file used for the launch
-				case DebugEvent.TERMINATE :
-					if (eventSource != null) {
-						ILaunch launch = null;
-						if (eventSource instanceof IProcess) {
-							IProcess process = (IProcess) eventSource;
-							launch = process.getLaunch();
-						} else if (eventSource instanceof IDebugTarget) {
-							IDebugTarget debugTarget = (IDebugTarget) eventSource;
-							launch = debugTarget.getLaunch();
-						}
-						if (launch != null) {
-							cleanup(launch);
-						}
-					}
-					break;
-			}
-		}
-	}
-	
-	/**
-	 * Cleans up event listener and temp file for the launch.
-	 * 
-	 * @param launch
-	 */
-	private void cleanup(ILaunch launch) {
-		File temp = (File) fgLaunchToFileMap.get(launch);
-		if (temp != null) {
-			try {
-				fgLaunchToFileMap.remove(launch);
-				temp.delete();
-			} finally {
-				if (fgLaunchToFileMap.isEmpty()) {
-					DebugPlugin.getDefault().removeDebugEventListener(this);
-				}
-			}
-		}		
-	}
-
-	/**
-	 * Returns the contents of the given file as a byte array.
-	 * @throws IOException if a problem occured reading the file.
-	 */
-	protected static byte[] getFileByteContent(File file) throws IOException {
-		InputStream stream = null;
-		try {
-			stream = new BufferedInputStream(new FileInputStream(file));
-			return getInputStreamAsByteArray(stream, (int) file.length());
-		} finally {
-			if (stream != null) {
-				try {
-					stream.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Returns the given input stream's contents as a byte array.
-	 * If a length is specified (ie. if length != -1), only length bytes
-	 * are returned. Otherwise all bytes in the stream are returned.
-	 * Note this doesn't close the stream.
-	 * @throws IOException if a problem occured reading the stream.
-	 */
-	protected static byte[] getInputStreamAsByteArray(InputStream stream, int length)
-		throws IOException {
-		byte[] contents;
-		if (length == -1) {
-			contents = new byte[0];
-			int contentsLength = 0;
-			int bytesRead = -1;
-			do {
-				int available = stream.available();
-
-				// resize contents if needed
-				if (contentsLength + available > contents.length) {
-					System.arraycopy(
-						contents,
-						0,
-						contents = new byte[contentsLength + available],
-						0,
-						contentsLength);
-				}
-
-				// read as many bytes as possible
-				bytesRead = stream.read(contents, contentsLength, available);
-
-				if (bytesRead > 0) {
-					// remember length of contents
-					contentsLength += bytesRead;
-				}
-			} while (bytesRead > 0);
-
-			// resize contents if necessary
-			if (contentsLength < contents.length) {
-				System.arraycopy(
-					contents,
-					0,
-					contents = new byte[contentsLength],
-					0,
-					contentsLength);
-			}
-		} else {
-			contents = new byte[length];
-			int len = 0;
-			int readSize = 0;
-			while ((readSize != -1) && (len != length)) {
-				// See PR 1FMS89U
-				// We record first the read size. In this case len is the actual read size.
-				len += readSize;
-				readSize = stream.read(contents, len, length - len);
-			}
-		}
-
-		return contents;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate#verifyWorkingDirectory(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public File verifyWorkingDirectory(ILaunchConfiguration configuration) throws CoreException {
-		IPath path = getWorkingDirectoryPath(configuration);
-		if (path == null) {
-			// default working dir for applets is the project's output directory
-			String outputDir = JavaRuntime.getProjectOutputDirectory(configuration);
-			if (outputDir == null) {
-				// if no project attribute, default to eclipse directory
-				return new File(System.getProperty("user.dir"));  //$NON-NLS-1$
-			}
-			IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(outputDir);
-			if (resource == null || !resource.exists()) {
-				//default to eclipse directory
-				return new File(System.getProperty("user.dir"));  //$NON-NLS-1$
-			}
-			return resource.getLocation().toFile(); 
-		} 
-		if (path.isAbsolute()) {
-			File dir = new File(path.toOSString());
-			if (dir.isDirectory()) {
-				return dir;
-			} 
-			abort(MessageFormat.format(LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, new String[] {path.toString()}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); 
-		} else {
-			IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-			if (res instanceof IContainer && res.exists()) {
-				return res.getLocation().toFile();
-			} 
-			abort(MessageFormat.format(LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, new String[] {path.toString()}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); 
-		}
-		// cannot return null - an exception will be thrown
-		return null;		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate#getProgramArguments(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public String getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
-		File workingDir = verifyWorkingDirectory(configuration);
-		// Construct the HTML file and set its name as a program argument
-		File htmlFile = buildHTMLFile(configuration, workingDir);
-		if (htmlFile == null) {
-			abort(LaunchingMessages.JavaAppletLaunchConfigurationDelegate_Could_not_build_HTML_file_for_applet_launch_1, null, IJavaLaunchConfigurationConstants.ERR_COULD_NOT_BUILD_HTML); 
-		}			
-		// Add a debug listener if necessary 
-		if (fgLaunchToFileMap.isEmpty()) {
-			DebugPlugin.getDefault().addDebugEventListener(this);
-		}
-		// Add a mapping of the launch to the html file 
-		fgLaunchToFileMap.put(fLaunch, htmlFile);		
-		return htmlFile.getName();		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate#getVMArguments(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public String getVMArguments(ILaunchConfiguration configuration) throws CoreException {
-		StringBuffer arguments = new StringBuffer(super.getVMArguments(configuration));
-		File workingDir = verifyWorkingDirectory(configuration);
-		String javaPolicyFile = getJavaPolicyFile(workingDir);
-		arguments.append(" "); //$NON-NLS-1$
-		arguments.append(javaPolicyFile);
-		return arguments.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate#getMainTypeName(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public String getMainTypeName(ILaunchConfiguration configuration) throws CoreException {
-		return configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_APPLET_APPLETVIEWER_CLASS, IJavaLaunchConfigurationConstants.DEFAULT_APPLETVIEWER_CLASS);
-	}
-
-	/**
-	 * Returns the applet's main type name.
-	 * 
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected String getAppletMainTypeName(ILaunchConfiguration configuration) throws CoreException {
-		return super.getMainTypeName(configuration);
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaClasspathVariablesInitializer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaClasspathVariablesInitializer.java
deleted file mode 100644
index 35bad8b..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaClasspathVariablesInitializer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
- 
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ClasspathVariableInitializer;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-public class JavaClasspathVariablesInitializer extends ClasspathVariableInitializer {
-
-	/**
-	 * The monitor to use for progress reporting.
-	 * May be null
-	 */
-	private IProgressMonitor fMonitor;
-	
-	/**
-	 * @see ClasspathVariableInitializer#initialize(String)
-	 */
-	public void initialize(String variable) {
-		IVMInstall vmInstall= JavaRuntime.getDefaultVMInstall();
-		if (vmInstall != null) {
-			IPath newPath= null;
-			LibraryLocation[] locations= JavaRuntime.getLibraryLocations(vmInstall);
-			// look for rt.jar or classes.zip (both may exist, so do exhaustive search)
-			LibraryLocation rtjar = null;
-			LibraryLocation classeszip = null;
-			for (int i = 0; i < locations.length; i++) {
-				LibraryLocation location = locations[i];
-				String name = location.getSystemLibraryPath().lastSegment();
-				if (name.equalsIgnoreCase("rt.jar")) { //$NON-NLS-1$
-					rtjar = location;
-				} else if (name.equalsIgnoreCase("classes.zip")) { //$NON-NLS-1$
-					classeszip = location;
-				}
-			}
-			// rt.jar if present, then classes.zip, else the first library
-			LibraryLocation systemLib = rtjar;
-			if (systemLib == null) {
-				systemLib = classeszip;
-			}
-			if (systemLib == null && locations.length > 0) {
-				systemLib = locations[0];
-			}
-			if (systemLib != null) {
-				if (variable.equals(JavaRuntime.JRELIB_VARIABLE)) {
-					newPath= systemLib.getSystemLibraryPath();
-				} else if (variable.equals(JavaRuntime.JRESRC_VARIABLE)) {
-					newPath= systemLib.getSystemLibrarySourcePath();
-				} else if (variable.equals(JavaRuntime.JRESRCROOT_VARIABLE)){
-					newPath= systemLib.getPackageRootPath();
-				}
-				if (newPath == null) {
-					return;
-				}
-				IWorkspace workspace= ResourcesPlugin.getWorkspace();
-				IWorkspaceDescription wsDescription= workspace.getDescription();				
-				boolean wasAutobuild= wsDescription.isAutoBuilding();
-				try {
-					setAutobuild(workspace, false);
-					setJREVariable(newPath, variable);	
-				} catch (CoreException ce) {
-					LaunchingPlugin.log(ce);
-					return;
-				} finally {
-					try {
-						setAutobuild(workspace, wasAutobuild);
-					} catch (CoreException ce) {
-						LaunchingPlugin.log(ce);
-					}
-				}
-			}
-		}
-	}
-	
-	private void setJREVariable(IPath newPath, String var) throws CoreException {
-		JavaCore.setClasspathVariable(var, newPath, getMonitor());
-	}
-	
-	private boolean setAutobuild(IWorkspace ws, boolean newState) throws CoreException {
-		IWorkspaceDescription wsDescription= ws.getDescription();
-		boolean oldState= wsDescription.isAutoBuilding();
-		if (oldState != newState) {
-			wsDescription.setAutoBuilding(newState);
-			ws.setDescription(wsDescription);
-		}
-		return oldState;
-	}
-	
-	protected IProgressMonitor getMonitor() {
-		if (fMonitor == null) {
-			return new NullProgressMonitor();
-		}
-		return fMonitor;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchConfigurationUtils.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchConfigurationUtils.java
deleted file mode 100644
index cff66ea..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchConfigurationUtils.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.w3c.dom.Document;
-
-/**
- * This class contains a number of static helper methods useful for the 'local Java' delegate.
- */
-public class JavaLaunchConfigurationUtils {
-																		 		
-	/**
-	 * Return the <code>IType</code> referenced in the specified configuration and contained in 
-	 * the specified project or throw a <code>CoreException</code> whose message explains why 
-	 * this couldn't be done.
-	 */
-	public static IType getMainType(ILaunchConfiguration configuration, IJavaProject javaProject) throws CoreException {
-		String mainTypeName = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-		return getMainType(mainTypeName, javaProject);
-	}
-	
-	/**
-	 * Return the <code>IType</code> referenced by the specified name and contained in 
-	 * the specified project or throw a <code>CoreException</code> whose message explains why 
-	 * this couldn't be done.
-	 */
-	public static IType getMainType(String mainTypeName, IJavaProject javaProject) throws CoreException {
-		if ((mainTypeName == null) || (mainTypeName.trim().length() < 1)) {
-			abort(LaunchingMessages.JavaLaunchConfigurationUtils_Main_type_not_specified_3, null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); 
-		}
-		IType mainType = null;
-		try {
-			mainType = findType(javaProject, mainTypeName);
-		} catch (JavaModelException jme) {
-		}
-		if (mainType == null) {
-			abort(LaunchingMessages.JavaLaunchConfigurationUtils_Main_type_does_not_exist_4, null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); 
-		}
-		return mainType;
-	}	
-	
-	/**
-	 * Find the specified (fully-qualified) type name in the specified java project.
-	 */
-	public static IType findType(IJavaProject javaProject, String mainTypeName) throws JavaModelException {
-		String pathStr= mainTypeName.replace('.', '/') + ".java"; //$NON-NLS-1$
-		IJavaElement javaElement= javaProject.findElement(new Path(pathStr));
-		if (javaElement == null) {
-			return null;
-		} else if (javaElement instanceof IType) {
-			return (IType)javaElement;
-		} else if (javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
-			String simpleName= Signature.getSimpleName(mainTypeName);
-			return ((ICompilationUnit) javaElement).getType(simpleName);
-		} else if (javaElement.getElementType() == IJavaElement.CLASS_FILE) {
-			return ((IClassFile) javaElement).getType();
-		}
-		return null; 
-	}
-		
-	/**
-	 * Throws a core exception with the given message and optional
-	 * exception. The exception's status code will indicate an error.
-	 * 
-	 * @param message error message
-	 * @param exception cause of the error, or <code>null</code>
-	 * @exception CoreException with the given message and underlying
-	 *  exception
-	 */
-	protected static void abort(String message, Throwable exception, int code) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(),
-		  code, message, exception));
-	}
-
-	/**
-	 * Serializes a XML document into a string - encoded in UTF8 format,
-	 * with platform line separators.
-	 * 
-	 * @param doc document to serialize
-	 * @return the document as a string
-	 */
-	public static String serializeDocument(Document doc) throws IOException, TransformerException {
-		ByteArrayOutputStream s= new ByteArrayOutputStream();
-		
-		TransformerFactory factory= TransformerFactory.newInstance();
-		Transformer transformer= factory.newTransformer();
-		transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-		transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-		
-		DOMSource source= new DOMSource(doc);
-		StreamResult outputTarget= new StreamResult(s);
-		transformer.transform(source, outputTarget);
-		
-		return s.toString("UTF8"); //$NON-NLS-1$			
-	}	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java
deleted file mode 100644
index 48e0527..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaProjectSourceContainerTypeDelegate.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Java project source container type.
- */
-public class JavaProjectSourceContainerTypeDelegate extends AbstractSourceContainerTypeDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element)node;
-			if ("javaProject".equals(element.getNodeName())) { //$NON-NLS-1$
-				String string = element.getAttribute("name"); //$NON-NLS-1$
-				if (string == null || string.length() == 0) {
-					abort(LaunchingMessages.JavaProjectSourceContainerTypeDelegate_5, null); 
-				}
-				IWorkspace workspace = ResourcesPlugin.getWorkspace();
-				IProject project = workspace.getRoot().getProject(string);
-				IJavaProject javaProject = JavaCore.create(project);
-				return new JavaProjectSourceContainer(javaProject);
-			}
-			abort(LaunchingMessages.JavaProjectSourceContainerTypeDelegate_6, null); 
-		}
-		abort(LaunchingMessages.JavaProjectSourceContainerTypeDelegate_7, null); 
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
-	public String getMemento(ISourceContainer container) throws CoreException {
-		JavaProjectSourceContainer project = (JavaProjectSourceContainer) container;
-		Document document = newDocument();
-		Element element = document.createElement("javaProject"); //$NON-NLS-1$
-		element.setAttribute("name", project.getName()); //$NON-NLS-1$
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
deleted file mode 100644
index 1684d76..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMConnector;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Launch configuration delegate for a remote Java application.
- */
-public class JavaRemoteApplicationLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-
-		monitor.beginTask(MessageFormat.format(LaunchingMessages.JavaRemoteApplicationLaunchConfigurationDelegate_Attaching_to__0_____1, new String[]{configuration.getName()}), 3); 
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}						
-					
-		monitor.subTask(LaunchingMessages.JavaRemoteApplicationLaunchConfigurationDelegate_Verifying_launch_attributes____1); 
-						
-		String connectorId = getVMConnectorId(configuration);
-		IVMConnector connector = null;
-		if (connectorId == null) {
-			connector = JavaRuntime.getDefaultVMConnector();
-		} else {
-			connector = JavaRuntime.getVMConnector(connectorId);
-		}
-		if (connector == null) {
-			abort(LaunchingMessages.JavaRemoteApplicationLaunchConfigurationDelegate_Connector_not_specified_2, null, IJavaLaunchConfigurationConstants.ERR_CONNECTOR_NOT_AVAILABLE); 
-		}
-		
-		Map argMap = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, (Map)null);
-        
-        int connectTimeout = JavaRuntime.getPreferences().getInt(JavaRuntime.PREF_CONNECT_TIMEOUT);
-        argMap.put("timeout", ""+connectTimeout);  //$NON-NLS-1$//$NON-NLS-2$
-
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		monitor.worked(1);
-		
-		monitor.subTask(LaunchingMessages.JavaRemoteApplicationLaunchConfigurationDelegate_Creating_source_locator____2); 
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-		monitor.worked(1);		
-		
-		// connect to remote VM
-		connector.connect(argMap, monitor, launch);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			IDebugTarget[] debugTargets = launch.getDebugTargets();
-            for (int i = 0; i < debugTargets.length; i++) {
-                IDebugTarget target = debugTargets[i];
-                if (target.canDisconnect()) {
-                    target.disconnect();
-                }
-            }
-            return;
-		}
-		
-		monitor.done();
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java
deleted file mode 100644
index 6d2d6f8..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupDirector.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.WorkspaceSourceContainer;
-import org.eclipse.jdt.launching.sourcelookup.containers.*;
-
-/**
- * Java source lookup director.
- * 
- * @since 3.0
- */
-public class JavaSourceLookupDirector extends AbstractSourceLookupDirector {
-	
-	private static Set fFilteredTypes;
-	
-	static {
-		fFilteredTypes = new HashSet();
-		fFilteredTypes.add(ProjectSourceContainer.TYPE_ID);
-		fFilteredTypes.add(WorkspaceSourceContainer.TYPE_ID);
-		// can't reference UI constant
-		fFilteredTypes.add("org.eclipse.debug.ui.containerType.workingSet"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector#initializeParticipants()
-	 */
-	public void initializeParticipants() {
-		addParticipants(new ISourceLookupParticipant[] {new JavaSourceLookupParticipant()});
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector#supportsSourceContainerType(org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType)
-	 */
-	public boolean supportsSourceContainerType(ISourceContainerType type) {
-		return !fFilteredTypes.contains(type.getId());
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java
deleted file mode 100644
index f87e044..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaSourceLookupUtil.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ExternalArchiveSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer;
-import org.eclipse.jdt.launching.sourcelookup.containers.PackageFragmentRootSourceContainer;
-
-/**
- * Private source lookup utils. Translates runtime classpath entries
- * to source containers.
- * 
- * @since 3.0
- */
-public class JavaSourceLookupUtil {
-
-	/**
-	 * Translates the given runtime classpath entries into associated source
-	 * containers.
-	 * 
-	 * @param entries entries to translate
-	 * @return source containers corresponding to the given runtime classpath entries
-	 */
-	public static ISourceContainer[] translate(IRuntimeClasspathEntry[] entries) {
-		List containers = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			switch (entry.getType()) {
-				case IRuntimeClasspathEntry.ARCHIVE:
-					IPackageFragmentRoot root = getPackageFragmentRoot(entry);
-					if (root == null) {
-						String path = entry.getSourceAttachmentLocation();
-						ISourceContainer container = null;
-						if (path == null) {
-							// use the archive itself
-							path = entry.getLocation();
-						}
-						if (path != null) {
-							// check if file or folder
-							File file = new File(path);
-							if (file.isDirectory()) {
-								IResource resource = entry.getResource();
-								if (resource instanceof IContainer) {
-									container = new FolderSourceContainer((IContainer)resource, false);
-								} else {
-									container = new DirectorySourceContainer(file, false);
-								}
-							} else {
-								container = new ExternalArchiveSourceContainer(path, true);
-							}
-							if (container != null && !containers.contains(container)) {
-								containers.add(container);
-							}
-						}
-					} else {
-						ISourceContainer container = new PackageFragmentRootSourceContainer(root);
-						if (!containers.contains(container)) {
-							containers.add(container);
-						}
-					}
-					break;
-				case IRuntimeClasspathEntry.PROJECT:
-					IResource resource = entry.getResource();
-					if (resource != null && resource.getType() == IResource.PROJECT) {
-						IJavaProject javaProject = JavaCore.create((IProject)resource);
-						ISourceContainer container = null;
-						if (javaProject.exists()) {
-							container = new JavaProjectSourceContainer(javaProject);
-						} else if (resource.exists()) {
-							container = new ProjectSourceContainer((IProject)resource, false);
-						}
-						if (container != null && !containers.contains(container)) {
-							containers.add(container);
-						}
-					}
-					break;
-				default:
-					// no other classpath types are valid in a resolved path
-					break;
-			}
-		}
-		return (ISourceContainer[]) containers.toArray(new ISourceContainer[containers.size()]);
-	}
-	
-	/**
-	 * Returns whether the source attachments of the given package fragment
-	 * root and runtime classpath entry are equal.
-	 * <p>
-	 * NOTE: If the runtime classpath entry's source attachment is not specified,
-	 * then it is considered equal. This way, the corresponding package fragment
-	 * root is used for source lookup if it has a source attachment or not.
-	 * </p>
-	 * 
-	 * @param root package fragment root
-	 * @param entry runtime classpath entry
-	 * @return whether the source attachments of the given package fragment
-	 * root and runtime classpath entry are equal
-	 * @throws JavaModelException 
-	 */
-	private static boolean isSourceAttachmentEqual(IPackageFragmentRoot root, IRuntimeClasspathEntry entry) throws JavaModelException {
-		IPath entryPath = entry.getSourceAttachmentPath();
-		if (entryPath == null) {
-			return true;
-		}
-		IPath rootPath = root.getSourceAttachmentPath();
-		if (rootPath == null) {
-			// entry has a source attachment that the pkg root does not
-			return false;
-		}
-		return rootPath.equals(entryPath);
-		
-	}
-	
-	/**
-	 * Determines if the given archive runtime classpath entry exists
-	 * in the workspace as a package fragment root. Returns the associated
-	 * package fragment root or <code>null</code> if none.
-	 *  
-	 * @param entry archive runtime classpath entry
-	 * @return package fragment root or <code>null</code>
-	 */
-	private static IPackageFragmentRoot getPackageFragmentRoot(IRuntimeClasspathEntry entry) {
-		IResource resource = entry.getResource();
-		if (resource == null) { 
-			// Check all package fragment roots for case of external archive.
-			// External jars are shared, so it does not matter which project it
-			// originates from
-			IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-			try {
-				IJavaProject[] jps = model.getJavaProjects();
-				for (int i = 0; i < jps.length; i++) {
-					IJavaProject jp = jps[i];
-					IProject p =  jp.getProject();
-					if (p.isOpen()) {
-						IPackageFragmentRoot[] allRoots = jp.getPackageFragmentRoots();
-						for (int j = 0; j < allRoots.length; j++) {
-							IPackageFragmentRoot root = allRoots[j];
-							if (root.isExternal() && root.getPath().equals(new Path(entry.getLocation()))) {
-								if (isSourceAttachmentEqual(root, entry)) {
-									// use package fragment root
-									return root;
-								}							
-							}
-						}
-					}
-				}
-			} catch (JavaModelException e) {
-				LaunchingPlugin.log(e);
-			}
-		} else {
-			// check if the archive is a package fragment root
-			IProject project = resource.getProject();
-			IJavaProject jp = JavaCore.create(project);
-			try {
-				if (project.isOpen() && jp.exists()) {
-					IPackageFragmentRoot root = jp.getPackageFragmentRoot(resource);
-					IPackageFragmentRoot[] allRoots = jp.getPackageFragmentRoots();
-					for (int j = 0; j < allRoots.length; j++) {
-						if (allRoots[j].equals(root)) {
-							// ensure source attachment paths match
-							if (isSourceAttachmentEqual(root, entry)) {
-								// use package fragment root
-								return root;
-							}
-						}
-					}
-
-				}
-				// check all other java projects to see if another project references
-				// the archive
-				IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-				IJavaProject[] jps = model.getJavaProjects();
-				for (int i = 0; i < jps.length; i++) {
-					IJavaProject jp1 = jps[i];
-					IProject p = jp1.getProject();
-					if (p.isOpen()) {
-						IPackageFragmentRoot[] allRoots = jp1.getPackageFragmentRoots();
-						for (int j = 0; j < allRoots.length; j++) {
-							IPackageFragmentRoot root = allRoots[j];
-							if (!root.isExternal() && root.getPath().equals(entry.getPath())) {
-								if (isSourceAttachmentEqual(root, entry)) {
-									// use package fragment root
-									return root;
-								}							
-							}
-						}
-					}
-				}
-			} catch (JavaModelException e) {
-				LaunchingPlugin.log(e);
-			}		
-		}		
-		return null;
-	}	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.java
deleted file mode 100644
index 888e658..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.osgi.util.NLS;
-
-public class LaunchingMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.jdt.internal.launching.LaunchingMessages";//$NON-NLS-1$
-
-	public static String AbstractJavaLaunchConfigurationDelegate_Java_project_not_specified_9;
-	public static String AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_for__0__does_not_exist___1__6;
-	public static String AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_not_specified_for__0__5;
-	public static String AbstractJavaLaunchConfigurationDelegate_Main_type_not_specified_11;
-	public static String AbstractJavaLaunchConfigurationDelegate_Project_does_not_exist_or_is_not_a_Java_project_10;
-	public static String AbstractJavaLaunchConfigurationDelegate_The_specified_JRE_installation_does_not_exist_4;
-	public static String AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12;
-
-	public static String ClasspathContainerSourceContainerTypeDelegate_5;
-	public static String ClasspathContainerSourceContainerTypeDelegate_6;
-	public static String ClasspathContainerSourceContainerTypeDelegate_7;
-
-	public static String ClasspathVariableSourceContainerTypeDelegate_5;
-	public static String ClasspathVariableSourceContainerTypeDelegate_6;
-	public static String ClasspathVariableSourceContainerTypeDelegate_7;
-
-	public static String DefaultProjectClasspathEntry_3;
-	public static String DefaultProjectClasspathEntry_4;
-
-	public static String JavaLaunchConfigurationUtils_Main_type_does_not_exist_4;
-	public static String JavaLaunchConfigurationUtils_Main_type_not_specified_3;
-
-	public static String JavaLocalApplicationLaunchConfigurationDelegate_Verifying_launch_attributes____1;
-	public static String JavaLocalApplicationLaunchConfigurationDelegate_Creating_source_locator____2;
-	public static String JavaLocalApplicationLaunchConfigurationDelegate_0;
-	public static String JavaLocalApplicationLaunchConfigurationDelegate_1;
-
-	public static String JavaProjectSourceContainerTypeDelegate_5;
-	public static String JavaProjectSourceContainerTypeDelegate_6;
-	public static String JavaProjectSourceContainerTypeDelegate_7;
-
-	public static String JavaRemoteApplicationLaunchConfigurationDelegate_Connector_not_specified_2;
-	public static String JavaRemoteApplicationLaunchConfigurationDelegate_Attaching_to__0_____1;
-	public static String JavaRemoteApplicationLaunchConfigurationDelegate_Verifying_launch_attributes____1;
-	public static String JavaRemoteApplicationLaunchConfigurationDelegate_Creating_source_locator____2;
-
-	public static String JavaAppletLaunchConfigurationDelegate_Starting_Applet__0_____1;
-	public static String JavaAppletLaunchConfigurationDelegate_Verifying_launch_attributes____1;
-	public static String JavaAppletLaunchConfigurationDelegate_Creating_source_locator____2;
-
-	public static String JavaRuntime_badFormat;
-	public static String JavaRuntime_exceptionOccurred;
-	public static String JavaRuntime_exceptionsOccurred;
-	public static String JavaRuntime_Library_location_element_incorrectly_specified_3;
-	public static String JavaRuntime_VM_element_specified_with_no_id_attribute_2;
-	public static String JavaRuntime_VM_type_element_with_unknown_id_1;
-	public static String JavaRuntime_Specified_VM_install_type_does_not_exist___0__2;
-	public static String JavaRuntime_VM_not_fully_specified_in_launch_configuration__0____missing_VM_name__Reverting_to_default_VM__1;
-	public static String JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2;
-	public static String JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1;
-	public static String JavaRuntime_Could_not_resolve_classpath_container___0__1;
-	public static String JavaRuntime_Classpath_references_non_existant_project___0__3;
-	public static String JavaRuntime_Classpath_references_non_existant_archive___0__4;
-	public static String JavaRuntime_26;
-	public static String JavaRuntime_27;
-	public static String JavaRuntime_28;
-	public static String JavaRuntime_31;
-	public static String JavaRuntime_32;
-	public static String JavaRuntime_0;
-
-	public static String LaunchingPlugin_Exception_occurred_reading_vmConnectors_extensions_1;
-	public static String LaunchingPlugin_32;
-	public static String LaunchingPlugin_33;
-	public static String LaunchingPlugin_34;
-	public static String LaunchingPlugin_0;
-	public static String LaunchingPlugin_1;
-
-	public static String libraryLocation_assert_libraryNotNull;
-
-	public static String SocketAttachConnector_Failed_to_connect_to_remote_VM_1;
-	public static String SocketAttachConnector_Socket_attaching_connector_not_available_3;
-	public static String SocketAttachConnector_Standard__Socket_Attach__4;
-	public static String SocketAttachConnector_Failed_to_connect_to_remote_VM_because_of_unknown_host____0___1;
-	public static String SocketAttachConnector_Failed_to_connect_to_remote_VM_as_connection_was_refused_2;
-	public static String SocketAttachConnector_Connecting____1;
-	public static String SocketAttachConnector_Configuring_connection____1;
-	public static String SocketAttachConnector_Establishing_connection____2;
-
-	public static String StandardVMDebugger_Could_not_find_a_free_socket_for_the_debugger_1;
-	public static String StandardVMDebugger_Couldn__t_connect_to_VM_4;
-	public static String StandardVMDebugger_Couldn__t_connect_to_VM_5;
-	public static String StandardVMDebugger_Couldn__t_find_an_appropriate_debug_connector_2;
-	public static String StandardVMDebugger_Launching_VM____1;
-	public static String StandardVMDebugger_Finding_free_socket____2;
-	public static String StandardVMDebugger_Constructing_command_line____3;
-	public static String StandardVMDebugger_Starting_virtual_machine____4;
-	public static String StandardVMDebugger_Establishing_debug_connection____5;
-
-	public static String StandardVMRunner__0____1___2;
-	public static String StandardVMRunner__0__at_localhost__1__1;
-	public static String StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3;
-	public static String StandardVMRunner_Launching_VM____1;
-	public static String StandardVMRunner_Constructing_command_line____2;
-	public static String StandardVMRunner_Starting_virtual_machine____3;
-	public static String StandardVMRunner_Unable_to_locate_executable_for__0__1;
-	public static String StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4;
-
-	public static String StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1;
-	public static String StandardVMType_ok_2;
-	public static String StandardVMType_Standard_VM_3;
-	public static String StandardVMType_Not_a_JDK_root__System_library_was_not_found__1;
-	public static String StandardVMType_Standard_VM_not_supported_on_MacOS__1;
-
-	public static String vmInstall_assert_idNotNull;
-	public static String vmInstall_assert_typeNotNull;
-
-	public static String vmInstallType_duplicateVM;
-
-	public static String vmRunnerConfig_assert_classNotNull;
-	public static String vmRunnerConfig_assert_classPathNotNull;
-	public static String vmRunnerConfig_assert_programArgsNotNull;
-	public static String vmRunnerConfig_assert_vmArgsNotNull;
-
-	public static String RuntimeClasspathEntry_An_exception_occurred_generating_runtime_classpath_memento_8;
-	public static String RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry_type_2;
-	public static String RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry_location_3;
-	public static String RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_project_name_4;
-	public static String RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_archive_path_5;
-	public static String RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_variable_name_6;
-	public static String RuntimeClasspathEntry_Illegal_classpath_entry__0__1;
-
-	public static String JREContainer_JRE_System_Library_1;
-
-	public static String SocketAttachConnector_Port_unspecified_for_remote_connection__2;
-	public static String SocketAttachConnector_Hostname_unspecified_for_remote_connection__4;
-
-	public static String JREContainerInitializer_JRE_referenced_by_classpath_container__0__does_not_exist__1;
-	public static String JREContainerInitializer_Classpath_entry__0__does_not_refer_to_an_existing_library__2;
-	public static String JREContainerInitializer_Classpath_entry__0__does_not_refer_to_a_library__3;
-	public static String JREContainerInitializer_Default_System_Library_1;
-
-	public static String ArchiveSourceLocation_Unable_to_create_memento_for_archive_source_location__0__1;
-	public static String ArchiveSourceLocation_Unable_to_initialize_source_location___missing_archive_path__3;
-	public static String ArchiveSourceLocation_Exception_occurred_initializing_source_location__5;
-	public static String ArchiveSourceLocation_Unable_to_locate_source_element_in_archive__0__1;
-	public static String ArchiveSourceLocation_Exception_occurred_while_detecting_root_source_directory_in_archive__0__1;
-	public static String ArchiveSourceLocation_Exception_occurred_while_detecting_root_source_directory_in_archive__0__2;
-
-	public static String DirectorySourceLocation_Unable_to_create_memento_for_directory_source_location__0__1;
-	public static String DirectorySourceLocation_Unable_to_initialize_source_location___missing_directory_path_3;
-	public static String DirectorySourceLocation_Unable_to_initialize_source_location___directory_does_not_exist___0__4;
-	public static String DirectorySourceLocation_Exception_occurred_initializing_source_location__5;
-
-	public static String JavaProjectSourceLocation_Unable_to_create_memento_for_Java_project_source_location__0__1;
-	public static String JavaProjectSourceLocation_Unable_to_initialize_source_location___missing_project_name_3;
-	public static String JavaProjectSourceLocation_Exception_occurred_initializing_source_location__4;
-
-	public static String JavaSourceLocator_Illegal_to_have_a_container_resolved_to_a_container_1;
-	public static String JavaSourceLocator_Unable_to_create_memento_for_Java_source_locator__4;
-	public static String JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__6;
-	public static String JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__10;
-	public static String JavaSourceLocator_Unable_to_restore_source_location___class_not_found___0__11;
-	public static String JavaSourceLocator_Unable_to_restore_source_location__12;
-	public static String JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__14;
-	public static String JavaSourceLocator_Exception_occurred_initializing_source_locator__15;
-
-	public static String Standard11xVMType_Standard_1_1_x_VM_1;
-
-	public static String PackageFragmentRootSourceLocation_Unable_to_create_memento_for_package_fragment_root_source_location__0__5;
-	public static String PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___missing_handle_identifier_for_package_fragment_root__6;
-	public static String PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___package_fragment_root_does_not_exist__7;
-	public static String PackageFragmentRootSourceLocation_Exception_occurred_initializing_source_location__8;
-	public static String JavaAppletLaunchConfigurationDelegate_No_launch_configuration_specified_1;
-	public static String JavaAppletLaunchConfigurationDelegate_Could_not_build_HTML_file_for_applet_launch_1;
-	public static String AbstractVMRunner_0;
-	public static String AbstractJavaLaunchConfigurationDelegate_20;
-
-	public static String PackageFragmentRootSourceContainerTypeDelegate_6;
-	public static String PackageFragmentRootSourceContainerTypeDelegate_7;
-	public static String PackageFragmentRootSourceContainerTypeDelegate_8;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, LaunchingMessages.class);
-	}
-
-    public static String SocketAttachConnector_0;
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.properties b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.properties
deleted file mode 100644
index 0101243..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.properties
+++ /dev/null
@@ -1,182 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AbstractJavaLaunchConfigurationDelegate_Java_project_not_specified_9=Java project not specified
-AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_for__0__does_not_exist___1__6=JRE home directory for {0} does not exist: {1}
-AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_not_specified_for__0__5=JRE home directory not specified for {0}
-AbstractJavaLaunchConfigurationDelegate_Main_type_not_specified_11=Main type not specified
-AbstractJavaLaunchConfigurationDelegate_Project_does_not_exist_or_is_not_a_Java_project_10=Project does not exist or is not a Java project
-AbstractJavaLaunchConfigurationDelegate_The_specified_JRE_installation_does_not_exist_4=The specified JRE installation does not exist
-AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12=Working directory does not exist: {0}
-
-ClasspathContainerSourceContainerTypeDelegate_5=Missing required <path> attribute in Java classpath container source container memento.
-ClasspathContainerSourceContainerTypeDelegate_6=Missing required <classpathContainer> attribute in Java classpath container source container memento.
-ClasspathContainerSourceContainerTypeDelegate_7=Invalid format for Java classpath container source container memento.
-
-ClasspathVariableSourceContainerTypeDelegate_5=Missing required <path> attribute in Java classpath variable source container memento.
-ClasspathVariableSourceContainerTypeDelegate_6=Missing required <classpathVariable> attribute in Java classpath variable source container memento.
-ClasspathVariableSourceContainerTypeDelegate_7=Invalid format for Java classpath variable source container memento.
-
-DefaultProjectClasspathEntry_3=Invalid memento - expecting name attribute
-DefaultProjectClasspathEntry_4={0} (default classpath)
-
-JavaLaunchConfigurationUtils_Main_type_does_not_exist_4=Main type does not exist
-JavaLaunchConfigurationUtils_Main_type_not_specified_3=Main type not specified
-
-JavaLocalApplicationLaunchConfigurationDelegate_Verifying_launch_attributes____1=Verifying launch attributes...
-JavaLocalApplicationLaunchConfigurationDelegate_Creating_source_locator____2=Creating source locator...
-JavaLocalApplicationLaunchConfigurationDelegate_0=JRE {0} does not support debug mode.
-JavaLocalApplicationLaunchConfigurationDelegate_1=JRE {0} does not support run mode.
-
-JavaProjectSourceContainerTypeDelegate_5=Missing required <name> attribute in Java project source container memento.
-JavaProjectSourceContainerTypeDelegate_6=Missing required <javaProject> attribute in Java project source container memento.
-JavaProjectSourceContainerTypeDelegate_7=Invalid format for Java project source container memento.
-
-JavaRemoteApplicationLaunchConfigurationDelegate_Connector_not_specified_2=Connector not specified
-JavaRemoteApplicationLaunchConfigurationDelegate_Attaching_to__0_____1=Attaching to {0}...
-JavaRemoteApplicationLaunchConfigurationDelegate_Verifying_launch_attributes____1=Verifying launch attributes...
-JavaRemoteApplicationLaunchConfigurationDelegate_Creating_source_locator____2=Creating source locator...
-
-JavaAppletLaunchConfigurationDelegate_Starting_Applet__0_____1=Starting Applet {0}...
-JavaAppletLaunchConfigurationDelegate_Verifying_launch_attributes____1=Verifying launch attributes...
-JavaAppletLaunchConfigurationDelegate_Creating_source_locator____2=Creating source locator...
-
-JavaRuntime_badFormat=Invalid format
-JavaRuntime_exceptionOccurred=Exceptions occurred
-JavaRuntime_exceptionsOccurred=Exceptions occurred while saving VMs
-JavaRuntime_Library_location_element_incorrectly_specified_3=Library location element is specified incorrectly
-JavaRuntime_VM_element_specified_with_no_id_attribute_2=id attribute missing from VM element specification
-JavaRuntime_VM_type_element_with_unknown_id_1=VM type element with unknown id
-JavaRuntime_Specified_VM_install_type_does_not_exist___0__2=Specified VM install type does not exist: {0}
-JavaRuntime_VM_not_fully_specified_in_launch_configuration__0____missing_VM_name__Reverting_to_default_VM__1=VM not fully specified in launch configuration {0} - missing VM name. Reverting to default VM.
-JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2=Specified VM install not found: type {0}, name {1}
-JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1=Launch configuration {0} references non-existing project {1}.
-JavaRuntime_Could_not_resolve_classpath_container___0__1=Could not resolve classpath container: {0}
-JavaRuntime_Classpath_references_non_existant_project___0__3=The project: {0} which is referenced by the classpath, does not exist.
-JavaRuntime_Classpath_references_non_existant_archive___0__4=The archive: {0} which is referenced by the classpath, does not exist.
-JavaRuntime_26=Referenced classpath provider does not exist: {0}
-JavaRuntime_27=Referenced source lookup provider does not exist: {0}
-JavaRuntime_28=Launch configuration {0} references closed project {1}
-JavaRuntime_31=Unable to restore classpath entry.
-JavaRuntime_32=Unable to restore classpath entry.
-JavaRuntime_0=Update JRE Preferences
-
-LaunchingPlugin_Exception_occurred_reading_vmConnectors_extensions_1=Exception occurred reading vmConnectors extensions
-LaunchingPlugin_32=Unable to create runtime classpath entry for unknown type {0}
-LaunchingPlugin_33=Unable to create XML parser.
-LaunchingPlugin_34=Unable to create XML parser.
-LaunchingPlugin_0=Updating build paths
-LaunchingPlugin_1=Update Installed JREs
-
-libraryLocation_assert_libraryNotNull=library cannot be null
-
-SocketAttachConnector_Failed_to_connect_to_remote_VM_1=Failed to connect to remote VM
-SocketAttachConnector_Socket_attaching_connector_not_available_3=Socket attaching connector not available
-SocketAttachConnector_Standard__Socket_Attach__4=Standard (Socket Attach)
-SocketAttachConnector_Failed_to_connect_to_remote_VM_because_of_unknown_host____0___1=Failed to connect to remote VM because of unknown host \"{0}"
-SocketAttachConnector_Failed_to_connect_to_remote_VM_as_connection_was_refused_2=Failed to connect to remote VM. Connection refused.
-SocketAttachConnector_Connecting____1=Connecting...
-SocketAttachConnector_0=Failed to connect to remote VM. Connection timed out.
-SocketAttachConnector_Configuring_connection____1=Configuring connection...
-SocketAttachConnector_Establishing_connection____2=Establishing connection...
-
-StandardVMDebugger_Could_not_find_a_free_socket_for_the_debugger_1=Cannot find a free socket for the debugger
-StandardVMDebugger_Couldn__t_connect_to_VM_4=Cannot connect to VM
-StandardVMDebugger_Couldn__t_connect_to_VM_5=Cannot connect to VM
-StandardVMDebugger_Couldn__t_find_an_appropriate_debug_connector_2=Cannot find an appropriate debug connector
-StandardVMDebugger_Launching_VM____1=Launching VM...
-StandardVMDebugger_Finding_free_socket____2=Finding free socket...
-StandardVMDebugger_Constructing_command_line____3=Constructing command line...
-StandardVMDebugger_Starting_virtual_machine____4=Starting virtual machine...
-StandardVMDebugger_Establishing_debug_connection____5=Establishing debug connection...
-
-StandardVMRunner__0____1___2={0} ({1})
-StandardVMRunner__0__at_localhost__1__1={0} at localhost:{1}
-StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3=Specified working directory does not exist or is not a directory: {0}
-StandardVMRunner_Launching_VM____1=Launching VM...
-StandardVMRunner_Constructing_command_line____2=Constructing command line...
-StandardVMRunner_Starting_virtual_machine____3=Starting virtual machine...
-StandardVMRunner_Unable_to_locate_executable_for__0__1=Unable to locate executable for {0}
-StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4=Specified executable {0} does not exist for {1}
-
-StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1=Target is not a JDK Root. Java executable was not found
-StandardVMType_ok_2=ok
-StandardVMType_Standard_VM_3=Standard VM
-StandardVMType_Not_a_JDK_root__System_library_was_not_found__1=Target is not a JDK root. System library was not found.
-StandardVMType_Standard_VM_not_supported_on_MacOS__1=Standard VM not supported on MacOS.
-
-vmInstall_assert_idNotNull=id cannot be null
-vmInstall_assert_typeNotNull=VM type cannot be null
-
-vmInstallType_duplicateVM=Duplicate VM: {0}
-
-vmRunnerConfig_assert_classNotNull=classToLaunch cannot be null
-vmRunnerConfig_assert_classPathNotNull=classPath cannot be null
-vmRunnerConfig_assert_programArgsNotNull=args cannot be null
-vmRunnerConfig_assert_vmArgsNotNull=args cannot be null
-
-RuntimeClasspathEntry_An_exception_occurred_generating_runtime_classpath_memento_8=An exception occurred generating runtime classpath memento
-RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry_type_2=Unable to recover runtime class path entry type
-RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry_location_3=Unable to recover runtime class path entry location
-RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_project_name_4=Unable to recover runtime class path entry - missing project name
-RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_archive_path_5=Unable to recover runtime class path entry - missing archive path
-RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_variable_name_6=Unable to recover runtime class path entry - missing variable name
-RuntimeClasspathEntry_Illegal_classpath_entry__0__1=Illegal classpath entry {0}
-
-JREContainer_JRE_System_Library_1=JRE System Library
-
-SocketAttachConnector_Port_unspecified_for_remote_connection__2=Port unspecified for remote connection.
-SocketAttachConnector_Hostname_unspecified_for_remote_connection__4=Hostname unspecified for remote connection.
-
-JREContainerInitializer_JRE_referenced_by_classpath_container__0__does_not_exist__1=JRE referenced by classpath container {0} does not exist.
-JREContainerInitializer_Classpath_entry__0__does_not_refer_to_an_existing_library__2=Classpath entry {0} does not refer to an existing library.
-JREContainerInitializer_Classpath_entry__0__does_not_refer_to_a_library__3=Classpath entry {0} does not refer to a library.
-JREContainerInitializer_Default_System_Library_1=Default System Library
-
-ArchiveSourceLocation_Unable_to_create_memento_for_archive_source_location__0__1=Unable to create memento for archive source location {0}
-ArchiveSourceLocation_Unable_to_initialize_source_location___missing_archive_path__3=Unable to initialize source location - missing archive path.
-ArchiveSourceLocation_Exception_occurred_initializing_source_location__5=Exception occurred initializing source location.
-ArchiveSourceLocation_Unable_to_locate_source_element_in_archive__0__1=Unable to locate source element in archive {0}
-ArchiveSourceLocation_Exception_occurred_while_detecting_root_source_directory_in_archive__0__1=Exception occurred while detecting root source directory in archive {0}
-ArchiveSourceLocation_Exception_occurred_while_detecting_root_source_directory_in_archive__0__2=Exception occurred while detecting root source directory in archive {0}
-
-DirectorySourceLocation_Unable_to_create_memento_for_directory_source_location__0__1=Unable to create memento for directory source location {0}
-DirectorySourceLocation_Unable_to_initialize_source_location___missing_directory_path_3=Unable to initialize source location - missing directory path
-DirectorySourceLocation_Unable_to_initialize_source_location___directory_does_not_exist___0__4=Unable to initialize source location - directory does not exist: {0}
-DirectorySourceLocation_Exception_occurred_initializing_source_location__5=Exception occurred initializing source location.
-
-JavaProjectSourceLocation_Unable_to_create_memento_for_Java_project_source_location__0__1=Unable to create memento for Java project source location {0}
-JavaProjectSourceLocation_Unable_to_initialize_source_location___missing_project_name_3=Unable to initialize source location - missing project name
-JavaProjectSourceLocation_Exception_occurred_initializing_source_location__4=Exception occurred initializing source location.
-
-JavaSourceLocator_Illegal_to_have_a_container_resolved_to_a_container_1=A container cannot resolve to another container
-JavaSourceLocator_Unable_to_create_memento_for_Java_source_locator__4=Unable to create memento for Java source locator.
-JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__6=Unable to restore Java source locator - invalid format.
-JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__10=Unable to restore Java source locator - invalid format.
-JavaSourceLocator_Unable_to_restore_source_location___class_not_found___0__11=Unable to restore source location - class not found: {0}
-JavaSourceLocator_Unable_to_restore_source_location__12=Unable to restore source location.
-JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__14=Unable to restore Java source locator - invalid format.
-JavaSourceLocator_Exception_occurred_initializing_source_locator__15=Exception occurred initializing source locator.
-
-Standard11xVMType_Standard_1_1_x_VM_1=Standard 1.1.x VM
-
-PackageFragmentRootSourceLocation_Unable_to_create_memento_for_package_fragment_root_source_location__0__5=Unable to create memento for package fragment root source location {0}
-PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___missing_handle_identifier_for_package_fragment_root__6=Unable to initialize source location - missing handle identifier for package fragment root.
-PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___package_fragment_root_does_not_exist__7=Unable to initialize source location - package fragment root does not exist.
-PackageFragmentRootSourceLocation_Exception_occurred_initializing_source_location__8=Exception occurred initializing source location.
-JavaAppletLaunchConfigurationDelegate_No_launch_configuration_specified_1=No launch configuration specified
-JavaAppletLaunchConfigurationDelegate_Could_not_build_HTML_file_for_applet_launch_1=Could not build HTML file for applet launch
-AbstractVMRunner_0=An IProcess could not be created for the launch
-AbstractJavaLaunchConfigurationDelegate_20=Building prerequisite project list
-
-PackageFragmentRootSourceContainerTypeDelegate_6=Missing required <handle> attribute
-PackageFragmentRootSourceContainerTypeDelegate_7=Unable to restore package fragment root source container
-PackageFragmentRootSourceContainerTypeDelegate_8=Missing required <packageFragmentRoot> attribute
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
deleted file mode 100644
index be58bf4..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
+++ /dev/null
@@ -1,984 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchesListener;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry2;
-import org.eclipse.jdt.launching.IVMConnector;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallChangedListener;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMStandin;
-import org.eclipse.jdt.launching.sourcelookup.ArchiveSourceLocation;
-import org.osgi.framework.BundleContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class LaunchingPlugin extends Plugin implements Preferences.IPropertyChangeListener, IVMInstallChangedListener, IResourceChangeListener, ILaunchesListener, IDebugEventSetListener {
-	
-	/**
-	 * The id of the JDT launching plug-in (value <code>"org.eclipse.jdt.launching"</code>).
-	 */	
-	public static final String ID_PLUGIN= "org.eclipse.jdt.launching"; //$NON-NLS-1$
-	
-	/**
-	 * Identifier for 'vmConnectors' extension point
-	 */
-	public static final String ID_EXTENSION_POINT_VM_CONNECTORS = "vmConnectors"; //$NON-NLS-1$
-	
-	/**
-	 * Identifier for 'runtimeClasspathEntries' extension point
-	 */
-	public static final String ID_EXTENSION_POINT_RUNTIME_CLASSPATH_ENTRIES = "runtimeClasspathEntries"; //$NON-NLS-1$	
-	
-	private static LaunchingPlugin fgLaunchingPlugin;
-	
-	private HashMap fVMConnectors = null;
-	
-	/**
-	 * Runtime classpath extensions
-	 */
-	private HashMap fClasspathEntryExtensions = null;
-
-	private String fOldVMPrefString = EMPTY_STRING;
-	
-	private boolean fIgnoreVMDefPropertyChangeEvents = false;
-		
-	private static final String EMPTY_STRING = "";    //$NON-NLS-1$
-			
-	/**
-	 * Mapping of top-level VM installation directories to library info for that
-	 * VM.
-	 */
-	private static Map fgLibraryInfoMap = null;	
-	
-	/**
-	 * Whether changes in VM preferences are being batched. When being batched
-	 * the plug-in can ignore processing and changes.
-	 */
-	private boolean fBatchingChanges = false;
-	
-	/**
-	 * Shared XML parser
-	 */
-	private static DocumentBuilder fgXMLParser = null;
-	
-	/**
-	 * Stores VM changes resulting from a JRE preference change.
-	 */
-	class VMChanges implements IVMInstallChangedListener {
-		
-		// true if the default VM changes
-		private boolean fDefaultChanged = false;
-		
-		// old container ids to new
-		private HashMap fRenamedContainerIds = new HashMap();
-		
-		/**
-		 * Returns the JRE container id that the given VM would map to, or
-		 * <code>null</code> if none.
-		 * 
-		 * @param vm
-		 * @return container id or <code>null</code>
-		 */
-		private IPath getContainerId(IVMInstall vm) {
-			if (vm != null) {
-				String name = vm.getName();
-				if (name != null) {
-					IPath path = new Path(JavaRuntime.JRE_CONTAINER);
-					path = path.append(new Path(vm.getVMInstallType().getId()));				
-					path = path.append(new Path(name));
-					return path;
-				}
-			}
-			return null;
-		}
-		
-		/**
-		 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#defaultVMInstallChanged(org.eclipse.jdt.launching.IVMInstall, org.eclipse.jdt.launching.IVMInstall)
-		 */
-		public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
-			fDefaultChanged = true;
-		}
-
-		/**
-		 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
-		 */
-		public void vmAdded(IVMInstall vm) {
-		}
-
-		/**
-		 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
-		 */
-		public void vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent event) {
-			String property = event.getProperty();
-			IVMInstall vm = (IVMInstall)event.getSource();
-			if (property.equals(IVMInstallChangedListener.PROPERTY_NAME)) {
-				IPath newId = getContainerId(vm);
-				IPath oldId = new Path(JavaRuntime.JRE_CONTAINER);
-				oldId = oldId.append(vm.getVMInstallType().getId());
-				String oldName = (String)event.getOldValue();
-				// bug 33746 - if there is no old name, then this is not a re-name.
-				if (oldName != null) {
-					oldId = oldId.append(oldName);
-					fRenamedContainerIds.put(oldId, newId);					
-				}
-			}
-		}
-
-		/**
-		 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
-		 */
-		public void vmRemoved(IVMInstall vm) {
-		}
-	
-		/**
-		 * Re-bind classpath variables and containers affected by the JRE
-		 * changes.
-		 */
-		public void process() throws CoreException {
-			JREUpdateJob job = new JREUpdateJob(this);
-			job.schedule();
-		}
-		
-		protected void doit(IProgressMonitor monitor) throws CoreException {
-			IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-				public void run(IProgressMonitor monitor1) throws CoreException {
-					IJavaProject[] projects = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()).getJavaProjects();
-					monitor1.beginTask(LaunchingMessages.LaunchingPlugin_0, projects.length + 1); 
-					rebind(monitor1, projects);
-					monitor1.done();
-				}
-			};
-			JavaCore.run(runnable, null, monitor);
-		}
-				
-		/**
-		 * Re-bind classpath variables and containers affected by the JRE
-		 * changes.
-		 * @param monitor
-		 */
-		private void rebind(IProgressMonitor monitor, IJavaProject[] projects) throws CoreException {
-			 
-			if (fDefaultChanged) {
-				// re-bind JRELIB if the default VM changed
-				JavaClasspathVariablesInitializer initializer = new JavaClasspathVariablesInitializer();
-				initializer.initialize(JavaRuntime.JRELIB_VARIABLE);
-				initializer.initialize(JavaRuntime.JRESRC_VARIABLE);
-				initializer.initialize(JavaRuntime.JRESRCROOT_VARIABLE);
-			}
-			monitor.worked(1);
-														
-			// re-bind all container entries
-			for (int i = 0; i < projects.length; i++) {
-				IJavaProject project = projects[i];
-				IClasspathEntry[] entries = project.getRawClasspath();
-				boolean replace = false;
-				for (int j = 0; j < entries.length; j++) {
-					IClasspathEntry entry = entries[j];
-					switch (entry.getEntryKind()) {
-						case IClasspathEntry.CPE_CONTAINER:
-							IPath reference = entry.getPath();
-							IPath newBinding = null;
-							String firstSegment = reference.segment(0);
-							if (JavaRuntime.JRE_CONTAINER.equals(firstSegment)) {
-								if (reference.segmentCount() > 1) {
-									IPath renamed = (IPath)fRenamedContainerIds.get(reference);
-									if (renamed != null) {
-										// The JRE was re-named. This changes the identifier of
-										// the container entry.
-										newBinding = renamed;
-									}									
-								}
-								JREContainerInitializer initializer = new JREContainerInitializer();
-								if (newBinding == null){
-									// rebind old path
-									initializer.initialize(reference, project);
-								} else {
-									// replace old cp entry with a new one
-									IClasspathEntry newEntry = JavaCore.newContainerEntry(newBinding, entry.isExported());
-									entries[j] = newEntry;
-									replace = true;
-								}
-							}
-							break;
-						default:
-							break;
-					}
-				}
-				if (replace) {
-					project.setRawClasspath(entries, null);
-				}
-				monitor.worked(1);
-			}
-
-		}
-
-	}
-	
-	class JREUpdateJob extends Job {
-		private VMChanges fChanges;
-		
-		public JREUpdateJob(VMChanges changes) {
-			super(LaunchingMessages.LaunchingPlugin_1); 
-			fChanges = changes;
-			setSystem(true);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		protected IStatus run(IProgressMonitor monitor) {
-			try {
-				fChanges.doit(monitor);
-			} catch (CoreException e) {
-				return e.getStatus();
-			}
-			return Status.OK_STATUS;
-		}
-		
-	}
-	
-	public LaunchingPlugin() {
-		super();
-		fgLaunchingPlugin= this;
-	}
-	
-	/**
-	 * Returns the library info that corresponds to the specified JRE install
-	 * path, or <code>null</code> if none.
-	 * 
-	 * @return the library info that corresponds to the specified JRE install
-	 * path, or <code>null</code> if none
-	 */
-	public static LibraryInfo getLibraryInfo(String javaInstallPath) {
-		if (fgLibraryInfoMap == null) {
-			restoreLibraryInfo(); 
-		}
-		return (LibraryInfo) fgLibraryInfoMap.get(javaInstallPath);
-	}
-	
-	/**
-	 * Sets the library info that corresponds to the specified JRE install
-	 * path.
-	 * 
-	 * @param javaInstallPath home location for a JRE
-	 * @param info the libary information, or <code>null</code> to remove
-	 */
-	public static void setLibraryInfo(String javaInstallPath, LibraryInfo info) {
-		if (fgLibraryInfoMap == null) {
-			restoreLibraryInfo(); 
-		}		
-		if (info == null) {
-			fgLibraryInfoMap.remove(javaInstallPath);
-		} else {
-			fgLibraryInfoMap.put(javaInstallPath, info);
-		}
-		saveLibraryInfo();
-	}	
-		
-	/**
-	 * Return a <code>java.io.File</code> object that corresponds to the specified
-	 * <code>IPath</code> in the plugin directory.
-	 */
-	public static File getFileInPlugin(IPath path) {
-		try {
-			URL installURL =
-				new URL(getDefault().getBundle().getEntry("/"), path.toString()); //$NON-NLS-1$
-			URL localURL = Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException ioe) {
-			return null;
-		}
-	}
-		
-	/**
-	 * Convenience method which returns the unique identifier of this plugin.
-	 */
-	public static String getUniqueIdentifier() {
-		return ID_PLUGIN;
-	}
-
-	public static LaunchingPlugin getDefault() {
-		return fgLaunchingPlugin;
-	}
-	
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	public static void log(String message) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
-	}	
-		
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), e));
-	}	
-	
-	/**
-	 * Clears zip file cache.
-	 * Shutdown the launch config helper.
-	 * 
-	 * @see Plugin#stop(BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		try {
-			DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
-			DebugPlugin.getDefault().removeDebugEventListener(this);
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-			ArchiveSourceLocation.closeArchives();
-			getPluginPreferences().removePropertyChangeListener(this);
-			JavaRuntime.removeVMInstallChangedListener(this);
-			JavaRuntime.saveVMConfiguration();
-			savePluginPreferences();
-			fgXMLParser = null;
-		} finally {
-			super.stop(context);
-		}
-	}
-		
-	/**
-	 * @see Plugin#start(BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		
-		// Exclude launch configurations from being copied to the output directory
-		String launchFilter = "*." + ILaunchConfiguration.LAUNCH_CONFIGURATION_FILE_EXTENSION; //$NON-NLS-1$
-		Hashtable optionsMap = JavaCore.getOptions();
-		String filters= (String)optionsMap.get("org.eclipse.jdt.core.builder.resourceCopyExclusionFilter"); //$NON-NLS-1$
-		boolean modified = false;
-		if (filters == null || filters.length() == 0) {
-			filters= launchFilter;
-			modified = true;
-		} else if (filters.indexOf(launchFilter) == -1) {
-			filters= filters + ',' + launchFilter; 
-			modified = true;
-		}
-
-		if (modified) {
-			optionsMap.put("org.eclipse.jdt.core.builder.resourceCopyExclusionFilter", filters);  //$NON-NLS-1$
-			JavaCore.setOptions(optionsMap);
-		}		
-
-		// set default preference values
-		getPluginPreferences().setDefault(JavaRuntime.PREF_CONNECT_TIMEOUT, JavaRuntime.DEF_CONNECT_TIMEOUT);
-		getPluginPreferences().addPropertyChangeListener(this);
-
-		JavaRuntime.addVMInstallChangedListener(this);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
-		DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
-		DebugPlugin.getDefault().addDebugEventListener(this);
-	}
-	
-	/**
-	 * Returns the VM connector with the specified id, or <code>null</code>
-	 * if none. 
-	 * 
-	 * @param id connector identifier
-	 * @return VM connector
-	 */
-	public IVMConnector getVMConnector(String id) {
-		if (fVMConnectors == null) {
-			initializeVMConnectors();
-		}
-		return (IVMConnector)fVMConnectors.get(id); 
-	}
-	
-	/**
-	 * Returns all VM connector extensions.
-	 *
-	 * @return VM connectors
-	 */
-	public IVMConnector[] getVMConnectors() {
-		if (fVMConnectors == null) {
-			initializeVMConnectors();
-		}
-		return (IVMConnector[])fVMConnectors.values().toArray(new IVMConnector[fVMConnectors.size()]); 
-	}	
-	
-	/**
-	 * Loads VM connector extensions
-	 */
-	private void initializeVMConnectors() {
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(ID_PLUGIN, ID_EXTENSION_POINT_VM_CONNECTORS);
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements(); 
-		MultiStatus status= new MultiStatus(getUniqueIdentifier(), IStatus.OK, LaunchingMessages.LaunchingPlugin_Exception_occurred_reading_vmConnectors_extensions_1, null); 
-		fVMConnectors = new HashMap(configs.length);
-		for (int i= 0; i < configs.length; i++) {
-			try {
-				IVMConnector vmConnector= (IVMConnector)configs[i].createExecutableExtension("class"); //$NON-NLS-1$
-				fVMConnectors.put(vmConnector.getIdentifier(), vmConnector);
-			} catch (CoreException e) {
-				status.add(e.getStatus());
-			}
-		}
-		if (!status.isOK()) {
-			LaunchingPlugin.log(status);
-		}			
-	}
-	
-	/**
-	 * Returns a new runtime classpath entry of the specified type.
-	 * 
-	 * @param id extension type id
-	 * @return new uninitialized runtime classpath entry
-	 * @throws CoreException if unable to create an entry
-	 */
-	public IRuntimeClasspathEntry2 newRuntimeClasspathEntry(String id) throws CoreException {
-		if (fClasspathEntryExtensions == null) {
-			initializeRuntimeClasspathExtensions();
-		}
-		IConfigurationElement config = (IConfigurationElement) fClasspathEntryExtensions.get(id);
-		if (config == null) {
-			abort(MessageFormat.format(LaunchingMessages.LaunchingPlugin_32, new String[]{id}), null); 
-		}
-		return (IRuntimeClasspathEntry2) config.createExecutableExtension("class"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Loads runtime classpath extensions
-	 */
-	private void initializeRuntimeClasspathExtensions() {
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.ID_PLUGIN, ID_EXTENSION_POINT_RUNTIME_CLASSPATH_ENTRIES);
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements(); 
-		fClasspathEntryExtensions = new HashMap(configs.length);
-		for (int i= 0; i < configs.length; i++) {
-			fClasspathEntryExtensions.put(configs[i].getAttribute("id"), configs[i]); //$NON-NLS-1$
-		}
-	}	
-	
-	/**
-	 * Save preferences whenever the connect timeout changes.
-	 * Process changes to the list of installed JREs.
-	 * 
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		String property = event.getProperty();
-		if (property.equals(JavaRuntime.PREF_CONNECT_TIMEOUT)) {
-			savePluginPreferences();
-		} else if (property.equals(JavaRuntime.PREF_VM_XML)) {
-			if (!isIgnoreVMDefPropertyChangeEvents()) {
-				processVMPrefsChanged((String)event.getOldValue(), (String)event.getNewValue());
-			}
-		}
-	}
-
-	/**
-	 * Check for differences between the old & new sets of installed JREs.  
-	 * Differences may include additions, deletions and changes.  Take
-	 * appropriate action for each type of difference.
-	 * 
-	 * When importing preferences, TWO propertyChange events are fired.  The first
-	 * has an old value but an empty new value.  The second has a new value, but an empty
-	 * old value.  Normal user changes to the preferences result in a single propertyChange
-	 * event, with both old and new values populated.  This method handles both types
-	 * of notification.
-	 */
-	protected void processVMPrefsChanged(String oldValue, String newValue) {
-		
-		// batch changes
-		fBatchingChanges = true;
-		VMChanges vmChanges = null;
-		try {
-
-			String oldPrefString;
-			String newPrefString;
-			
-			// If empty new value, save the old value and wait for 2nd propertyChange notification
-			if (newValue == null || newValue.equals(EMPTY_STRING)) {        
-				fOldVMPrefString = oldValue;
-				return;
-			}					
-			// An empty old value signals the second notification in the import preferences
-			// sequence.  Now that we have both old & new prefs, we can parse and compare them.
-			else if (oldValue == null || oldValue.equals(EMPTY_STRING)) {    	
-				oldPrefString = fOldVMPrefString;
-				newPrefString = newValue;
-			} 
-			// If both old & new values are present, this is a normal user change
-			else {
-				oldPrefString = oldValue;
-				newPrefString = newValue;
-			}
-			
-			vmChanges = new VMChanges();
-			JavaRuntime.addVMInstallChangedListener(vmChanges);
-			
-			// Generate the previous VMs
-			VMDefinitionsContainer oldResults = getVMDefinitions(oldPrefString);
-			
-			// Generate the current
-			VMDefinitionsContainer newResults = getVMDefinitions(newPrefString);
-			
-			// Determine the deteled VMs
-			List deleted = oldResults.getVMList();
-			List current = newResults.getValidVMList();
-			deleted.removeAll(current);
-			
-			// Dispose deleted VMs.  The 'disposeVMInstall' method fires notification of the 
-			// deletion.
-			Iterator deletedIterator = deleted.iterator();
-			while (deletedIterator.hasNext()) {
-				VMStandin deletedVMStandin = (VMStandin) deletedIterator.next();
-				deletedVMStandin.getVMInstallType().disposeVMInstall(deletedVMStandin.getId());			
-			}			
-			
-			// Fire change notification for added and changed VMs. The 'convertToRealVM'
-			// fires the appropriate notification.
-			Iterator iter = current.iterator();
-			while (iter.hasNext()) {
-				VMStandin standin = (VMStandin)iter.next();
-				standin.convertToRealVM();
-			}
-			
-			// set the new default VM install. This will fire a 'defaultVMChanged',
-			// if it in fact changed
-			String newDefaultId = newResults.getDefaultVMInstallCompositeID();
-			if (newDefaultId != null) {
-				IVMInstall newDefaultVM = JavaRuntime.getVMFromCompositeId(newDefaultId);
-				if (newDefaultVM != null) {
-					try {
-						JavaRuntime.setDefaultVMInstall(newDefaultVM, null, false);
-					} catch (CoreException ce) {
-						log(ce);
-					}			
-				}
-			}
-			
-		} finally {
-			// stop batch changes
-			fBatchingChanges = false;	
-			if (vmChanges != null) {
-				JavaRuntime.removeVMInstallChangedListener(vmChanges);
-				try {
-					vmChanges.process();
-				} catch (CoreException e) {
-					log(e);
-				}	
-			}
-		}
-
-	}
-	
-	/**
-	 * Parse the given xml into a VM definitions container, returning an empty
-	 * container if an exception occurs.
-	 * 
-	 * @param xml
-	 * @return VMDefinitionsContainer
-	 */
-	private VMDefinitionsContainer getVMDefinitions(String xml) {
-		byte[] bytes = xml.getBytes();
-		if (bytes.length > 0) {
-			ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-			try {
-				return VMDefinitionsContainer.parseXMLIntoContainer(stream);
-			} catch (IOException e) {
-				LaunchingPlugin.log(e);
-			}
-		}
-		return new VMDefinitionsContainer(); 
-	}
-						
-	/**
-	 * @see IVMInstallChangedListener#defaultVMInstallChanged(IVMInstall, IVMInstall)
-	 */
-	public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current) {
-		if (!fBatchingChanges) {
-			try {
-				VMChanges changes = new VMChanges();
-				changes.defaultVMInstallChanged(previous, current);
-				changes.process();
-			} catch (CoreException e) {
-				log(e);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmAdded(org.eclipse.jdt.launching.IVMInstall)
-	 */
-	public void vmAdded(IVMInstall vm) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent)
-	 */
-	public void vmChanged(org.eclipse.jdt.launching.PropertyChangeEvent event) {
-		if (!fBatchingChanges) {
-			try {
-				VMChanges changes = new VMChanges();
-				changes.vmChanged(event);
-				changes.process();
-			} catch (CoreException e) {
-				log(e);
-			}
-		}		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallChangedListener#vmRemoved(org.eclipse.jdt.launching.IVMInstall)
-	 */
-	public void vmRemoved(IVMInstall vm) {
-		if (!fBatchingChanges) {
-			try {
-				VMChanges changes = new VMChanges();
-				changes.vmRemoved(vm);
-				changes.process();
-			} catch (CoreException e) {
-				log(e);
-			}
-		}
-	}
-
-	/**
-	 * Clear the archive cache when a project is about to be deleted.
-	 * 
-	 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		ArchiveSourceLocation.closeArchives();
-	}
-
-	public void setIgnoreVMDefPropertyChangeEvents(boolean ignore) {
-		fIgnoreVMDefPropertyChangeEvents = ignore;
-	}
-
-	public boolean isIgnoreVMDefPropertyChangeEvents() {
-		return fIgnoreVMDefPropertyChangeEvents;
-	}
-
-	/**
-	 * Return the VM definitions contained in this object as a String of XML.  The String
-	 * is suitable for storing in the workbench preferences.
-	 * <p>
-	 * The resulting XML is compatible with the static method <code>parseXMLIntoContainer</code>.
-	 * </p>
-	 * @return String the results of flattening this object into XML
-	 * @throws IOException if this method fails. Reasons include:<ul>
-	 * <li>serialization of the XML document failed</li>
-	 * </ul>
-	 */
-	private static String getLibraryInfoAsXML() throws ParserConfigurationException, IOException, TransformerException{
-		
-		Document doc = getDocument();
-		Element config = doc.createElement("libraryInfos");    //$NON-NLS-1$
-		doc.appendChild(config);
-						
-		// Create a node for each info in the table
-		Iterator locations = fgLibraryInfoMap.keySet().iterator();
-		while (locations.hasNext()) {
-			String home = (String)locations.next();
-			LibraryInfo info = (LibraryInfo) fgLibraryInfoMap.get(home);
-			Element locationElemnet = infoAsElement(doc, info);
-			locationElemnet.setAttribute("home", home); //$NON-NLS-1$
-			config.appendChild(locationElemnet);
-		}
-		
-		// Serialize the Document and return the resulting String
-		return JavaLaunchConfigurationUtils.serializeDocument(doc);
-	}	
-	
-	/**
-	 * Returns a Document that can be used to build a DOM tree
-	 * @return the Document
-	 * @throws ParserConfigurationException if an exception occurs creating the document builder
-	 */
-	public static Document getDocument() throws ParserConfigurationException {
-		DocumentBuilderFactory dfactory= DocumentBuilderFactory.newInstance();
-		DocumentBuilder docBuilder= dfactory.newDocumentBuilder();
-		Document doc= docBuilder.newDocument();
-		return doc;
-	}
-
-	/**
-	 * Creates an XML element for the given info.
-	 * 
-	 * @param doc
-	 * @param info
-	 * @return Element
-	 */
-	private static Element infoAsElement(Document doc, LibraryInfo info) {
-		Element libraryElement = doc.createElement("libraryInfo"); //$NON-NLS-1$
-		libraryElement.setAttribute("version", info.getVersion()); //$NON-NLS-1$
-		appendPathElements(doc, "bootpath", libraryElement, info.getBootpath()); //$NON-NLS-1$
-		appendPathElements(doc, "extensionDirs", libraryElement, info.getExtensionDirs()); //$NON-NLS-1$
-		appendPathElements(doc, "endorsedDirs", libraryElement, info.getEndorsedDirs()); //$NON-NLS-1$
-		return libraryElement;
-	}
-	
-	/**
-	 * Appends path elements to the given library element, rooted by an
-	 * element of the given type.
-	 * 
-	 * @param doc
-	 * @param elementType
-	 * @param libraryElement
-	 * @param paths
-	 */
-	private static void appendPathElements(Document doc, String elementType, Element libraryElement, String[] paths) {
-		if (paths.length > 0) {
-			Element child = doc.createElement(elementType);
-			libraryElement.appendChild(child);
-			for (int i = 0; i < paths.length; i++) {
-				String path = paths[i];
-				Element entry = doc.createElement("entry"); //$NON-NLS-1$
-				child.appendChild(entry);
-				entry.setAttribute("path", path); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	/**
-	 * Saves the library info in a local workspace state location 
-	 */
-	private static void saveLibraryInfo() {
-		FileOutputStream stream= null;
-		try {
-			String xml = getLibraryInfoAsXML();
-			IPath libPath = getDefault().getStateLocation();
-			libPath = libPath.append("libraryInfos.xml"); //$NON-NLS-1$
-			File file = libPath.toFile();
-			if (!file.exists()) {
-				file.createNewFile();
-			}
-			stream = new FileOutputStream(file);
-			stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$
-		} catch (IOException e) {
-			log(e);
-		} catch (ParserConfigurationException e) {
-			log(e);
-		} catch (TransformerException e) {
-			log(e);
-		} finally {
-			if (stream != null) {
-				try {
-					stream.close();
-				} catch (IOException e1) {
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Restores library information for VMs
-	 */
-	private static void restoreLibraryInfo() {
-		fgLibraryInfoMap = new HashMap(10);
-		IPath libPath = getDefault().getStateLocation();
-		libPath = libPath.append("libraryInfos.xml"); //$NON-NLS-1$
-		File file = libPath.toFile();
-		if (file.exists()) {
-			try {
-				InputStream stream = new FileInputStream(file);
-				DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-				parser.setErrorHandler(new DefaultHandler());
-				Element root = parser.parse(new InputSource(stream)).getDocumentElement();
-				if(!root.getNodeName().equals("libraryInfos")) { //$NON-NLS-1$
-					return;
-				}
-				
-				NodeList list = root.getChildNodes();
-				int length = list.getLength();
-				for (int i = 0; i < length; ++i) {
-					Node node = list.item(i);
-					short type = node.getNodeType();
-					if (type == Node.ELEMENT_NODE) {
-						Element element = (Element) node;
-						String nodeName = element.getNodeName();
-						if (nodeName.equalsIgnoreCase("libraryInfo")) { //$NON-NLS-1$
-							String version = element.getAttribute("version"); //$NON-NLS-1$
-							String location = element.getAttribute("home"); //$NON-NLS-1$
-							String[] bootpath = getPathsFromXML(element, "bootpath"); //$NON-NLS-1$
-							String[] extDirs = getPathsFromXML(element, "extensionDirs"); //$NON-NLS-1$
-							String[] endDirs = getPathsFromXML(element, "endorsedDirs"); //$NON-NLS-1$
-							if (location != null) {
-								LibraryInfo info = new LibraryInfo(version, bootpath, extDirs, endDirs);
-								fgLibraryInfoMap.put(location, info);										
-							}
-						}
-					}
-				}				
-			} catch (IOException e) {
-				log(e);
-			} catch (ParserConfigurationException e) {
-				log(e);
-			} catch (SAXException e) {
-				log(e);
-			}
-		}
-	}
-	
-	private static String[] getPathsFromXML(Element lib, String pathType) {
-		List paths = new ArrayList();
-		NodeList list = lib.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element element = (Element) node;
-				String nodeName = element.getNodeName();
-				if (nodeName.equalsIgnoreCase(pathType)) {
-					NodeList entries = element.getChildNodes();
-					int numEntries = entries.getLength();
-					for (int j = 0; j < numEntries; j++) {
-						Node n = entries.item(j);
-						short t = n.getNodeType();
-						if (t == Node.ELEMENT_NODE) {
-							Element entryElement = (Element)n;
-							String name = entryElement.getNodeName();
-							if (name.equals("entry")) { //$NON-NLS-1$
-								String path = entryElement.getAttribute("path"); //$NON-NLS-1$
-								if (path != null && path.length() > 0) {
-									paths.add(path);
-								}
-							}
-						}
-					}
-				}
-			}
-		}			
-		return (String[])paths.toArray(new String[paths.size()]);		
-	}
-	
-	/**
-	 * When a launch is removed, close all source archives. Prevents file
-	 * sharing violations.
-	 * 
-	 * @see ILaunchesListener#launchesRemoved(ILaunch[])
-	 */
-	public void launchesRemoved(ILaunch[] launches) {
-		ArchiveSourceLocation.closeArchives();
-	}
-	
-	/**
-	 * @see ILaunchesListener#launchesAdded(ILaunch[])
-	 */
-	public void launchesAdded(ILaunch[] launches) {
-	}
-	
-	/**
-	 * @see ILaunchesListener#launchesChanged(ILaunch[])
-	 */
-	public void launchesChanged(ILaunch[] launches) {
-	}
-	
-	/**
-	 * When a debug target or process terminates, close source arhives.
-	 * Prevents file sharing violations.
-	 * 
-	 * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-	 */
-	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			DebugEvent event = events[i];
-			if (event.getKind() == DebugEvent.TERMINATE) {
-				Object source = event.getSource();
-				if (source instanceof IDebugTarget || source instanceof IProcess) {
-					ArchiveSourceLocation.closeArchives();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Returns a shared XML parser.
-	 * 
-	 * @return an XML parser 
-	 * @throws CoreException if unable to create a parser
-	 * @since 3.0
-	 */
-	public static DocumentBuilder getParser() throws CoreException {
-		if (fgXMLParser == null) {
-			try {
-				fgXMLParser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-				fgXMLParser.setErrorHandler(new DefaultHandler());
-			} catch (ParserConfigurationException e) {
-				abort(LaunchingMessages.LaunchingPlugin_33, e); 
-			} catch (FactoryConfigurationError e) {
-				abort(LaunchingMessages.LaunchingPlugin_34, e); 
-			}
-		}
-		return fgXMLParser;
-	}	
-	
-	/**
-	 * Throws an exception with the given message and underlying exception.
-	 * 
-	 * @param message error message
-	 * @param exception underlying exception or <code>null</code> if none
-	 * @throws CoreException
-	 */
-	protected static void abort(String message, Throwable exception) throws CoreException {
-		IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, message, exception);
-		throw new CoreException(status);
-	}	
-}
-
- 
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java
deleted file mode 100644
index d9774cf..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LibraryInfo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-/**
- * Stores the boot path and extension directories associated with a VM.
- */
-public class LibraryInfo {
-
-	private String fVersion;
-	private String[] fBootpath;
-	private String[] fExtensionDirs;
-	private String[] fEndorsedDirs;
-	
-	public LibraryInfo(String version, String[] bootpath, String[] extDirs, String[] endDirs) {
-		fVersion = version;
-		fBootpath = bootpath;
-		fExtensionDirs = extDirs;
-		fEndorsedDirs = endDirs;
-	}
-	
-	/**
-	 * Returns the version of this VM install.
-	 * 
-	 * @return version
-	 */
-	public String getVersion() {
-		return fVersion; 
-	}
-	
-	/**
-	 * Returns a collection of extension directory paths for this VM install.
-	 * 
-	 * @return a collection of absolute paths
-	 */
-	public String[] getExtensionDirs() {
-		return fExtensionDirs;
-	}
-	
-	/**
-	 * Returns a collection of bootpath entries for this VM install.
-	 * 
-	 * @return a collection of absolute paths
-	 */
-	public String[] getBootpath() {
-		return fBootpath;
-	}
-	
-	/**
-	 * Returns a collection of endorsed directory paths for this VM install.
-	 * 
-	 * @return a collection of absolute paths
-	 */
-	public String[] getEndorsedDirs() {
-		return fEndorsedDirs;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ListenerList.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ListenerList.java
deleted file mode 100644
index 0d83d49..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ListenerList.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-/**
- * Local version of org.eclipse.jface.util.ListenerList (modified)s
- */
-public class ListenerList {
-	/**
-	 * The current number of listeners.
-	 * Maintains invariant: 0 <= fSize <= listeners.length.
-	 */
-	private int fSize;
-
-	/**
-	 * The list of listeners.  Initially <code>null</code> but initialized
-	 * to an array of size capacity the first time a listener is added.
-	 * Maintains invariant: listeners != null if and only if fSize != 0
-	 */
-	private Object[] fListeners= null;
-
-	/**
-	 * The empty array singleton instance, returned by getListeners()
-	 * when size == 0.
-	 */
-	private static final Object[] EmptyArray= new Object[0];
-
-	/**
-	 * Creates a listener list with the given initial capacity.
-	 *
-	 * @param capacity the number of listeners which this list can initially accept 
-	 *    without growing its internal representation; must be at least 1
-	 */
-	public ListenerList(int capacity) {
-		if (capacity < 1) {
-			throw new IllegalArgumentException();
-		}
-		fListeners= new Object[capacity];
-		fSize= 0;
-	}
-
-	/**
-	 * Adds a listener to the list.
-	 * Has no effect if an identical listener is already registered.
-	 *
-	 * @param listener a listener
-	 */
-	public synchronized void add(Object listener) {
-		if (listener == null) {
-			throw new IllegalArgumentException();
-		}
-		// check for duplicates using identity
-		for (int i= 0; i < fSize; ++i) {
-			if (fListeners[i] == listener) {
-				return;
-			}
-		}
-		// grow array if necessary
-		if (fSize == fListeners.length) {
-			Object[] temp= new Object[(fSize * 2) + 1];
-			System.arraycopy(fListeners, 0, temp, 0, fSize);
-			fListeners= temp;
-		}
-		fListeners[fSize++]= listener;
-	}
-
-	/**
-	 * Returns an array containing all the registered listeners.
-	 * The resulting array is unaffected by subsequent adds or removes.
-	 * If there are no listeners registered, the result is an empty array
-	 * singleton instance (no garbage is created).
-	 * Use this method when notifying listeners, so that any modifications
-	 * to the listener list during the notification will have no effect on the
-	 * notification itself.
-	 */
-	public synchronized Object[] getListeners() {
-		if (fSize == 0) {
-			return EmptyArray;
-		}
-		Object[] result= new Object[fSize];
-		System.arraycopy(fListeners, 0, result, 0, fSize);
-		return result;
-	}
-
-	/**
-	 * Removes a listener from the list.
-	 * Has no effect if an identical listener was not already registered.
-	 *
-	 * @param listener a listener
-	 */
-	public synchronized void remove(Object listener) {
-		if (listener == null) {
-			throw new IllegalArgumentException();
-		}
-
-		for (int i= 0; i < fSize; ++i) {
-			if (fListeners[i] == listener) {
-				if (--fSize == 0) {
-					fListeners= new Object[1];
-				} else {
-					if (i < fSize) {
-						fListeners[i]= fListeners[fSize];
-					}
-					fListeners[fSize]= null;
-				}
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Removes all the listeners from the list.
-	 */
-	public void removeAll() {
-		fListeners= new Object[0];
-		fSize= 0;
-	}
-
-	/**
-	 * Returns the number of registered listeners
-	 *
-	 * @return the number of registered listeners
-	 */
-	public int size() {
-		return fSize;
-	}
-}
-
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java
deleted file mode 100644
index 74c0e9b..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/PackageFragmentRootSourceContainerTypeDelegate.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.sourcelookup.containers.PackageFragmentRootSourceContainer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Package fragment root source container type.
- * 
- * @since 3.0
- */
-public class PackageFragmentRootSourceContainerTypeDelegate extends AbstractSourceContainerTypeDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element)node;
-			if ("packageFragmentRoot".equals(element.getNodeName())) { //$NON-NLS-1$
-				String string = element.getAttribute("handle"); //$NON-NLS-1$
-				if (string == null || string.length() == 0) {
-					abort(LaunchingMessages.PackageFragmentRootSourceContainerTypeDelegate_6, null); 
-				}
-				IJavaElement root = JavaCore.create(string);
-				if (root != null && root instanceof IPackageFragmentRoot) {
-					return new PackageFragmentRootSourceContainer((IPackageFragmentRoot)root);
-				}
-				abort(LaunchingMessages.PackageFragmentRootSourceContainerTypeDelegate_7, null); 
-			} else {
-				abort(LaunchingMessages.PackageFragmentRootSourceContainerTypeDelegate_8, null); 
-			}
-		}
-		abort(LaunchingMessages.JavaProjectSourceContainerTypeDelegate_7, null); 
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
-	public String getMemento(ISourceContainer container) throws CoreException {
-		PackageFragmentRootSourceContainer root = (PackageFragmentRootSourceContainer) container;
-		Document document = newDocument();
-		Element element = document.createElement("packageFragmentRoot"); //$NON-NLS-1$
-		element.setAttribute("handle", root.getPackageFragmentRoot().getHandleIdentifier()); //$NON-NLS-1$
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
deleted file mode 100644
index 20b72eb..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     BEA - Daniel R Somerfield - Bug 88939
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.IOException;
-import java.text.MessageFormat;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * An entry on the runtime classpath that the user can manipulate
- * and share in a launch configuration.
- * 
- * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry
- * @since 2.0
- */
-public class RuntimeClasspathEntry implements IRuntimeClasspathEntry {
-
-	/**
-	 * This entry's type - must be set on creation.
-	 */
-	private int fType = -1;
-	
-	/**
-	 * This entry's classpath property.
-	 */
-	private int fClasspathProperty = -1;
-	
-	/**
-	 * This entry's associated build path entry.
-	 */
-	private IClasspathEntry fClasspathEntry = null;
-	
-	/**
-	 * The entry's resolved entry (lazily initialized)
-	 */
-	private IClasspathEntry fResolvedEntry = null;
-	
-	/**
-	 * Associated Java project, or <code>null</code>
-	 */
-	private IJavaProject fJavaProject = null;
-	
-	/**
-	 * The path if the entry was invalid and fClasspathEntry is null
-	 */
-	private IPath fInvalidPath;
-	
-	/**
-	 * Constructs a new runtime classpath entry based on the
-	 * (build) classpath entry.
-	 * 
-	 * @param entry the associated classpath entry
-	 */
-	public RuntimeClasspathEntry(IClasspathEntry entry) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_PROJECT:
-				setType(PROJECT);
-				break;
-			case IClasspathEntry.CPE_LIBRARY:
-				setType(ARCHIVE);
-				break;
-			case IClasspathEntry.CPE_VARIABLE:
-				setType(VARIABLE);
-				break;
-			default:
-				throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.RuntimeClasspathEntry_Illegal_classpath_entry__0__1, new String[] {entry.toString()})); 
-		}
-		setClasspathEntry(entry);
-		initializeClasspathProperty();
-	}
-	
-	/**
-	 * Constructs a new container entry in the context of the given project
-	 * 
-	 * @param entry classpath entry
-	 * @param classpathProperty this entry's classpath property
-	 */
-	public RuntimeClasspathEntry(IClasspathEntry entry, int classpathProperty) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_CONTAINER:
-				setType(CONTAINER);
-				break;
-			default:
-				throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.RuntimeClasspathEntry_Illegal_classpath_entry__0__1, new String[] {entry.toString()})); 
-		}
-		setClasspathEntry(entry);
-		setClasspathProperty(classpathProperty);
-	}	
-
-	/**
-	 * Reconstructs a runtime classpath entry from the given
-	 * XML document root not.
-	 * 
-	 * @param root a memento root doc element created by this class
-	 * @exception CoreException if unable to restore from the given memento
-	 */
-	public RuntimeClasspathEntry(Element root) throws CoreException {									
-		try {
-			setType(Integer.parseInt(root.getAttribute("type"))); //$NON-NLS-1$
-		} catch (NumberFormatException e) {
-			abort(LaunchingMessages.RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry_type_2, e); 
-		}
-		try {
-			setClasspathProperty(Integer.parseInt(root.getAttribute("path"))); //$NON-NLS-1$
-		} catch (NumberFormatException e) {
-			abort(LaunchingMessages.RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry_location_3, e); 
-		}			
-
-		// source attachment
-		IPath sourcePath = null;
-		IPath rootPath = null;
-		String path = root.getAttribute("sourceAttachmentPath"); //$NON-NLS-1$
-		if (path != null && path.length() > 0) {
-			sourcePath = new Path(path);
-		}
-		path = root.getAttribute("sourceRootPath"); //$NON-NLS-1$
-		if (path != null && path.length() > 0) {
-			rootPath = new Path(path);
-		}			
-
-		switch (getType()) {
-			case PROJECT :
-				String name = root.getAttribute("projectName"); //$NON-NLS-1$
-				if (isEmpty(name)) {
-					abort(LaunchingMessages.RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_project_name_4, null); 
-				} else {
-					IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-					setClasspathEntry(JavaCore.newProjectEntry(proj.getFullPath()));
-				}
-				break;
-			case ARCHIVE :
-				path = root.getAttribute("externalArchive"); //$NON-NLS-1$
-				if (isEmpty(path)) {
-					// internal
-					path = root.getAttribute("internalArchive"); //$NON-NLS-1$
-					if (isEmpty(path)) {
-						abort(LaunchingMessages.RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_archive_path_5, null); 
-					} else {
-						setClasspathEntry(createLibraryEntry(sourcePath, rootPath, path));
-					}
-				} else {
-					// external
-					setClasspathEntry(createLibraryEntry(sourcePath, rootPath, path));
-				}
-				break;
-			case VARIABLE :
-				String var = root.getAttribute("containerPath"); //$NON-NLS-1$
-				if (isEmpty(var)) {
-					abort(LaunchingMessages.RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_variable_name_6, null); 
-				} else {
-					setClasspathEntry(JavaCore.newVariableEntry(new Path(var), sourcePath, rootPath));
-				}
-				break;
-			case CONTAINER :
-				var = root.getAttribute("containerPath"); //$NON-NLS-1$
-				if (isEmpty(var)) {
-					abort(LaunchingMessages.RuntimeClasspathEntry_Unable_to_recover_runtime_class_path_entry___missing_variable_name_6, null); 
-				} else {
-					setClasspathEntry(JavaCore.newContainerEntry(new Path(var)));
-				}
-				break;
-		}	
-		
-		String name = root.getAttribute("javaProject"); //$NON-NLS-1$
-		if (isEmpty(name)) {
-			fJavaProject = null;
-		} else {
-			IProject project2 = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-			fJavaProject = JavaCore.create(project2);
-		}
-	}
-
-	private IClasspathEntry createLibraryEntry(IPath sourcePath, IPath rootPath, String path) throws CoreException {
-		Path p = new Path(path);
-		if (!p.isAbsolute())
-		{
-			fInvalidPath = p;
-			return null;
-			//abort("There was a problem with path \" " + path + "\": paths must be absolute.", null);			
-		}
-		return JavaCore.newLibraryEntry(p, sourcePath, rootPath);
-	}
-	
-	/**
-	 * Throws an internal error exception
-	 */
-	protected void abort(String message, Throwable e)	throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, e);
-		throw new CoreException(s);		
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getType()
-	 */
-	public int getType() {
-		return fType;
-	}
-
-	/**
-	 * Sets this entry's type
-	 * 
-	 * @param type this entry's type
-	 */
-	private void setType(int type) {
-		fType = type;
-	}
-
-	/**
-	 * Sets the classpath entry associated with this runtime classpath entry.
-	 * Clears the cache of the resolved entry.
-	 *
-	 * @param entry the classpath entry associated with this runtime classpath entry
-	 */
-	private void setClasspathEntry(IClasspathEntry entry) {
-		fClasspathEntry = entry;
-		fResolvedEntry = null;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getClasspathEntry()
-	 */
-	public IClasspathEntry getClasspathEntry() {
-		return fClasspathEntry;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-	
-		Document doc;
-		try {
-			doc = LaunchingPlugin.getDocument();
-		} catch (ParserConfigurationException e) {
-			IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, LaunchingMessages.RuntimeClasspathEntry_An_exception_occurred_generating_runtime_classpath_memento_8, e); 
-			throw new CoreException(status);
-		}
-		Element node = doc.createElement("runtimeClasspathEntry"); //$NON-NLS-1$
-		doc.appendChild(node);
-		node.setAttribute("type", (new Integer(getType())).toString()); //$NON-NLS-1$
-		node.setAttribute("path", (new Integer(getClasspathProperty())).toString()); //$NON-NLS-1$
-		switch (getType()) {
-			case PROJECT :
-				node.setAttribute("projectName", getPath().lastSegment()); //$NON-NLS-1$
-				break;
-			case ARCHIVE :
-				IResource res = getResource();
-				if (res == null) {
-					node.setAttribute("externalArchive", getPath().toString()); //$NON-NLS-1$
-				} else {
-					node.setAttribute("internalArchive", res.getFullPath().toString()); //$NON-NLS-1$
-				}
-				break;
-			case VARIABLE :
-			case CONTAINER :
-				node.setAttribute("containerPath", getPath().toString()); //$NON-NLS-1$
-				break;
-		}		
-		if (getSourceAttachmentPath() != null) {
-			node.setAttribute("sourceAttachmentPath", getSourceAttachmentPath().toString()); //$NON-NLS-1$
-		}
-		if (getSourceAttachmentRootPath() != null) {
-			node.setAttribute("sourceRootPath", getSourceAttachmentRootPath().toString()); //$NON-NLS-1$
-		}
-		if (getJavaProject() != null) {
-			node.setAttribute("javaProject", getJavaProject().getElementName()); //$NON-NLS-1$
-		}
-		try {
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, LaunchingMessages.RuntimeClasspathEntry_An_exception_occurred_generating_runtime_classpath_memento_8, e); 
-			throw new CoreException(status);
-		} catch (TransformerException e) {
-			IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, LaunchingMessages.RuntimeClasspathEntry_An_exception_occurred_generating_runtime_classpath_memento_8, e); 
-			throw new CoreException(status);
-		}
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getPath()
-	 */
-	public IPath getPath() {
-		IClasspathEntry entry = getClasspathEntry();
-		return entry != null ? entry.getPath() : fInvalidPath;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getResource()
-	 */
-	public IResource getResource() {
-		switch (getType()) {
-			case CONTAINER:
-			case VARIABLE:
-				return null;
-			default:
-				return getResource(getPath());
-		}
-	}
-	
-	/**
-	 * Returns the resource in the workspace assciated with the given
-	 * absolute path, or <code>null</code> if none. The path may have
-	 * a device.
-	 * 
-	 * @param path absolute path, or <code>null</code>
-	 * @return resource or <code>null</code>
-	 */
-	protected IResource getResource(IPath path) {
-		if (path != null) {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			if (path.getDevice() == null) {
-				// search relative to the workspace if no device present
-				return root.findMember(path);
-			} 
-			// look for files or folders with the given path
-			IFile[] files = root.findFilesForLocation(path);
-			if (files.length > 0) {
-				return files[0];
-			}
-			IContainer[] containers = root.findContainersForLocation(path);
-			if (containers.length > 0) {
-				return containers[0];
-			}
-		}		
-		return null;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getSourceAttachmentPath()
-	 */
-	public IPath getSourceAttachmentPath() {
-		IClasspathEntry entry = getClasspathEntry();
-		return entry != null ? entry.getSourceAttachmentPath() : null;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#setSourceAttachmentPath(IPath)
-	 */
-	public void setSourceAttachmentPath(IPath path) {
-		if (path != null && path.isEmpty()) {
-			path = null;
-		}
-		updateClasspathEntry(getPath(), path, getSourceAttachmentRootPath());
-	}
-	
-	/**
-	 * @see IRuntimeClasspathEntry#getSourceAttachmentRootPath()
-	 */
-	public IPath getSourceAttachmentRootPath() {
-		IClasspathEntry entry = getClasspathEntry();
-		IPath path = entry != null ? getClasspathEntry().getSourceAttachmentRootPath() : null;
-		if (path == null && getSourceAttachmentPath() != null) {
-			return Path.EMPTY;
-		}
-		return path;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#setSourceAttachmentPath(IPath)
-	 */
-	public void setSourceAttachmentRootPath(IPath path) {
-		if (path != null && path.isEmpty()) {
-			path = null;
-		}
-		updateClasspathEntry(getPath(), getSourceAttachmentPath(), path);		
-	}
-	
-	/**
-	 * Initlaizes the classpath property based on this entry's type.
-	 */
-	private void initializeClasspathProperty() {
-		switch (getType()) {
-			case VARIABLE:
-				if (getVariableName().equals(JavaRuntime.JRELIB_VARIABLE)) {
-					setClasspathProperty(STANDARD_CLASSES);
-				} else {
-					setClasspathProperty(USER_CLASSES);
-				}
-				break;
-			case PROJECT:
-			case ARCHIVE:
-				setClasspathProperty(USER_CLASSES);
-				break;
-			default:
-				break;
-		}
-	}
-	
-	
-	/**
-	 * @see IRuntimeClasspathEntry#setClasspathProperty(int)
-	 */
-	public void setClasspathProperty(int location) {
-		fClasspathProperty = location;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#setClasspathProperty(int)
-	 */
-	public int getClasspathProperty() {
-		return fClasspathProperty;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getLocation()
-	 */
-	public String getLocation() {
-
-		IPath path = null;
-		switch (getType()) {
-			case PROJECT :
-				IJavaProject pro = (IJavaProject) JavaCore.create(getResource());
-				if (pro != null) {
-					try {
-						path = pro.getOutputLocation();
-					} catch (JavaModelException e) {
-						LaunchingPlugin.log(e);
-					}
-				}
-				break;
-			case ARCHIVE :
-				path = getPath();
-				break;
-			case VARIABLE :
-				IClasspathEntry resolved = getResolvedClasspathEntry();
-				if (resolved != null) {
-					path = resolved.getPath();
-				}
-				break;
-			case CONTAINER :
-				break;
-		}
-		return resolveToOSPath(path);
-	}
-	
-	/**
-	 * Returns the OS path for the given aboslute or workspace relative path
-	 */
-	protected String resolveToOSPath(IPath path) {
-		if (path != null) {
-			IResource res = null;
-			if (path.getDevice() == null) {
-				// if there is no device specified, find the resource
-				res = getResource(path);
-			}
-			if (res == null) {
-				return path.toOSString();
-			} 
-			IPath location = res.getLocation();
-			if (location != null) {
-				return location.toOSString();
-			}
-		}
-		return null;		
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getVariableName()
-	 */
-	public String getVariableName() {
-		if (getType() == IRuntimeClasspathEntry.VARIABLE || getType() == IRuntimeClasspathEntry.CONTAINER) {
-			return getPath().segment(0);
-		}
-		return null;
-	}
-
-	/**
-	 * @see Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof IRuntimeClasspathEntry) {
-			IRuntimeClasspathEntry r = (IRuntimeClasspathEntry)obj;
-			if (getType() == r.getType() && getClasspathProperty() == r.getClasspathProperty()) {
-				if (getType() == IRuntimeClasspathEntry.CONTAINER) {
-					String id = getPath().segment(0);
-					ClasspathContainerInitializer initializer = JavaCore.getClasspathContainerInitializer(id);
-					IJavaProject javaProject1 = getJavaProject();
-					IJavaProject javaProject2 = r.getJavaProject();
-					if (initializer == null || javaProject1 == null || javaProject2 == null) {
-						// containers are equal if their ID is equal by default
-						return getPath().equals(r.getPath());
-					}
-					Object comparisonID1 = initializer.getComparisonID(getPath(), javaProject1);
-					Object comparisonID2 = initializer.getComparisonID(r.getPath(), javaProject2);
-					return comparisonID1.equals(comparisonID2);
-				} else if (getPath() != null && getPath().equals(r.getPath())) {
-					IPath sa1 = getSourceAttachmentPath();
-					IPath root1 = getSourceAttachmentRootPath();
-					IPath sa2 = r.getSourceAttachmentPath();
-					IPath root2 = r.getSourceAttachmentRootPath();
-					return equal(sa1, sa2) && equal(root1, root2);
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns whether the given objects are equal, accounting for null
-	 */
-	protected boolean equal(Object one, Object two) {
-		if (one == null) {
-			return two == null;
-		}
-		return one.equals(two);
-	}
-	
-	/**
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		if (getType() == CONTAINER) {
-			return getPath().segment(0).hashCode() + getType();
-		}
-		return getPath().hashCode() + getType();
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getSourceAttachmentLocation()
-	 */
-	public String getSourceAttachmentLocation() {
-		IPath path = null;
-		switch (getType()) {
-			case VARIABLE :
-			case ARCHIVE :
-				IClasspathEntry resolved = getResolvedClasspathEntry();
-				if (resolved != null) {
-					path = resolved.getSourceAttachmentPath();
-				}
-				break;
-			default :
-				break;
-		}
-		return resolveToOSPath(path);
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getSourceAttachmentRootLocation()
-	 */
-	public String getSourceAttachmentRootLocation() {
-		IPath path = null;
-		switch (getType()) {
-			case VARIABLE :
-			case ARCHIVE :
-				IClasspathEntry resolved = getResolvedClasspathEntry();
-				if (resolved != null) {
-					path = resolved.getSourceAttachmentRootPath();
-				}
-				break;
-			default :
-				break;
-		}
-		if (path != null) {
-			return path.toOSString();
-		}
-		return null;
-	}
-
-	/**
-	 * Creates a new underlying classpath entry for this runtime classpath entry
-	 * with the given paths, due to a change in source attachment.
-	 */
-	protected void updateClasspathEntry(IPath path, IPath sourcePath, IPath rootPath) {
-		IClasspathEntry entry = null;
-		switch (getType()) {
-			case ARCHIVE:
-				entry = JavaCore.newLibraryEntry(path, sourcePath, rootPath);
-				break;
-			case VARIABLE:
-				entry = JavaCore.newVariableEntry(path, sourcePath, rootPath);
-				break;
-			default:
-				return;
-		}		
-		setClasspathEntry(entry);		
-	}
-	
-	/**
-	 * Returns the resolved classpath entry associated with this runtime
-	 * entry, resolving if required.
-	 */
-	protected IClasspathEntry getResolvedClasspathEntry() {
-		if (fResolvedEntry == null) {
-			fResolvedEntry = JavaCore.getResolvedClasspathEntry(getClasspathEntry());
-		}
-		return fResolvedEntry;
-	}
-		
-	protected boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	
-	public String toString() {
-		if (fClasspathEntry != null) {
-			return fClasspathEntry.toString();
-		}
-		return super.toString();
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getJavaProject()
-	 */
-	public IJavaProject getJavaProject() {
-		return fJavaProject;
-	}
-	
-	/**
-	 * Sets the Java project associated with this classpath entry.
-	 * 
-	 * @param project Java project
-	 */
-	public void setJavaProject(IJavaProject project) {
-		fJavaProject = project;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
deleted file mode 100644
index 547cffc..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Compares lists of runtime classpath entry mementos
- */
-public class RuntimeClasspathEntryListComparator implements Comparator {
-
-	/**
-	 * @see Comparator#compare(Object, Object)
-	 */
-	public int compare(Object o1, Object o2) {
-		List list1 = (List)o1;
-		List list2 = (List)o2;
-		
-		if (list1.size() == list2.size()) {
-			for (int i = 0; i < list1.size(); i++) {
-				String memento1 = (String)list1.get(i);
-				String memento2 = (String)list2.get(i);
-				if (!equalsIgnoreWhitespace(memento1, memento2)) {
-					return -1;
-				}
-			}
-			return 0;
-		}
-		return -1;
-	}
-	
-	protected boolean equalsIgnoreWhitespace(String one, String two) {
-		int i1 = 0;
-		int i2 = 0;
-		int l1 = one.length();
-		int l2 = two.length();
-		char ch1 = ' ';
-		char ch2 = ' ';
-		while (i1 < l1 && i2 < l2) {
-			while (i1 < l1 && Character.isWhitespace(ch1 = one.charAt(i1))) {
-				i1++;
-			}
-			while (i2 < l2 && Character.isWhitespace(ch2 = two.charAt(i2))) {
-				i2++;
-			}
-			if (i1 == l1 && i2 == l2) {
-				return true;
-			}
-			if (ch1 != ch2) {
-				return false;
-			}			
-			i1++;
-			i2++;
-		}
-		return true;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
deleted file mode 100644
index a479248..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
- 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver;
-import org.eclipse.jdt.launching.IVMInstall;
-
-/**
- * Proxy to a runtime classpath entry resolver extension.
- */
-public class RuntimeClasspathEntryResolver implements IRuntimeClasspathEntryResolver {
-
-	private IConfigurationElement fConfigurationElement;
-	
-	private IRuntimeClasspathEntryResolver fDelegate;
-	
-	/**
-	 * Constructs a new resolver on the given configuration element
-	 */
-	public RuntimeClasspathEntryResolver(IConfigurationElement element) {
-		fConfigurationElement = element;
-	}
-	
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
-		return getResolver().resolveRuntimeClasspathEntry(entry, configuration);
-	}
-	
-	/**
-	 * Returns the resolver delegate (and creates if required) 
-	 */
-	protected IRuntimeClasspathEntryResolver getResolver() throws CoreException {
-		if (fDelegate == null) {
-			fDelegate = (IRuntimeClasspathEntryResolver)fConfigurationElement.createExecutableExtension("class"); //$NON-NLS-1$
-		}
-		return fDelegate;
-	}
-	
-	/**
-	 * Returns the variable name this resolver is registered for, or <code>null</code>
-	 */
-	public String getVariableName() {
-		return fConfigurationElement.getAttribute("variable"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Returns the container id this resolver is registered for, or <code>null</code>
-	 */
-	public String getContainerId() {
-		return fConfigurationElement.getAttribute("container"); //$NON-NLS-1$
-	}	
-	
-	/**
-	 * Returns the runtime classpath entry id this resolver is registered
-	 * for,or <code>null</code> if none.
-	 */
-	public String getRuntimeClasspathEntryId() {
-		return fConfigurationElement.getAttribute("runtimeClasspathEntryId"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveVMInstall(IClasspathEntry)
-	 */
-	public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
-		return getResolver().resolveVMInstall(entry);
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, IJavaProject)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		return getResolver().resolveRuntimeClasspathEntry(entry, project);
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
deleted file mode 100644
index 386474a..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
- 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathProvider;
-
-/**
- * Proxy to a runtime classpath provider extension.
- */
-public class RuntimeClasspathProvider implements IRuntimeClasspathProvider {
-
-	private IConfigurationElement fConfigurationElement;
-	
-	private IRuntimeClasspathProvider fDelegate;
-	
-	/**
-	 * Constructs a new resolver on the given configuration element
-	 */
-	public RuntimeClasspathProvider(IConfigurationElement element) {
-		fConfigurationElement = element;
-	}
-		
-	/**
-	 * Returns the resolver delegate (and creates if required) 
-	 */
-	protected IRuntimeClasspathProvider getProvider() throws CoreException {
-		if (fDelegate == null) {
-			fDelegate = (IRuntimeClasspathProvider)fConfigurationElement.createExecutableExtension("class"); //$NON-NLS-1$
-		}
-		return fDelegate;
-	}
-	
-	public String getIdentifier() {
-		return fConfigurationElement.getAttribute("id"); //$NON-NLS-1$
-	}
-	/**
-	 * @see IRuntimeClasspathProvider#computeUnresolvedClasspath(ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		return getProvider().computeUnresolvedClasspath(configuration);
-	}
-
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		return getProvider().resolveClasspath(entries, configuration);
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
deleted file mode 100644
index a88611e..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.jdi.Bootstrap;
-import org.eclipse.jdi.TimeoutException;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMConnector;
-
-import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.VirtualMachine;
-import com.sun.jdi.connect.AttachingConnector;
-import com.sun.jdi.connect.Connector;
-import com.sun.jdi.connect.IllegalConnectorArgumentsException;
-
-/**
- * A standard socket attaching connector
- */
-public class SocketAttachConnector implements IVMConnector {
-		
-	/**
-	 * Return the socket transport attaching connector
-	 * 
-	 * @exception CoreException if unable to locate the connector
-	 */
-	protected static AttachingConnector getAttachingConnector() throws CoreException {
-		AttachingConnector connector= null;
-		Iterator iter= Bootstrap.virtualMachineManager().attachingConnectors().iterator();
-		while (iter.hasNext()) {
-			AttachingConnector lc= (AttachingConnector) iter.next();
-			if (lc.name().equals("com.sun.jdi.SocketAttach")) { //$NON-NLS-1$
-				connector= lc;
-				break;
-			}
-		}
-		if (connector == null) {
-			abort(LaunchingMessages.SocketAttachConnector_Socket_attaching_connector_not_available_3, null, IJavaLaunchConfigurationConstants.ERR_SHARED_MEMORY_CONNECTOR_UNAVAILABLE); 
-		}
-		return connector;
-	}
-
-	/**
-	 * @see IVMConnector#getIdentifier()
-	 */
-	public String getIdentifier() {
-		return IJavaLaunchConfigurationConstants.ID_SOCKET_ATTACH_VM_CONNECTOR;
-	}
-
-	/**
-	 * @see IVMConnector#getName()
-	 */
-	public String getName() {
-		return LaunchingMessages.SocketAttachConnector_Standard__Socket_Attach__4; 
-	}
-	
-	/**
-	 * Throws a core exception with an error status object built from
-	 * the given message, lower level exception, and error code.
-	 * 
-	 * @param message the status message
-	 * @param exception lower level exception associated with the
-	 *  error, or <code>null</code> if none
-	 * @param code error code
-	 */
-	protected static void abort(String message, Throwable exception, int code) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), code, message, exception));
-	}		
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMConnector#connect(java.util.Map, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.ILaunch)
-	 */
-	public void connect(Map arguments, IProgressMonitor monitor, ILaunch launch) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
-		subMonitor.beginTask(LaunchingMessages.SocketAttachConnector_Connecting____1, 2); 
-		subMonitor.subTask(LaunchingMessages.SocketAttachConnector_Configuring_connection____1); 
-		
-		AttachingConnector connector= getAttachingConnector();
-		String portNumberString = (String)arguments.get("port"); //$NON-NLS-1$
-		if (portNumberString == null) {
-			abort(LaunchingMessages.SocketAttachConnector_Port_unspecified_for_remote_connection__2, null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_PORT); 
-		}
-		String host = (String)arguments.get("hostname"); //$NON-NLS-1$
-		if (host == null) {
-			abort(LaunchingMessages.SocketAttachConnector_Hostname_unspecified_for_remote_connection__4, null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_HOSTNAME); 
-		}
-		Map map= connector.defaultArguments();
-		
-        Connector.Argument param= (Connector.Argument) map.get("hostname"); //$NON-NLS-1$
-		param.setValue(host);
-		param= (Connector.Argument) map.get("port"); //$NON-NLS-1$
-		param.setValue(portNumberString);
-        
-        String timeoutString = (String)arguments.get("timeout"); //$NON-NLS-1$
-        if (timeoutString != null) {
-            param= (Connector.Argument) map.get("timeout"); //$NON-NLS-1$
-            param.setValue(timeoutString);
-        }
-        
-		ILaunchConfiguration configuration = launch.getLaunchConfiguration();
-		boolean allowTerminate = false;
-		if (configuration != null) {
-			allowTerminate = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, false);
-		}
-		subMonitor.worked(1);
-		subMonitor.subTask(LaunchingMessages.SocketAttachConnector_Establishing_connection____2); 
-		try {
-			VirtualMachine vm = connector.attach(map);
-			String vmLabel = constructVMLabel(vm, host, portNumberString, configuration);
-			IDebugTarget debugTarget= JDIDebugModel.newDebugTarget(launch, vm, vmLabel, null, allowTerminate, true);
-			launch.addDebugTarget(debugTarget);
-			subMonitor.worked(1);
-			subMonitor.done();
-        } catch (TimeoutException e) {
-            abort(LaunchingMessages.SocketAttachConnector_0, e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED);
-		} catch (UnknownHostException e) {
-			abort(MessageFormat.format(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_because_of_unknown_host____0___1, new String[]{host}), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); 
-		} catch (ConnectException e) {
-			abort(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_as_connection_was_refused_2, e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); 
-		} catch (IOException e) {
-			abort(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_1, e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); 
-		} catch (IllegalConnectorArgumentsException e) {
-			abort(LaunchingMessages.SocketAttachConnector_Failed_to_connect_to_remote_VM_1, e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); 
-		}
-	}
-
-	/**
-	 * Helper method that constructs a human-readable label for a remote VM.
-	 */
-	protected String constructVMLabel(VirtualMachine vm, String host, String port, ILaunchConfiguration configuration) {
-		String name = null;
-		try {
-			name = vm.name();
-		} catch (TimeoutException e) {
-			// do nothing
-		} catch (VMDisconnectedException e) {
-			// do nothing
-		}
-		if (name == null) {
-			if (configuration == null) {
-				name = ""; //$NON-NLS-1$
-			} else {
-				name = configuration.getName();
-			}
-		}
-		StringBuffer buffer = new StringBuffer(name);
-		buffer.append('['); 
-		buffer.append(host);
-		buffer.append(':'); 
-		buffer.append(port);
-		buffer.append(']'); 
-		return buffer.toString();
-	}
-		
-
-	/**
-	 * @see IVMConnector#getDefaultArguments()
-	 */
-	public Map getDefaultArguments() throws CoreException {
-		Map def = getAttachingConnector().defaultArguments();
-		Connector.IntegerArgument arg = (Connector.IntegerArgument)def.get("port"); //$NON-NLS-1$
-		arg.setValue(8000);
-		return def;
-	}
-
-	/**
-	 * @see IVMConnector#getArgumentOrder()
-	 */
-	public List getArgumentOrder() {
-		List list = new ArrayList(2);
-		list.add("hostname"); //$NON-NLS-1$
-		list.add("port"); //$NON-NLS-1$
-		return list;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVM.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVM.java
deleted file mode 100644
index 72bc811..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVM.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.IVMRunner;
-
-/**
- * A 1.1.x VM
- */
-public class Standard11xVM extends StandardVM {
-
-	public Standard11xVM(IVMInstallType type, String id) {
-		super(type, id);
-	}
-
-
-	/**
-	 * @see org.eclipse.jdt.launching.IVMInstall#getVMRunner(String)
-	 */
-	public IVMRunner getVMRunner(String mode) {
-		if (ILaunchManager.RUN_MODE.equals(mode)) {
-			return new Standard11xVMRunner(this);
-		}
-		return null;
-	}
-
-
-}
-
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMRunner.java
deleted file mode 100644
index ce13beb..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMRunner.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-/**
- * A 1.1.x VM runner
- */
-public class Standard11xVMRunner extends StandardVMRunner {
-
-	public Standard11xVMRunner(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMRunner#run(org.eclipse.jdt.launching.VMRunnerConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
-		subMonitor.beginTask(LaunchingMessages.StandardVMRunner_Launching_VM____1, 2); 
-		subMonitor.subTask(LaunchingMessages.StandardVMRunner_Constructing_command_line____2); //		
-		
-		String program= constructProgramString(config);
-		
-		List arguments= new ArrayList();
-		arguments.add(program);
-				
-		// VM args are the first thing after the java program so that users can specify
-		// options like '-client' & '-server' which are required to be the first option
-		String[] vmArgs= combineVmArgs(config, fVMInstance);
-		addArguments(vmArgs, arguments);
-				
-		String[] bootCP= config.getBootClassPath();		
-		String[] classPath = config.getClassPath();
-		
-		String[] combinedPath = null;
-		if (bootCP == null) {
-			LibraryLocation[] locs = JavaRuntime.getLibraryLocations(fVMInstance);
-			bootCP = new String[locs.length];
-			for (int i = 0; i < locs.length; i++) {
-				bootCP[i] = locs[i].getSystemLibraryPath().toOSString();
-			}
-		}
-
-		combinedPath = new String[bootCP.length + classPath.length];
-		int offset = 0;
-		for (int i = 0; i < bootCP.length; i++) {
-			combinedPath[offset] = bootCP[i];
-			offset++;
-		}
-		for (int i = 0; i < classPath.length; i++) {
-			combinedPath[offset] = classPath[i];
-			offset++;
-		}
-		
-		if (combinedPath.length > 0) {
-			arguments.add("-classpath"); //$NON-NLS-1$
-			arguments.add(convertClassPath(combinedPath));
-		}
-		arguments.add(config.getClassToLaunch());
-		
-		String[] programArgs= config.getProgramArguments();
-		addArguments(programArgs, arguments);
-				
-		String[] cmdLine= new String[arguments.size()];
-		arguments.toArray(cmdLine);
-
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		subMonitor.worked(1);
-		subMonitor.subTask(LaunchingMessages.StandardVMRunner_Starting_virtual_machine____3); 
-		
-		Process p= null;
-		File workingDir = getWorkingDir(config);
-		p= exec(cmdLine, workingDir);
-		if (p == null) {
-			return;
-		}
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			p.destroy();
-			return;
-		}		
-		
-		IProcess process= DebugPlugin.newProcess(launch, p, renderProcessLabel(cmdLine));
-		process.setAttribute(IProcess.ATTR_CMDLINE, renderCommandLine(cmdLine));
-		subMonitor.worked(1);
-	}
-}
-
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMType.java
deleted file mode 100644
index 2f405c4..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * A VM install type for VMs the conform to the 1.1.x standard
- * JDK installion layout, and command line options.
- */
-public class Standard11xVMType extends StandardVMType {
-		
-	/**
-	 * @see org.eclipse.jdt.internal.launching.StandardVMType#getDefaultSystemLibrary(java.io.File)
-	 */
-	protected IPath getDefaultSystemLibrary(File installLocation) {
-		return new Path(installLocation.getPath()).append("lib").append("classes.zip"); //$NON-NLS-2$ //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jdt.launching.AbstractVMInstallType#doCreateVMInstall(java.lang.String)
-	 */
-	protected IVMInstall doCreateVMInstall(String id) {
-		return new Standard11xVM(this, id);
-	}
-	
-	/**
-	 * @see org.eclipse.jdt.internal.launching.StandardVMType#getDefaultSystemLibrarySource(java.io.File)
-	 */
-	protected IPath getDefaultSystemLibrarySource(File libLocation) {
-		setDefaultRootPath(""); //$NON-NLS-1$
-		return Path.EMPTY;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallType#getName()
-	 */
-	public String getName() {
-		return LaunchingMessages.Standard11xVMType_Standard_1_1_x_VM_1; 
-	}	
-	
-	/**
-	 * Returns <code>null</code> - not supported.
-	 * 
-	 * @see StandardVMType#getDefaultExtensionDirectory(File)
-	 */
-	protected File getDefaultExtensionDirectory(File installLocation) {
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.jdt.internal.launching.StandardVMType#getDefaultEndorsedDirectory(java.io.File)
-	 */
-	protected File getDefaultEndorsedDirectory(File installLocation) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jdt.launching.IVMInstallType#getDefaultLibraryLocations(java.io.File)
-	 */
-	public LibraryLocation[] getDefaultLibraryLocations(File installLocation) {
-		IPath libPath = getDefaultSystemLibrary(installLocation);
-		File lib = libPath.toFile();
-		if (lib.exists()) {
-			return new LibraryLocation[] {new LibraryLocation(libPath, getDefaultSystemLibrarySource(lib), getDefaultPackageRootPath())};
-		}
-		return new LibraryLocation[0];
-	}
-
-	/**
-	 * Return <code>true</code> if the appropriate system libraries can be found for the
-	 * specified java executable, <code>false</code> otherwise.
-	 */
-	protected boolean canDetectDefaultSystemLibraries(File javaHome, File javaExecutable) {
-		LibraryLocation[] locations = getDefaultLibraryLocations(javaHome);
-		String version = getVMVersion(javaHome, javaExecutable);
-		return locations.length > 0 && version.startsWith("1.1"); //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVM.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVM.java
deleted file mode 100644
index 5827852..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVM.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.launching.AbstractVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.IVMRunner;
-
-public class StandardVM extends AbstractVMInstall {
-	StandardVM(IVMInstallType type, String id) {
-		super(type, id);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#getVMRunner(java.lang.String)
-	 */
-	public IVMRunner getVMRunner(String mode) {
-		if (ILaunchManager.RUN_MODE.equals(mode)) {
-			return new StandardVMRunner(this);
-		} else if (ILaunchManager.DEBUG_MODE.equals(mode)) {
-			return new StandardVMDebugger(this);
-		}
-		return null;
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jdt.launching.IVMInstall#getJavaVersion()
-     */
-    public String getJavaVersion() {
-        StandardVMType installType = (StandardVMType) getVMInstallType();
-        File installLocation = getInstallLocation();
-        if (installLocation != null) {
-            File executable = StandardVMType.findJavaExecutable(installLocation);
-            if (executable != null) {
-                String vmVersion = installType.getVMVersion(installLocation, executable);
-                // strip off extra info
-                StringBuffer version = new StringBuffer();
-                for (int i = 0; i < vmVersion.length(); i++) {
-                    char ch = vmVersion.charAt(i);
-                    if (Character.isDigit(ch) || ch == '.') {
-                        version.append(ch);
-                    } else {
-                        break;
-                    }
-                }
-                if (version.length() > 0) {
-                    return version.toString();
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
deleted file mode 100644
index fa505a6..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.jdi.Bootstrap;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.SocketUtil;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-import com.sun.jdi.VirtualMachine;
-import com.sun.jdi.connect.Connector;
-import com.sun.jdi.connect.IllegalConnectorArgumentsException;
-import com.sun.jdi.connect.ListeningConnector;
-
-/**
- * A launcher for running Java main classes. Uses JDI to launch a vm in debug 
- * mode.
- */
-public class StandardVMDebugger extends StandardVMRunner {
-	
-	
-	/**
-	 * Used to attach to a VM in a seperate thread, to allow for cancellation
-	 * and detect that the associated System process died before the connect
-	 * occurred.
-	 */
-	class ConnectRunnable implements Runnable {
-		
-		private VirtualMachine fVirtualMachine = null;
-		private ListeningConnector fConnector = null;
-		private Map fConnectionMap = null;
-		private Exception fException = null;
-		
-		/**
-		 * Constructs a runnable to connect to a VM via the given connector
-		 * with the given connection arguments.
-		 * 
-		 * @param connector
-		 * @param map
-		 */
-		public ConnectRunnable(ListeningConnector connector, Map map) {
-			fConnector = connector;
-			fConnectionMap = map;
-		}
-		
-		public void run() {
-			try {
-				fVirtualMachine = fConnector.accept(fConnectionMap);
-			} catch (IOException e) {
-				fException = e;
-			} catch (IllegalConnectorArgumentsException e) {
-				fException = e;
-			}
-		}
-		
-		/**
-		 * Returns the VM that was attached to, or <code>null</code> if none.
-		 * 
-		 * @return the VM that was attached to, or <code>null</code> if none
-		 */
-		public VirtualMachine getVirtualMachine() {
-			return fVirtualMachine;
-		}
-		
-		/**
-		 * Returns any exception that occurred while attaching, or <code>null</code>.
-		 * 
-		 * @return IOException or IllegalConnectorArgumentsException
-		 */
-		public Exception getException() {
-			return fException;
-		}
-	}
-
-	/**
-	 * Creates a new launcher
-	 */
-	public StandardVMDebugger(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMRunner#run(org.eclipse.jdt.launching.VMRunnerConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
-		subMonitor.beginTask(LaunchingMessages.StandardVMDebugger_Launching_VM____1, 4); 
-		subMonitor.subTask(LaunchingMessages.StandardVMDebugger_Finding_free_socket____2); 
-
-		int port= SocketUtil.findFreePort();
-		if (port == -1) {
-			abort(LaunchingMessages.StandardVMDebugger_Could_not_find_a_free_socket_for_the_debugger_1, null, IJavaLaunchConfigurationConstants.ERR_NO_SOCKET_AVAILABLE); 
-		}
-		
-		subMonitor.worked(1);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-		
-		subMonitor.subTask(LaunchingMessages.StandardVMDebugger_Constructing_command_line____3); 
-				
-		String program= constructProgramString(config);
-
-		List arguments= new ArrayList(12);
-
-		arguments.add(program);
-
-		// VM args are the first thing after the java program so that users can specify
-		// options like '-client' & '-server' which are required to be the first options
-		String[] allVMArgs = combineVmArgs(config, fVMInstance);
-		addArguments(allVMArgs, arguments);
-		addBootClassPathArguments(arguments, config);
-		
-		String[] cp= config.getClassPath();
-		if (cp.length > 0) {
-			arguments.add("-classpath"); //$NON-NLS-1$
-			arguments.add(convertClassPath(cp));
-		}
-		arguments.add("-Xdebug"); //$NON-NLS-1$
-		arguments.add("-Xnoagent"); //$NON-NLS-1$
-		
-		double version = getJavaVersion();
-		//check if java 1.4 or greater
-		if (version < 1.4) {
-			arguments.add("-Djava.compiler=NONE"); //$NON-NLS-1$
-		}
-		arguments.add("-Xrunjdwp:transport=dt_socket,suspend=y,address=localhost:" + port); //$NON-NLS-1$
-
-		arguments.add(config.getClassToLaunch());
-		addArguments(config.getProgramArguments(), arguments);
-		String[] cmdLine= new String[arguments.size()];
-		arguments.toArray(cmdLine);
-		
-		String[] envp= config.getEnvironment();
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-		
-		subMonitor.worked(1);
-		subMonitor.subTask(LaunchingMessages.StandardVMDebugger_Starting_virtual_machine____4); 
-
-		ListeningConnector connector= getConnector();
-		if (connector == null) {
-			abort(LaunchingMessages.StandardVMDebugger_Couldn__t_find_an_appropriate_debug_connector_2, null, IJavaLaunchConfigurationConstants.ERR_CONNECTOR_NOT_AVAILABLE); 
-		}
-		Map map= connector.defaultArguments();
-		
-		specifyArguments(map, port);
-		Process p= null;
-		try {
-			try {
-				// check for cancellation
-				if (monitor.isCanceled()) {
-					return;
-				}				
-				
-				connector.startListening(map);
-				
-				File workingDir = getWorkingDir(config);
-				p = exec(cmdLine, workingDir, envp);				
-				if (p == null) {
-					return;
-				}
-				
-				// check for cancellation
-				if (monitor.isCanceled()) {
-					p.destroy();
-					return;
-				}				
-				
-				IProcess process= newProcess(launch, p, renderProcessLabel(cmdLine), getDefaultProcessMap());
-				process.setAttribute(IProcess.ATTR_CMDLINE, renderCommandLine(cmdLine));
-				subMonitor.worked(1);
-				subMonitor.subTask(LaunchingMessages.StandardVMDebugger_Establishing_debug_connection____5); 
-				boolean retry= false;
-				do  {
-					try {
-						
-						ConnectRunnable runnable = new ConnectRunnable(connector, map);
-						Thread connectThread = new Thread(runnable, "Listening Connector"); //$NON-NLS-1$
-                        connectThread.setDaemon(true);
-						connectThread.start();
-						while (connectThread.isAlive()) {
-							if (monitor.isCanceled()) {
-								connector.stopListening(map);
-								p.destroy();
-								return;
-							}
-							try {
-								p.exitValue();
-								// process has terminated - stop waiting for a connection
-								try {
-									connector.stopListening(map); 
-								} catch (IOException e) {
-									// expected
-								}
-								checkErrorMessage(process);
-							} catch (IllegalThreadStateException e) {
-								// expected while process is alive
-							}
-							try {
-								Thread.sleep(100);
-							} catch (InterruptedException e) {
-							}
-						}
-
-						Exception ex = runnable.getException();
-						if (ex instanceof IllegalConnectorArgumentsException)						 {
-							throw (IllegalConnectorArgumentsException)ex;
-						}
-						if (ex instanceof InterruptedIOException) {
-							throw (InterruptedIOException)ex;
-						}
-						if (ex instanceof IOException) {
-							throw (IOException)ex;
-						}
-						
-						VirtualMachine vm= runnable.getVirtualMachine();
-						if (vm != null) {
-							JDIDebugModel.newDebugTarget(launch, vm, renderDebugTarget(config.getClassToLaunch(), port), process, true, false, config.isResumeOnStartup());
-							subMonitor.worked(1);
-							subMonitor.done();
-						}
-						return;
-					} catch (InterruptedIOException e) {
-						checkErrorMessage(process);
-						
-						// timeout, consult status handler if there is one
-						IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_VM_CONNECT_TIMEOUT, "", e); //$NON-NLS-1$
-						IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
-						
-						retry= false;
-						if (handler == null) {
-							// if there is no handler, throw the exception
-							throw new CoreException(status);
-						} 
-						Object result = handler.handleStatus(status, this);
-						if (result instanceof Boolean) {
-							retry = ((Boolean)result).booleanValue();
-						}
-					}
-				} while (retry);
-			} finally {
-				connector.stopListening(map);
-			}
-		} catch (IOException e) {
-			abort(LaunchingMessages.StandardVMDebugger_Couldn__t_connect_to_VM_4, e, IJavaLaunchConfigurationConstants.ERR_CONNECTION_FAILED);  
-		} catch (IllegalConnectorArgumentsException e) {
-			abort(LaunchingMessages.StandardVMDebugger_Couldn__t_connect_to_VM_5, e, IJavaLaunchConfigurationConstants.ERR_CONNECTION_FAILED);  
-		}
-		if (p != null) {
-			p.destroy();
-		}
-	}
-	
-	private double getJavaVersion() {
-		LibraryInfo libInfo = LaunchingPlugin.getLibraryInfo(fVMInstance.getInstallLocation().getAbsolutePath());
-		if (libInfo == null) {
-		    return 0D;
-		}
-		String version = libInfo.getVersion();
-		int index = version.indexOf("."); //$NON-NLS-1$
-		int nextIndex = version.indexOf(".", index+1); //$NON-NLS-1$
-		try {
-			if (index > 0 && nextIndex>index) {
-				return Double.parseDouble(version.substring(0,nextIndex));
-			} 
-			return Double.parseDouble(version);
-		} catch (NumberFormatException e) {
-			return 0D;
-		}
-
-	}
-
-	protected void checkErrorMessage(IProcess process) throws CoreException {
-		IStreamsProxy streamsProxy = process.getStreamsProxy();
-		if (streamsProxy != null) {
-			String errorMessage= streamsProxy.getErrorStreamMonitor().getContents();
-			if (errorMessage.length() == 0) {
-				errorMessage= streamsProxy.getOutputStreamMonitor().getContents();
-			}
-			if (errorMessage.length() != 0) {
-				abort(errorMessage, null, IJavaLaunchConfigurationConstants.ERR_VM_LAUNCH_ERROR);
-			}
-		}										
-	}
-		
-	protected void specifyArguments(Map map, int portNumber) {
-		// XXX: Revisit - allows us to put a quote (") around the classpath
-		Connector.IntegerArgument port= (Connector.IntegerArgument) map.get("port"); //$NON-NLS-1$
-		port.setValue(portNumber);
-		
-		Connector.IntegerArgument timeoutArg= (Connector.IntegerArgument) map.get("timeout"); //$NON-NLS-1$
-		if (timeoutArg != null) {
-			int timeout = JavaRuntime.getPreferences().getInt(JavaRuntime.PREF_CONNECT_TIMEOUT);
-			timeoutArg.setValue(timeout);
-		}
-	}
-
-	protected ListeningConnector getConnector() {
-		List connectors= Bootstrap.virtualMachineManager().listeningConnectors();
-		for (int i= 0; i < connectors.size(); i++) {
-			ListeningConnector c= (ListeningConnector) connectors.get(i);
-			if ("com.sun.jdi.SocketListen".equals(c.name())) //$NON-NLS-1$
-				return c;
-		}
-		return null;
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
deleted file mode 100644
index a000e65..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.launching.AbstractVMRunner;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-public class StandardVMRunner extends AbstractVMRunner {
-	protected IVMInstall fVMInstance;
-
-	public StandardVMRunner(IVMInstall vmInstance) {
-		fVMInstance= vmInstance;
-	}
-	
-	protected String renderDebugTarget(String classToRun, int host) {
-		String format= LaunchingMessages.StandardVMRunner__0__at_localhost__1__1; 
-		return MessageFormat.format(format, new String[] { classToRun, String.valueOf(host) });
-	}
-
-	public static String renderProcessLabel(String[] commandLine) {
-		String format= LaunchingMessages.StandardVMRunner__0____1___2; 
-		String timestamp= DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(new Date(System.currentTimeMillis()));
-		return MessageFormat.format(format, new String[] { commandLine[0], timestamp });
-	}
-	
-	protected static String renderCommandLine(String[] commandLine) {
-		if (commandLine.length < 1)
-			return ""; //$NON-NLS-1$
-		StringBuffer buf= new StringBuffer();
-		for (int i= 0; i < commandLine.length; i++) {
-			buf.append(' ');
-			char[] characters= commandLine[i].toCharArray();
-			StringBuffer command= new StringBuffer();
-			boolean containsSpace= false;
-			for (int j = 0; j < characters.length; j++) {
-				char character= characters[j];
-				if (character == '\"') {
-					command.append('\\');
-				} else if (character == ' ') {
-					containsSpace = true;
-				}
-				command.append(character);
-			}
-			if (containsSpace) {
-				buf.append('\"');
-				buf.append(command.toString());
-				buf.append('\"');
-			} else {
-				buf.append(command.toString());
-			}
-		}	
-		return buf.toString();
-	}	
-	
-	protected void addArguments(String[] args, List v) {
-		if (args == null) {
-			return;
-		}
-		for (int i= 0; i < args.length; i++) {
-			v.add(args[i]);
-		}
-	}
-	
-	/**
-	 * Returns the working directory to use for the launched VM,
-	 * or <code>null</code> if the working directory is to be inherited
-	 * from the current process.
-	 * 
-	 * @return the working directory to use
-	 * @exception CoreException if the working directory specified by
-	 *  the configuration does not exist or is not a directory
-	 */	
-	protected File getWorkingDir(VMRunnerConfiguration config) throws CoreException {
-		String path = config.getWorkingDirectory();
-		if (path == null) {
-			return null;
-		}
-		File dir = new File(path);
-		if (!dir.isDirectory()) {
-			abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3, new String[] {path}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); 
-		}
-		return dir;
-	}
-	
-	/**
-	 * @see VMRunner#getPluginIdentifier()
-	 */
-	protected String getPluginIdentifier() {
-		return LaunchingPlugin.getUniqueIdentifier();
-	}
-	
-	/**
-	 * Construct and return a String containing the full path of a java executable
-	 * command such as 'java' or 'javaw.exe'.  If the configuration specifies an
-	 * explicit executable, that is used.
-	 * 
-	 * @return full path to java executable
-	 * @exception CoreException if unable to locate an executeable
-	 */
-	protected String constructProgramString(VMRunnerConfiguration config) throws CoreException {
-
-		// Look for the user-specified java executable command
-		String command= null;
-		Map map= config.getVMSpecificAttributesMap();
-		if (map != null) {
-			command = (String)map.get(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND);
-		}
-		
-		// If no java command was specified, use default executable
-		if (command == null) {
-			File exe = StandardVMType.findJavaExecutable(fVMInstance.getInstallLocation());
-			if (exe == null) {
-				abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Unable_to_locate_executable_for__0__1, new String[]{fVMInstance.getName()}), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); 
-			}
-			return exe.getAbsolutePath();
-		}
-				
-		// Build the path to the java executable.  First try 'bin', and if that
-		// doesn't exist, try 'jre/bin'
-		String installLocation = fVMInstance.getInstallLocation().getAbsolutePath() + File.separatorChar;
-		File exe = new File(installLocation + "bin" + File.separatorChar + command); //$NON-NLS-1$ 		
-		if (fileExists(exe)){
-			return exe.getAbsolutePath();
-		}
-		exe = new File(exe.getAbsolutePath() + ".exe"); //$NON-NLS-1$
-		if (fileExists(exe)){
-			return exe.getAbsolutePath();
-		}
-		exe = new File(installLocation + "jre" + File.separatorChar + "bin" + File.separatorChar + command); //$NON-NLS-1$ //$NON-NLS-2$
-		if (fileExists(exe)) {
-			return exe.getAbsolutePath(); 
-		}
-		exe = new File(exe.getAbsolutePath() + ".exe"); //$NON-NLS-1$
-		if (fileExists(exe)) {
-			return exe.getAbsolutePath(); 
-		}		
-
-		
-		// not found
-		abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4, new String[]{command, fVMInstance.getName()}), null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); 
-		// NOTE: an exception will be thrown - null cannot be returned
-		return null;		
-	}	
-	
-	protected boolean fileExists(File file) {
-		return file.exists() && file.isFile();
-	}
-
-	protected String convertClassPath(String[] cp) {
-		int pathCount= 0;
-		StringBuffer buf= new StringBuffer();
-		if (cp.length == 0) {
-			return "";    //$NON-NLS-1$
-		}
-		for (int i= 0; i < cp.length; i++) {
-			if (pathCount > 0) {
-				buf.append(File.pathSeparator);
-			}
-			buf.append(cp[i]);
-			pathCount++;
-		}
-		return buf.toString();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMRunner#run(org.eclipse.jdt.launching.VMRunnerConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1);
-		subMonitor.beginTask(LaunchingMessages.StandardVMRunner_Launching_VM____1, 2); 
-		subMonitor.subTask(LaunchingMessages.StandardVMRunner_Constructing_command_line____2); 
-		
-		String program= constructProgramString(config);
-		
-		List arguments= new ArrayList();
-		arguments.add(program);
-				
-		// VM args are the first thing after the java program so that users can specify
-		// options like '-client' & '-server' which are required to be the first option
-		String[] allVMArgs = combineVmArgs(config, fVMInstance);
-		addArguments(allVMArgs, arguments);
-		
-		addBootClassPathArguments(arguments, config);
-		
-		String[] cp= config.getClassPath();
-		if (cp.length > 0) {
-			arguments.add("-classpath"); //$NON-NLS-1$
-			arguments.add(convertClassPath(cp));
-		}
-		arguments.add(config.getClassToLaunch());
-		
-		String[] programArgs= config.getProgramArguments();
-		addArguments(programArgs, arguments);
-				
-		String[] cmdLine= new String[arguments.size()];
-		arguments.toArray(cmdLine);
-		
-		String[] envp= config.getEnvironment();
-		
-		subMonitor.worked(1);
-
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		subMonitor.subTask(LaunchingMessages.StandardVMRunner_Starting_virtual_machine____3); 
-		Process p= null;
-		File workingDir = getWorkingDir(config);
-		p= exec(cmdLine, workingDir, envp);
-		if (p == null) {
-			return;
-		}
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			p.destroy();
-			return;
-		}		
-		
-		IProcess process= newProcess(launch, p, renderProcessLabel(cmdLine), getDefaultProcessMap());
-		process.setAttribute(IProcess.ATTR_CMDLINE, renderCommandLine(cmdLine));
-		subMonitor.worked(1);
-		subMonitor.done();
-	}
-
-	protected void addBootClassPathArguments(List arguments, VMRunnerConfiguration config) {
-		String[] prependBootCP= null;
-		String[] bootCP= null;
-		String[] appendBootCP= null;
-		Map map = config.getVMSpecificAttributesMap();
-		if (map != null) {
-			prependBootCP= (String[]) map.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND);
-			bootCP= (String[]) map.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH);
-			appendBootCP= (String[]) map.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND);
-		}
-		if (prependBootCP == null && bootCP == null && appendBootCP == null) {
-			// use old single attribute instead of new attributes if not specified
-			bootCP = config.getBootClassPath();
-		}
-		if (prependBootCP != null) {
-			arguments.add("-Xbootclasspath/p:" + convertClassPath(prependBootCP)); //$NON-NLS-1$
-		}
-		if (bootCP != null) {
-			if (bootCP.length > 0) {
-				arguments.add("-Xbootclasspath:" + convertClassPath(bootCP)); //$NON-NLS-1$
-			}
-		}
-		if (appendBootCP != null) {
-			arguments.add("-Xbootclasspath/a:" + convertClassPath(appendBootCP)); //$NON-NLS-1$
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
deleted file mode 100644
index 094d462..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
+++ /dev/null
@@ -1,589 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.jdt.launching.AbstractVMInstallType;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.osgi.service.environment.Constants;
-
-/**
- * A VM install type for VMs the conform to the standard
- * JDK installion layout.
- */
-public class StandardVMType extends AbstractVMInstallType {
-	
-	/**
-	 * The root path for the attached src
-	 */
-	private String fDefaultRootPath;
-	
-	/**
-	 * Map of the install path for which we were unable to generate
-	 * the library info during this session.
-	 */
-	private static Map fgFailedInstallPath= new HashMap();
-		
-	/**
-	 * Convenience handle to the system-specific file separator character
-	 */															
-	private static final char fgSeparator = File.separatorChar;
-
-	/**
-	 * The list of locations in which to look for the java executable in candidate
-	 * VM install locations, relative to the VM install location.
-	 */
-	private static final String[] fgCandidateJavaLocations = {
-							"bin" + fgSeparator + "javaw",                                //$NON-NLS-2$ //$NON-NLS-1$
-							"bin" + fgSeparator + "javaw.exe",                            //$NON-NLS-2$ //$NON-NLS-1$
-							"jre" + fgSeparator + "bin" + fgSeparator + "javaw",          //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-							"jre" + fgSeparator + "bin" + fgSeparator + "javaw.exe",      //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$									
-							"bin" + fgSeparator + "java",                                 //$NON-NLS-2$ //$NON-NLS-1$
-							"bin" + fgSeparator + "java.exe",                             //$NON-NLS-2$ //$NON-NLS-1$
-							"jre" + fgSeparator + "bin" + fgSeparator + "java",           //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-							"jre" + fgSeparator + "bin" + fgSeparator + "java.exe"};      //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$							
-	
-	/**
-	 * Starting in the specified VM install location, attempt to find the 'java' executable
-	 * file.  If found, return the corresponding <code>File</code> object, otherwise return
-	 * <code>null</code>.
-	 */
-	public static File findJavaExecutable(File vmInstallLocation) {
-		
-		// Try each candidate in order.  The first one found wins.  Thus, the order
-		// of fgCandidateJavaLocations is significant.
-		for (int i = 0; i < fgCandidateJavaLocations.length; i++) {
-			File javaFile = new File(vmInstallLocation, fgCandidateJavaLocations[i]);
-			if (javaFile.isFile()) {
-				return javaFile;
-			}
-		}		
-		return null;							
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallType#getName()
-	 */
-	public String getName() {
-		return LaunchingMessages.StandardVMType_Standard_VM_3; 
-	}
-
-	
-	protected IVMInstall doCreateVMInstall(String id) {
-		return new StandardVM(this, id);
-	}
-	
-	/**
-	 * Return library information corresponding to the specified install
-	 * location. If the info does not exist, create it using the given Java
-	 * executable.
-	 */
-	protected synchronized LibraryInfo getLibraryInfo(File javaHome, File javaExecutable) {
-		
-		// See if we already know the info for the requested VM.  If not, generate it.
-		String installPath = javaHome.getAbsolutePath();
-		LibraryInfo info = LaunchingPlugin.getLibraryInfo(installPath);
-		if (info == null) {
-			info= (LibraryInfo)fgFailedInstallPath.get(installPath);
-			if (info == null) {
-				info = generateLibraryInfo(javaHome, javaExecutable);
-				if (info == null) {
-					info = getDefaultLibraryInfo(javaHome);
-					fgFailedInstallPath.put(installPath, info);
-				} else {
-				    // only persist if we were able to generate info - see bug 70011
-				    LaunchingPlugin.setLibraryInfo(installPath, info);
-				}
-			}
-		} 
-		return info;
-	}	
-	
-	/**
-	 * Return <code>true</code> if the appropriate system libraries can be found for the
-	 * specified java executable, <code>false</code> otherwise.
-	 */
-	protected boolean canDetectDefaultSystemLibraries(File javaHome, File javaExecutable) {
-		LibraryLocation[] locations = getDefaultLibraryLocations(javaHome);
-		String version = getVMVersion(javaHome, javaExecutable);
-		return locations.length > 0 && !version.startsWith("1.1"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Returns the version of the VM at the given location, with the given
-	 * executable.
-	 * 
-	 * @param javaHome
-	 * @param javaExecutable
-	 * @return String
-	 */
-	protected String getVMVersion(File javaHome, File javaExecutable) {
-		LibraryInfo info = getLibraryInfo(javaHome, javaExecutable);
-		return info.getVersion();
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallType#detectInstallLocation()
-	 */
-	public File detectInstallLocation() {
-		// do not detect on the Mac OS
-		if (Platform.getOS().equals(Constants.OS_MACOSX)) {
-			return null;
-		}		
-		
-		// Retrieve the 'java.home' system property.  If that directory doesn't exist, 
-		// return null.
-		File javaHome; 
-		try {
-			javaHome= new File (System.getProperty("java.home")).getCanonicalFile(); //$NON-NLS-1$
-		} catch (IOException e) {
-			LaunchingPlugin.log(e);
-			return null;
-		}
-		if (!javaHome.exists()) {
-			return null;
-		}
-
-		// Find the 'java' executable file under the java home directory.  If it can't be
-		// found, return null.
-		File javaExecutable = findJavaExecutable(javaHome);
-		if (javaExecutable == null) {
-			return null;
-		}
-		
-		// If the reported java home directory terminates with 'jre', first see if 
-		// the parent directory contains the required libraries
-		boolean foundLibraries = false;
-		if (javaHome.getName().equalsIgnoreCase("jre")) { //$NON-NLS-1$
-			File parent= new File(javaHome.getParent());			
-			if (canDetectDefaultSystemLibraries(parent, javaExecutable)) {
-				javaHome = parent;
-				foundLibraries = true;
-			}
-		}	
-		
-		// If we haven't already found the libraries, look in the reported java home dir
-		if (!foundLibraries) {
-			if (!canDetectDefaultSystemLibraries(javaHome, javaExecutable)) {
-				return null;
-			}			
-		}
-		
-		return javaHome;
-	}
-
-	/**
-	 * Return an <code>IPath</code> corresponding to the single library file containing the
-	 * standard Java classes for most VMs version 1.2 and above.
-	 */
-	protected IPath getDefaultSystemLibrary(File javaHome) {
-		IPath jreLibPath= new Path(javaHome.getPath()).append("lib").append("rt.jar"); //$NON-NLS-2$ //$NON-NLS-1$
-		if (jreLibPath.toFile().isFile()) {
-			return jreLibPath;
-		}
-		return new Path(javaHome.getPath()).append("jre").append("lib").append("rt.jar"); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-	}
-	
-	/**
-	 * Returns a path to the source attachment for the given libaray, or
-	 * an empty path if none.
-	 * 
-	 * @param libLocation
-	 * @return a path to the source attachment for the given library, or
-	 *  an empty path if none
-	 */
-	protected IPath getDefaultSystemLibrarySource(File libLocation) {
-		File parent= libLocation.getParentFile();
-		while (parent != null) {
-			File parentsrc= new File(parent, "src.jar"); //$NON-NLS-1$
-			if (parentsrc.isFile()) {
-				setDefaultRootPath("src");//$NON-NLS-1$
-				return new Path(parentsrc.getPath());
-			}
-			parentsrc= new File(parent, "src.zip"); //$NON-NLS-1$
-			if (parentsrc.isFile()) {
-				setDefaultRootPath(""); //$NON-NLS-1$
-				return new Path(parentsrc.getPath());
-			}
-			parent = parent.getParentFile();
-		}
-		setDefaultRootPath(""); //$NON-NLS-1$
-		return Path.EMPTY; 
-	}
-
-	protected IPath getDefaultPackageRootPath() {
-		return new Path(getDefaultRootPath());
-	}
-
-	/**
-	 * NOTE: We do not add libraries from the "endorsed" directory explicitly, as
-	 * the bootpath contains these entries already (if they exist).
-	 * 
-	 * @see org.eclipse.jdt.launching.IVMInstallType#getDefaultLibraryLocations(File)
-	 */
-	public LibraryLocation[] getDefaultLibraryLocations(File installLocation) {
-
-		// Determine the java executable that corresponds to the specified install location
-		// and use this to generate library info.  If no java executable was found, 
-		// the 'standard' libraries will be returned.
-		File javaExecutable = findJavaExecutable(installLocation);
-		LibraryInfo libInfo;
-		if (javaExecutable == null) {
-			libInfo = getDefaultLibraryInfo(installLocation);
-		} else {
-			libInfo = getLibraryInfo(installLocation, javaExecutable);
-		}
-				
-		String[] bootpath = libInfo.getBootpath();
-		
-		List extensions = gatherAllLibraries(libInfo.getExtensionDirs(), installLocation);
-		List allLibs = new ArrayList(bootpath.length + extensions.size());
-		
-		URL url = getDefaultJavadocLocation(installLocation);
-		for (int i = 0; i < bootpath.length; i++) {
-			IPath path = new Path(bootpath[i]);
-			File lib = path.toFile(); 
-			if (lib.exists() && lib.isFile()) {
-				allLibs.add(new LibraryLocation(path,
-								getDefaultSystemLibrarySource(lib),
-								getDefaultPackageRootPath(),
-								url));
-			}
-			
-		}
-				
-		// Add all extension directories
-		Iterator iter = extensions.iterator();
-		while (iter.hasNext()) {
-			LibraryLocation lib = (LibraryLocation)iter.next();
-			// check for dups, in case bootpath contains an ext dir entry (see bug 50201)
-			if (!isDuplicateLibrary(allLibs, lib)) {
-				allLibs.add(lib);
-			}
-		}
-				
-		return (LibraryLocation[])allLibs.toArray(new LibraryLocation[allLibs.size()]);
-	}
-	
-	/**
-	 * Returns whether the given library is already contained in the given list.
-	 * Rather than checking the library for equality (which considers source attachments),
-	 * we check the actual OS path to the library for equality.
-	 * 
-	 * @param libs list of library locations
-	 * @param dup possible dup
-	 * @return whether dup is contained in list of libraries
-	 */
-	private boolean isDuplicateLibrary(List libs, LibraryLocation dup) {
-		String osPath = dup.getSystemLibraryPath().toOSString();
-		for (int i = 0; i < libs.size(); i++) {
-			LibraryLocation location = (LibraryLocation) libs.get(i);
-			if (location.getSystemLibraryPath().toOSString().equalsIgnoreCase(osPath)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns default library info for the given install location.
-	 * 
-	 * @param installLocation
-	 * @return LibraryInfo
-	 */
-	protected LibraryInfo getDefaultLibraryInfo(File installLocation) {
-		IPath rtjar = getDefaultSystemLibrary(installLocation);
-		File extDir = getDefaultExtensionDirectory(installLocation);
-		File endDir = getDefaultEndorsedDirectory(installLocation);
-		String[] dirs = null;
-		if (extDir == null) {
-			dirs = new String[0];
-		} else {
-			dirs = new String[] {extDir.getAbsolutePath()};
-		}
-		String[] endDirs = null;
-		if (endDir == null) {
-			endDirs = new String[0]; 
-		} else {
-			endDirs = new String[] {endDir.getAbsolutePath()};
-		}
-		return new LibraryInfo("???", new String[] {rtjar.toOSString()}, dirs, endDirs);		 //$NON-NLS-1$
-	}
-	
-	/**
-	 * Returns a list of all zips and jars contained in the given directories.
-	 * 
-	 * @param dirPaths a list of absolute paths of directories to search
-	 * @return List of all zips and jars
-	 */
-	protected List gatherAllLibraries(String[] dirPaths, File installLocation) {
-		List libraries = new ArrayList();
-		URL defaultJavadocLocation = getDefaultJavadocLocation(installLocation);
-		for (int i = 0; i < dirPaths.length; i++) {
-			File extDir = new File(dirPaths[i]);
-			if (extDir != null && extDir.exists() && extDir.isDirectory()) {
-				String[] names = extDir.list();
-				for (int j = 0; j < names.length; j++) {
-					String name = names[j];
-					File jar = new File(extDir, name);
-					if (jar.isFile()) {
-						int length = name.length();
-						if (length > 4) {
-							String suffix = name.substring(length - 4);
-							if (suffix.equalsIgnoreCase(".zip") || suffix.equalsIgnoreCase(".jar")) { //$NON-NLS-1$ //$NON-NLS-2$
-								try {
-									IPath libPath = new Path(jar.getCanonicalPath());
-									LibraryLocation library = new LibraryLocation(libPath, Path.EMPTY, Path.EMPTY, defaultJavadocLocation);
-									libraries.add(library);
-								} catch (IOException e) {
-									LaunchingPlugin.log(e);
-								}
-							}
-						}
-					}
-				}
-			}			
-		}
-		return libraries;
-	}
-		
-	/**
-	 * Returns the default location of the extension directory, based on the given
-	 * install location. The resulting file may not exist, or be <code>null</code>
-	 * if an extension directory is not supported.
-	 * 
-	 * @param installLocation 
-	 * @return default extension directory or <code>null</code>
-	 */
-	protected File getDefaultExtensionDirectory(File installLocation) {
-		File jre = null;
-		if (installLocation.getName().equalsIgnoreCase("jre")) { //$NON-NLS-1$
-			jre = installLocation;
-		} else {
-			jre = new File(installLocation, "jre"); //$NON-NLS-1$
-		}
-		File lib = new File(jre, "lib"); //$NON-NLS-1$
-		File ext = new File(lib, "ext"); //$NON-NLS-1$
-		return ext;
-	}
-
-	/**
-	 * Returns the default location of the endorsed directory, based on the
-	 * given install location. The resulting file may not exist, or be
-	 * <code>null</code> if an endorsed directory is not supported.
-	 * 
-	 * @param installLocation 
-	 * @return default endorsed directory or <code>null</code>
-	 */
-	protected File getDefaultEndorsedDirectory(File installLocation) {
-		File lib = new File(installLocation, "lib"); //$NON-NLS-1$
-		File ext = new File(lib, "endorsed"); //$NON-NLS-1$
-		return ext;
-	}
-
-	protected String getDefaultRootPath() {
-		return fDefaultRootPath;
-	}
-
-	protected void setDefaultRootPath(String defaultRootPath) {
-		fDefaultRootPath = defaultRootPath;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallType#validateInstallLocation(java.io.File)
-	 */
-	public IStatus validateInstallLocation(File javaHome) {
-		IStatus status = null;
-		if (Platform.getOS().equals(Constants.OS_MACOSX)) {
-			status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Standard_VM_not_supported_on_MacOS__1, null); 
-		} else {
-			File javaExecutable = findJavaExecutable(javaHome);
-			if (javaExecutable == null) {
-				status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Not_a_JDK_Root__Java_executable_was_not_found_1, null); //			
-			} else {
-				if (canDetectDefaultSystemLibraries(javaHome, javaExecutable)) {
-					status = new Status(IStatus.OK, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_ok_2, null); 
-				} else {
-					status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, LaunchingMessages.StandardVMType_Not_a_JDK_root__System_library_was_not_found__1, null); 
-				}
-			}
-		}
-		return status;		
-	}
-
-	/**
-	 * Generates library information for the given java executable. A main
-	 * program is run (<code>org.eclipse.jdt.internal.launching.support.
-	 * LibraryDetector</code>), that dumps the system properties for bootpath
-	 * and extension directories. This output is then parsed and cached for
-	 * future reference.
-	 * 
-	 * @return library info or <code>null</code> if none
-	 */	
-	protected LibraryInfo generateLibraryInfo(File javaHome, File javaExecutable) {
-		LibraryInfo info = null;
-		
-		// if this is 1.1.X, the properties will not exist		
-		IPath classesZip = new Path(javaHome.getAbsolutePath()).append("lib").append("classes.zip"); //$NON-NLS-1$ //$NON-NLS-2$
-		if (classesZip.toFile().exists()) {
-			return new LibraryInfo("1.1.x", new String[] {classesZip.toOSString()}, new String[0], new String[0]); //$NON-NLS-1$
-		}
-		//locate the launching support jar - it contains the main program to run
-		File file = LaunchingPlugin.getFileInPlugin(new Path("lib/launchingsupport.jar")); //$NON-NLS-1$
-		if (file.exists()) {	
-			String javaExecutablePath = javaExecutable.getAbsolutePath();
-			String[] cmdLine = new String[] {javaExecutablePath, "-classpath", file.getAbsolutePath(), "org.eclipse.jdt.internal.launching.support.LibraryDetector"};  //$NON-NLS-1$ //$NON-NLS-2$
-			Process p = null;
-			try {
-				p = Runtime.getRuntime().exec(cmdLine);
-				IProcess process = DebugPlugin.newProcess(new Launch(null, ILaunchManager.RUN_MODE, null), p, "Library Detection"); //$NON-NLS-1$
-				for (int i= 0; i < 200; i++) {
-					// Wait no more than 10 seconds (200 * 50 mils)
-					if (process.isTerminated()) {
-						break;
-					}
-					try {
-						Thread.sleep(50);
-					} catch (InterruptedException e) {
-					}
-				}
-				info = parseLibraryInfo(process);
-			} catch (IOException ioe) {
-				LaunchingPlugin.log(ioe);
-			} finally {
-				if (p != null) {
-					p.destroy();
-				}
-			}
-		}
-		if (info == null) {
-		    // log error that we were unable to generate library info - see bug 70011
-		    LaunchingPlugin.log(MessageFormat.format("Failed to retrieve default libraries for {0}", new String[]{javaHome.getAbsolutePath()})); //$NON-NLS-1$
-		}
-		return info;
-	}
-	
-	/**
-	 * Parses the output from 'LibraryDetector'.
-	 */
-	protected LibraryInfo parseLibraryInfo(IProcess process) {
-		IStreamsProxy streamsProxy = process.getStreamsProxy();
-		String text = null;
-		if (streamsProxy != null) {
-			text = streamsProxy.getOutputStreamMonitor().getContents();
-		}
-		if (text != null && text.length() > 0) {
-			int index = text.indexOf("|"); //$NON-NLS-1$
-			if (index > 0) { 
-				String version = text.substring(0, index);
-				text = text.substring(index + 1);
-				index = text.indexOf("|"); //$NON-NLS-1$	
-				if (index > 0) {
-					String bootPaths = text.substring(0, index);
-					String[] bootPath = parsePaths(bootPaths);
-					 
-					text = text.substring(index + 1);
-					index = text.indexOf("|"); //$NON-NLS-1$
-					
-					if (index > 0) {
-						String extDirPaths = text.substring(0, index);
-						String endorsedDirsPath = text.substring(index + 1);
-						String[] extDirs = parsePaths(extDirPaths);
-						String[] endDirs = parsePaths(endorsedDirsPath);
-						return new LibraryInfo(version, bootPath, extDirs, endDirs);
-					} 
-				}
-			}
-		} 
-		return null;
-	}
-	
-	protected String[] parsePaths(String paths) {
-		List list = new ArrayList();
-		int pos = 0;
-		int index = paths.indexOf(File.pathSeparatorChar, pos);
-		while (index > 0) {
-			String path = paths.substring(pos, index);
-			list.add(path);
-			pos = index + 1;	
-			index = paths.indexOf(File.pathSeparatorChar, pos);
-		}
-		String path = paths.substring(pos);
-		if (!path.equals("null")) { //$NON-NLS-1$
-			list.add(path);
-		}
-		return (String[])list.toArray(new String[list.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallType#disposeVMInstall(java.lang.String)
-	 */
-	public void disposeVMInstall(String id) {
-		IVMInstall vm = findVMInstall(id);
-		if (vm != null) {
-			String path = vm.getInstallLocation().getAbsolutePath();
-            LaunchingPlugin.setLibraryInfo(path, null);
-            fgFailedInstallPath.remove(path);
-		}		
-		super.disposeVMInstall(id);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.AbstractVMInstallType#getDefaultJavadocLocation(java.io.File)
-	 */
-	public URL getDefaultJavadocLocation(File installLocation) {
-		File javaExecutable = findJavaExecutable(installLocation);
-		if (javaExecutable != null) {
-			LibraryInfo libInfo = getLibraryInfo(installLocation, javaExecutable);
-			if (libInfo != null) {
-				String version = libInfo.getVersion();
-				if (version != null) {
-					try {
-						if (version.startsWith("1.5")) { //$NON-NLS-1$
-							return new URL("http://java.sun.com/j2se/1.5.0/docs/api/"); //$NON-NLS-1$
-						} else if (version.startsWith("1.4")) { //$NON-NLS-1$
-							return new URL("http://java.sun.com/j2se/1.4.2/docs/api/"); //$NON-NLS-1$
-						} else if (version.startsWith("1.3")) { //$NON-NLS-1$
-							return new URL("http://java.sun.com/j2se/1.3/docs/api/"); //$NON-NLS-1$
-						} else if (version.startsWith("1.2")) { //$NON-NLS-1$
-							return new URL("http://java.sun.com/products/jdk/1.2/docs/api"); //$NON-NLS-1$
-						}
-					} catch (MalformedURLException e) {
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java
deleted file mode 100644
index c5e8223..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VMDefinitionsContainer.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching;
-
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.jdt.launching.VMStandin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * This is a container for VM definitions such as the VM definitions that are
- * stored in the workbench preferences.  
- * <p>
- * An instance of this class may be obtained from an XML document by calling
- * <code>parseXMLIntoContainer</code>.
- * </p>
- * <p>
- * An instance of this class may be translated into an XML document by calling
- * <code>getAsXML</code>.
- * </p>
- * <p>
- * Clients may instantiate this class; it is not intended to be subclassed.
- * </p>
- * 
- * @since 2.1
- */
-public class VMDefinitionsContainer {
-		
-	/**
-	 * Map of VMInstallTypes to Lists of corresponding VMInstalls.
-	 */
-	private Map fVMTypeToVMMap;
-	
-	/**
-	 * Cached list of VMs in this container
-	 */
-	private List fVMList;
-	
-	/**
-	 * VMs managed by this container whose install locations don't actually exist.
-	 */
-	private List fInvalidVMList;
-			
-	/**
-	 * The composite identifier of the default VM.  This consists of the install type ID
-	 * plus an ID for the VM.
-	 */
-	private String fDefaultVMInstallCompositeID;
-	
-	/**
-	 * The identifier of the connector to use for the default VM.
-	 */
-	private String fDefaultVMInstallConnectorTypeID;
-	
-	/**
-	 * Constructs an empty VM container 
-	 */
-	public VMDefinitionsContainer() {
-		fVMTypeToVMMap = new HashMap(10);
-		fInvalidVMList = new ArrayList(10);	
-		fVMList = new ArrayList(10);		
-	}
-		
-	/**
-	 * Add the specified VM to the VM definitions managed by this container.
-	 * <p>
-	 * If distinguishing valid from invalid VMs is important, the specified VM must
-	 * have already had its install location set.  An invalid VM is one whose install
-	 * location doesn't exist.
-	 * </p>
-	 * 
-	 * @param vm the VM to be added to this container
-	 */
-	public void addVM(IVMInstall vm) {
-		if (!fVMList.contains(vm)) {	
-			IVMInstallType vmInstallType = vm.getVMInstallType();
-			List vmList = (List) fVMTypeToVMMap.get(vmInstallType);
-			if (vmList == null) {
-				vmList = new ArrayList(3);
-				fVMTypeToVMMap.put(vmInstallType, vmList);			
-			}
-			vmList.add(vm);
-			File installLocation = vm.getInstallLocation();
-			if (installLocation == null || !vmInstallType.validateInstallLocation(installLocation).isOK()) {
-				fInvalidVMList.add(vm);
-			}
-			fVMList.add(vm);
-		}
-	}
-	
-	/**
-	 * Add all VM's in the specified list to the VM definitions managed by this container.
-	 * <p>
-	 * If distinguishing valid from invalid VMs is important, the specified VMs must
-	 * have already had their install locations set.  An invalid VM is one whose install
-	 * location doesn't exist.
-	 * </p>
-	 * 
-	 * @param vmList a list of VMs to be added to this container
-	 */
-	public void addVMList(List vmList) {
-		Iterator iterator = vmList.iterator();
-		while (iterator.hasNext()) {
-			IVMInstall vm = (IVMInstall) iterator.next();
-			addVM(vm);
-		}
-	}
-
-	/**
-	 * Return a mapping of VM install types to lists of VMs.  The keys of this map are instances of
-	 * <code>IVMInstallType</code>.  The values are instances of <code>java.util.List</code>
-	 * which contain instances of <code>IVMInstall</code>.  
-	 * 
-	 * @return Map the mapping of VM install types to lists of VMs
-	 */
-	public Map getVMTypeToVMMap() {
-		return fVMTypeToVMMap;
-	}
-	
-	/**
-	 * Return a list of all VMs in this container, including any invalid VMs.  An invalid
-	 * VM is one whose install location does not exist on the file system.
-	 * The order of the list is not specified.
-	 * 
-	 * @return List the data structure containing all VMs managed by this container
-	 */
-	public List getVMList() {
-		return fVMList;
-	}
-	
-	/**
-	 * Return a list of all valid VMs in this container.  A valid VM is one whose install
-	 * location exists on the file system.  The order of the list is not specified.
-	 * 
-	 * @return List 
-	 */
-	public List getValidVMList() {
-		List resultList = getVMList();
-		resultList.removeAll(fInvalidVMList);
-		return resultList;
-	}
-	
-	/**
-	 * Returns the composite ID for the default VM.  The composite ID consists
-	 * of an ID for the VM install type together with an ID for VM.  This is
-	 * necessary because VM ids by themselves are not necessarily unique across
-	 * VM install types.
-	 * 
-	 * @return String returns the composite ID of the current default VM
-	 */
-	public String getDefaultVMInstallCompositeID(){
-		return fDefaultVMInstallCompositeID;
-	}
-	
-	/**
-	 * Sets the composite ID for the default VM.  The composite ID consists
-	 * of an ID for the VM install type together with an ID for VM.  This is
-	 * necessary because VM ids by themselves are not necessarily unique across
-	 * VM install types.
-	 * 
-	 * @param id identifies the new default VM using a composite ID
-	 */
-	public void setDefaultVMInstallCompositeID(String id){
-		fDefaultVMInstallCompositeID = id;
-	}
-	
-	/**
-	 * Return the default VM's connector type ID.
-	 * 
-	 * @return String the current value of the default VM's connector type ID
-	 */
-	public String getDefaultVMInstallConnectorTypeID() {
-		return fDefaultVMInstallConnectorTypeID;
-	}
-	
-	/**
-	 * Set the default VM's connector type ID.
-	 * 
-	 * @param id the new value of the default VM's connector type ID
-	 */
-	public void  setDefaultVMInstallConnectorTypeID(String id){
-		fDefaultVMInstallConnectorTypeID = id;
-	}
-	
-	/**
-	 * Return the VM definitions contained in this object as a String of XML.  The String
-	 * is suitable for storing in the workbench preferences.
-	 * <p>
-	 * The resulting XML is compatible with the static method <code>parseXMLIntoContainer</code>.
-	 * </p>
-	 * @return String the results of flattening this object into XML
-	 * @throws IOException if this method fails. Reasons include:<ul>
-	 * <li>serialization of the XML document failed</li>
-	 * </ul>
-	 * @throws ParserConfigurationException if creation of the XML document failed
-	 * @throws TransformerException if serialization of the XML document failed
-	 */
-	public String getAsXML() throws ParserConfigurationException, IOException, TransformerException {
-		
-		// Create the Document and the top-level node
-		Document doc = LaunchingPlugin.getDocument();
-		Element config = doc.createElement("vmSettings");    //$NON-NLS-1$
-		doc.appendChild(config);
-		
-		// Set the defaultVM attribute on the top-level node
-		if (getDefaultVMInstallCompositeID() != null) {
-			config.setAttribute("defaultVM", getDefaultVMInstallCompositeID()); //$NON-NLS-1$
-		}
-		
-		// Set the defaultVMConnector attribute on the top-level node
-		if (getDefaultVMInstallConnectorTypeID() != null) {
-			config.setAttribute("defaultVMConnector", getDefaultVMInstallConnectorTypeID()); //$NON-NLS-1$
-		}
-				
-		// Create a node for each install type represented in this container
-		Set vmInstallTypeSet = getVMTypeToVMMap().keySet();
-		Iterator keyIterator = vmInstallTypeSet.iterator();
-		while (keyIterator.hasNext()) {
-			IVMInstallType vmInstallType = (IVMInstallType) keyIterator.next();
-			Element vmTypeElement = vmTypeAsElement(doc, vmInstallType);
-			config.appendChild(vmTypeElement);
-		}
-		
-		// Serialize the Document and return the resulting String
-		return JavaLaunchConfigurationUtils.serializeDocument(doc);
-	}
-	
-	/**
-	 * Create and return a node for the specified VM install type in the specified Document.
-	 */
-	private Element vmTypeAsElement(Document doc, IVMInstallType vmType) {
-		
-		// Create a node for the vm type and set its 'id' attribute
-		Element element= doc.createElement("vmType");   //$NON-NLS-1$
-		element.setAttribute("id", vmType.getId());     //$NON-NLS-1$
-		
-		// For each vm of the specified type, create a subordinate node for it
-		List vmList = (List) getVMTypeToVMMap().get(vmType);
-		Iterator vmIterator = vmList.iterator();
-		while (vmIterator.hasNext()) {
-			IVMInstall vm = (IVMInstall) vmIterator.next();
-			Element vmElement = vmAsElement(doc, vm);
-			element.appendChild(vmElement);
-		}
-		
-		return element;
-	}
-	
-	/**
-	 * Create and return a node for the specified VM in the specified Document.
-	 */
-	private Element vmAsElement(Document doc, IVMInstall vm) {
-		
-		// Create the node for the VM and set its 'id' & 'name' attributes
-		Element element= doc.createElement("vm");        //$NON-NLS-1$
-		element.setAttribute("id", vm.getId());	         //$NON-NLS-1$
-		element.setAttribute("name", vm.getName());      //$NON-NLS-1$
-		
-		// Determine and set the 'path' attribute for the VM
-		String installPath= "";                          //$NON-NLS-1$
-		File installLocation= vm.getInstallLocation();
-		if (installLocation != null) {
-			installPath= installLocation.getAbsolutePath();
-		}
-		element.setAttribute("path", installPath);       //$NON-NLS-1$
-		
-		// If the 'libraryLocations' attribute is specified, create a node for it 
-		LibraryLocation[] libraryLocations= vm.getLibraryLocations();
-		if (libraryLocations != null) {
-			Element libLocationElement = libraryLocationsAsElement(doc, libraryLocations);
-			element.appendChild(libLocationElement);
-		}
-		
-		// Java doc location
-		URL url = vm.getJavadocLocation();
-		if (url != null) {
-			element.setAttribute("javadocURL", url.toExternalForm()); //$NON-NLS-1$
-		}
-		
-		if (vm instanceof IVMInstall2) {
-			String vmArgs = ((IVMInstall2)vm).getVMArgs();
-			if (vmArgs != null && vmArgs.length() > 0) {
-				element.setAttribute("vmargs", vmArgs); //$NON-NLS-1$
-			}
-		} else {
-			String[] vmArgs = vm.getVMArguments();
-			if (vmArgs != null && vmArgs.length > 0) {
-				StringBuffer buffer = new StringBuffer();
-				for (int i = 0; i < vmArgs.length; i++) {
-					buffer.append(vmArgs[i] + " "); //$NON-NLS-1$
-				}
-				element.setAttribute("vmargs", buffer.toString()); //$NON-NLS-1$
-			}
-		}
-		
-		return element;
-	}
-	
-	/**
-	 * Create and return a 'libraryLocations' node.  This node owns subordinate nodes that
-	 * list individual library locations.
-	 */
-	private static Element libraryLocationsAsElement(Document doc, LibraryLocation[] locations) {
-		Element root = doc.createElement("libraryLocations");       //$NON-NLS-1$
-		for (int i = 0; i < locations.length; i++) {
-			Element element = doc.createElement("libraryLocation");  //$NON-NLS-1$
-			element.setAttribute("jreJar", locations[i].getSystemLibraryPath().toString()); //$NON-NLS-1$
-			element.setAttribute("jreSrc", locations[i].getSystemLibrarySourcePath().toString()); //$NON-NLS-1$
-
-			IPath packageRootPath = locations[i].getPackageRootPath();
-            if (packageRootPath != null) {
-                element.setAttribute("pkgRoot", packageRootPath.toString()); //$NON-NLS-1$
-            }
-            
-			URL url= locations[i].getJavadocLocation();
-			if (url != null) {
-				element.setAttribute("jreJavadoc", url.toExternalForm()); //$NON-NLS-1$
-			}
-			root.appendChild(element);
-		}
-		return root;
-	}
-			
-	/**
-	 * Parse the VM definitions contained in the specified InputStream and return an instance
-	 * of <code>VMDefinitionsContainer</code>.
-	 * <p>
-	 * The VMs in the returned container are instances of <code>VMStandin</code>.
-	 * </p>
-	 * <p>
-	 * This method has no side-effects.  That is, no notifications are sent for VM adds,
-	 * changes, deletes, and the workbench preferences are not affected.
-	 * </p>
-	 * <p>
-	 * If the <code>getAsXML</code> method is called on the returned container object,
-	 * the resulting XML will be sematically equivalent (though not necessarily syntactically equivalent) as
-	 * the XML contained in <code>inputStream</code>.
-	 * </p>
-	 * @param inputStream the <code>InputStream</code> containing XML that declares a set of VMs and a default VM
-	 * @return VMDefinitionsContainer a container for the VM objects declared in <code>inputStream</code>
-	 * @throws IOException if this method fails. Reasons include:<ul>
-	 * <li>the XML in <code>inputStream</code> was badly formatted</li>
-	 * <li>the top-level node was not 'vmSettings'</li>
-	 * </ul>
-	 */
-	public static VMDefinitionsContainer parseXMLIntoContainer(InputStream inputStream) throws IOException {
-		
-		// Create the container to populate
-		VMDefinitionsContainer container = new VMDefinitionsContainer();
-
-		// Wrapper the stream for efficient parsing
-		InputStream stream= new BufferedInputStream(inputStream);
-		Reader reader= new InputStreamReader(stream);
-
-		// Do the parsing and obtain the top-level node
-		Element config= null;		
-		try {
-			DocumentBuilder parser= DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			config = parser.parse(new InputSource(reader)).getDocumentElement();
-		} catch (SAXException e) {
-			throw new IOException(LaunchingMessages.JavaRuntime_badFormat); 
-		} catch (ParserConfigurationException e) {
-			reader.close();
-			throw new IOException(LaunchingMessages.JavaRuntime_badFormat); 
-		} finally {
-			reader.close();
-		}
-		
-		// If the top-level node wasn't what we expected, bail out
-		if (!config.getNodeName().equalsIgnoreCase("vmSettings")) { //$NON-NLS-1$
-			throw new IOException(LaunchingMessages.JavaRuntime_badFormat); 
-		}
-		
-		// Populate the default VM-related fields
-		container.setDefaultVMInstallCompositeID(config.getAttribute("defaultVM")); //$NON-NLS-1$
-		container.setDefaultVMInstallConnectorTypeID(config.getAttribute("defaultVMConnector")); //$NON-NLS-1$
-		
-		// Traverse the parsed structure and populate the VMType to VM Map
-		NodeList list = config.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element vmTypeElement = (Element) node;
-				if (vmTypeElement.getNodeName().equalsIgnoreCase("vmType")) { //$NON-NLS-1$
-					populateVMTypes(vmTypeElement, container);
-				}
-			}
-		}
-		
-		return container;
-	}
-	
-	/**
-	 * For the specified vm type node, parse all subordinate VM definitions and add them
-	 * to the specified container.
-	 */
-	private static void populateVMTypes(Element vmTypeElement, VMDefinitionsContainer container) {
-		
-		// Retrieve the 'id' attribute and the corresponding VM type object
-		String id = vmTypeElement.getAttribute("id");         //$NON-NLS-1$
-		IVMInstallType vmType= JavaRuntime.getVMInstallType(id);
-		if (vmType != null) {
-			
-			// For each VM child node, populate the container with a subordinate node
-			NodeList vmNodeList = vmTypeElement.getChildNodes();
-			for (int i = 0; i < vmNodeList.getLength(); ++i) {
-				Node vmNode = vmNodeList.item(i);
-				short type = vmNode.getNodeType();
-				if (type == Node.ELEMENT_NODE) {
-					Element vmElement = (Element) vmNode;
-					if (vmElement.getNodeName().equalsIgnoreCase("vm")) { //$NON-NLS-1$
-						populateVMForType(vmType, vmElement, container);
-					}
-				}
-			}
-		} else {
-			LaunchingPlugin.log(LaunchingMessages.JavaRuntime_VM_type_element_with_unknown_id_1); 
-		}
-	}
-
-	/**
-	 * Parse the specified VM node, create a VMStandin for it, and add this to the 
-	 * specified container.
-	 */
-	private static void populateVMForType(IVMInstallType vmType, Element vmElement, VMDefinitionsContainer container) {
-		String id= vmElement.getAttribute("id"); //$NON-NLS-1$
-		if (id != null) {
-			
-			// Retrieve the 'path' attribute.  If none, skip this node.
-			String installPath= vmElement.getAttribute("path"); //$NON-NLS-1$
-			if (installPath == null) {
-				return;
-			}
-						
-			// Create a VMStandin for the node and set its 'name' & 'installLocation' attributes
-			VMStandin vmStandin = new VMStandin(vmType, id);
-			vmStandin.setName(vmElement.getAttribute("name")); //$NON-NLS-1$
-			File installLocation= new File(installPath);
-			vmStandin.setInstallLocation(installLocation);
-			container.addVM(vmStandin);
-			
-			// Look for subordinate nodes.  These may be 'libraryLocation',
-			// 'libraryLocations' or 'versionInfo'.
-			NodeList list = vmElement.getChildNodes();
-			int length = list.getLength();
-			for (int i = 0; i < length; ++i) {
-				Node node = list.item(i);
-				short type = node.getNodeType();
-				if (type == Node.ELEMENT_NODE) {
-					Element subElement = (Element)node;
-					String subElementName = subElement.getNodeName();
-					if (subElementName.equals("libraryLocation")) { //$NON-NLS-1$
-						LibraryLocation loc = getLibraryLocation(subElement);
-						vmStandin.setLibraryLocations(new LibraryLocation[]{loc});
-						break;
-					} else if (subElementName.equals("libraryLocations")) { //$NON-NLS-1$
-						setLibraryLocations(vmStandin, subElement);
-						break;
-					}
-				}
-			}
-			
-			// javadoc URL
-			String externalForm = vmElement.getAttribute("javadocURL"); //$NON-NLS-1$
-			if (externalForm != null && externalForm.length() > 0) {
-				try {
-					vmStandin.setJavadocLocation(new URL(externalForm));
-				} catch (MalformedURLException e) {
-					LaunchingPlugin.log(e);
-				}
-			}
-			
-			// vm Arguments
-			String vmArgs = vmElement.getAttribute("vmargs"); //$NON-NLS-1$
-			if (vmArgs != null && vmArgs.length() >0) {
-				vmStandin.setVMArgs(vmArgs);
-			}
-		} else {
-			LaunchingPlugin.log(LaunchingMessages.JavaRuntime_VM_element_specified_with_no_id_attribute_2); 
-		}
-	}	
-	
-	/**
-	 * Create & return a LibraryLocation object populated from the attribute values
-	 * in the specified node.
-	 */
-	private static LibraryLocation getLibraryLocation(Element libLocationElement) {
-		String jreJar= libLocationElement.getAttribute("jreJar"); //$NON-NLS-1$
-		String jreSrc= libLocationElement.getAttribute("jreSrc"); //$NON-NLS-1$
-		String pkgRoot= libLocationElement.getAttribute("pkgRoot"); //$NON-NLS-1$
-		String jreJavadoc= libLocationElement.getAttribute("jreJavadoc"); //$NON-NLS-1$
-		URL javadocURL= null;
-		if (jreJavadoc.length() == 0) {
-			jreJavadoc= null;
-		} else {
-			try {
-				javadocURL= new URL(jreJavadoc);
-			} catch (MalformedURLException e) {
-				LaunchingPlugin.log(LaunchingMessages.JavaRuntime_Library_location_element_incorrectly_specified_3); 
-			}
-		}
-		if (jreJar != null && jreSrc != null && pkgRoot != null) {
-			return new LibraryLocation(new Path(jreJar), new Path(jreSrc), new Path(pkgRoot), javadocURL);
-		}
-		LaunchingPlugin.log(LaunchingMessages.JavaRuntime_Library_location_element_incorrectly_specified_3); 
-		return null;
-	}
-	
-	/**
-	 * Set the LibraryLocations on the specified VM, by extracting the subordinate
-	 * nodes from the specified 'lirbaryLocations' node.
-	 */
-	private static void setLibraryLocations(IVMInstall vm, Element libLocationsElement) {
-		NodeList list = libLocationsElement.getChildNodes();
-		int length = list.getLength();
-		List locations = new ArrayList(length);
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element libraryLocationElement= (Element)node;
-				if (libraryLocationElement.getNodeName().equals("libraryLocation")) { //$NON-NLS-1$
-					locations.add(getLibraryLocation(libraryLocationElement));
-				}
-			}
-		}	
-		vm.setLibraryLocations((LibraryLocation[])locations.toArray(new LibraryLocation[locations.size()]));
-	}
-		
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java
deleted file mode 100644
index a588448..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathEntry.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-public class VariableClasspathEntry extends AbstractRuntimeClasspathEntry {
-	public static final String TYPE_ID = "org.eclipse.jdt.launching.classpathentry.variableClasspathEntry"; //$NON-NLS-1$
-	private String variableString;
-	
-	public VariableClasspathEntry() {
-	}
-	
-	public VariableClasspathEntry(String variableString) {
-		this.variableString = variableString;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.launching.AbstractRuntimeClasspathEntry#buildMemento(org.w3c.dom.Document, org.w3c.dom.Element)
-	 */
-	protected void buildMemento(Document document, Element memento) throws CoreException {
-		memento.setAttribute("variableString", variableString); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#initializeFrom(org.w3c.dom.Element)
-	 */
-	public void initializeFrom(Element memento) throws CoreException {
-		variableString = memento.getAttribute("variableString"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getTypeId()
-	 */
-	public String getTypeId() {
-		return TYPE_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getRuntimeClasspathEntries(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2#getName()
-	 */
-	public String getName() {
-		return variableString; 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getType()
-	 */
-	public int getType() {
-		return OTHER; 
-	}
-	/**
-	 * @return Returns the variableString.
-	 */
-	public String getVariableString() {
-		return variableString;
-	}
-	/**
-	 * @param variableString The variableString to set.
-	 */
-	public void setVariableString(String variableString) {
-		this.variableString = variableString;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry#getPath()
-	 */
-//	public IPath getPath() {
-//		try {
-//			String path = StringVariableManager.getDefault().performStringSubstitution(variableString);
-//			return new Path(path);
-//		} catch (CoreException ce) {
-//			return null;
-//		}
-//	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		if (variableString != null)
-			return variableString.hashCode();
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof VariableClasspathEntry) {
-			VariableClasspathEntry other= (VariableClasspathEntry)obj;
-			if (variableString != null) {
-				return variableString.equals(other.variableString);
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java
deleted file mode 100644
index c6f0cc2..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/VariableClasspathResolver.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.internal.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-
-public class VariableClasspathResolver implements IRuntimeClasspathEntryResolver {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
-		return resolveRuntimeClasspathEntry(entry);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(org.eclipse.jdt.launching.IRuntimeClasspathEntry, org.eclipse.jdt.core.IJavaProject)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		return resolveRuntimeClasspathEntry(entry);
-	}
-
-	private IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry) throws CoreException{
-		String variableString = ((VariableClasspathEntry)entry).getVariableString();
-		String strpath = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(variableString);
-		IPath path = new Path(strpath).makeAbsolute();
-		IRuntimeClasspathEntry archiveEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-		return new IRuntimeClasspathEntry[] { archiveEntry };	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver#resolveVMInstall(org.eclipse.jdt.core.IClasspathEntry)
-	 */
-	public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
deleted file mode 100644
index 7a7d017..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,966 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModelMarker;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.internal.launching.JRERuntimeClasspathEntryResolver;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupDirector;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-/**
- * Abstract implementation of a Java launch configuration delegate. Provides
- * convenience methods for accessing and verifying launch configuration
- * attributes.
- * <p>
- * Clients implementing Java launch configuration delegates should subclass this
- * class.
- * </p>
- * 
- * @since 2.0
- */
-public abstract class AbstractJavaLaunchConfigurationDelegate
-		extends
-			LaunchConfigurationDelegate implements IDebugEventSetListener {
-	/**
-	 * A list of prequisite projects ordered by their build order.
-	 */
-	private IProject[] fOrderedProjects;
-	/**
-	 * Convenience method to get the launch manager.
-	 * 
-	 * @return the launch manager
-	 */
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	/**
-	 * Throws a core exception with an error status object built from the given
-	 * message, lower level exception, and error code.
-	 * 
-	 * @param message
-	 *            the status message
-	 * @param exception
-	 *            lower level exception associated with the error, or
-	 *            <code>null</code> if none
-	 * @param code
-	 *            error code
-	 * @throws CoreException
-	 *             the "abort" core exception
-	 */
-	protected void abort(String message, Throwable exception, int code)
-			throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin
-				.getUniqueIdentifier(), code, message, exception));
-	}
-	/**
-	 * Returns the VM install specified by the given launch configuration, or
-	 * <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM install specified by the given launch configuration, or
-	 *         <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public IVMInstall getVMInstall(ILaunchConfiguration configuration)
-			throws CoreException {
-		return JavaRuntime.computeVMInstall(configuration);
-	}
-	/**
-	 * Returns the VM install name specified by the given launch configuration,
-	 * or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM install name specified by the given launch configuration,
-	 *         or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getVMInstallName(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME,
-				(String) null);
-	}
-	/**
-	 * Returns the VM install type specified by the given launch configuration,
-	 * or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM install type specified by the given launch configuration,
-	 *         or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public IVMInstallType getVMInstallType(ILaunchConfiguration configuration)
-			throws CoreException {
-		String id = getVMInstallTypeId(configuration);
-		if (id != null) {
-			IVMInstallType type = JavaRuntime.getVMInstallType(id);
-			if (type != null) {
-				return type;
-			}
-		}
-		return null;
-	}
-	/**
-	 * Returns the VM install type identifier specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM install type identifier specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getVMInstallTypeId(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE,
-				(String) null);
-	}
-	/**
-	 * Verifies the VM install specified by the given launch configuration
-	 * exists and returns the VM install.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM install specified by the given launch configuration
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute, the attribute is
-	 *                unspecified, or if the home location is unspecified or
-	 *                does not exist
-	 */
-	public IVMInstall verifyVMInstall(ILaunchConfiguration configuration)
-			throws CoreException {
-		IVMInstall vm = getVMInstall(configuration);
-		if (vm == null) {
-			abort(
-					LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_The_specified_JRE_installation_does_not_exist_4, 
-					null,
-					IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); 
-		}
-		File location = vm.getInstallLocation();
-		if (location == null) {
-			abort(
-					MessageFormat
-							.format(
-									LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_not_specified_for__0__5, 
-									new String[]{vm.getName()}),
-					null,
-					IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); 
-		}
-		if (!location.exists()) {
-			abort(
-					MessageFormat
-							.format(
-									LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_for__0__does_not_exist___1__6, 
-									new String[]{vm.getName(),
-											location.getAbsolutePath()}),
-					null,
-					IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); 
-		}
-		return vm;
-	}
-	/**
-	 * Returns the VM connector identifier specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM connector identifier specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getVMConnectorId(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_VM_CONNECTOR,
-				(String) null);
-	}
-	/**
-	 * Returns entries that should appear on the bootstrap portion of the
-	 * classpath as specified by the given launch configuration, as an array of
-	 * resolved strings. The returned array is <code>null</code> if all
-	 * entries are standard (i.e. appear by default), or empty to represent an
-	 * empty bootpath.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the bootpath specified by the given launch configuration. An
-	 *         empty bootpath is specfied by an empty array, and
-	 *         <code>null</code> represents a default boothpath.
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String[] getBootpath(ILaunchConfiguration configuration)
-			throws CoreException {
-		String[][] paths = getBootpathExt(configuration);
-		String[] pre = paths[0];
-		String[] main = paths[1];
-		String[] app = paths[2];
-		if (pre == null && main == null && app == null) {
-			// default
-			return null;
-		}
-		IRuntimeClasspathEntry[] entries = JavaRuntime
-				.computeUnresolvedRuntimeClasspath(configuration);
-		entries = JavaRuntime.resolveRuntimeClasspath(entries, configuration);
-		List bootEntries = new ArrayList(entries.length);
-		boolean empty = true;
-		boolean allStandard = true;
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i].getClasspathProperty() != IRuntimeClasspathEntry.USER_CLASSES) {
-				String location = entries[i].getLocation();
-				if (location != null) {
-					empty = false;
-					bootEntries.add(location);
-					allStandard = allStandard
-							&& entries[i].getClasspathProperty() == IRuntimeClasspathEntry.STANDARD_CLASSES;
-				}
-			}
-		}
-		if (empty) {
-			return new String[0];
-		} else if (allStandard) {
-			return null;
-		} else {
-			return (String[]) bootEntries
-					.toArray(new String[bootEntries.size()]);
-		}
-	}
-	/**
-	 * Returns three sets of entries which represent the boot classpath
-	 * specified in the launch configuration, as an array of three arrays of
-	 * resolved strings. The first array represents the classpath that should be
-	 * prepended to the boot classpath. The second array represents the main
-	 * part of the boot classpath -<code>null</code> represents the default
-	 * bootclasspath. The third array represents the classpath that should be
-	 * appended to the boot classpath.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return a description of the boot classpath specified by the given launch
-	 *         configuration.
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 * @since 3.0
-	 */
-	public String[][] getBootpathExt(ILaunchConfiguration configuration)
-			throws CoreException {
-		String[][] bootpathInfo = new String[3][];
-		IRuntimeClasspathEntry[] entries = JavaRuntime
-				.computeUnresolvedRuntimeClasspath(configuration);
-		List bootEntriesPrepend = new ArrayList();
-		int index = 0;
-		boolean jreContainerFound = false;
-		while (!jreContainerFound && index < entries.length) {
-			IRuntimeClasspathEntry entry = entries[index++];
-			if (entry.getClasspathProperty() == IRuntimeClasspathEntry.BOOTSTRAP_CLASSES
-					|| entry.getClasspathProperty() == IRuntimeClasspathEntry.STANDARD_CLASSES) {
-				int entryKind = entry.getClasspathEntry().getEntryKind();
-				String segment0 = entry.getPath().segment(0);
-				if (entryKind == IClasspathEntry.CPE_CONTAINER
-						&& JavaRuntime.JRE_CONTAINER.equals(segment0)
-						|| entryKind == IClasspathEntry.CPE_VARIABLE
-						&& JavaRuntime.JRELIB_VARIABLE.equals(segment0)) {
-					jreContainerFound = true;
-				} else {
-					bootEntriesPrepend.add(entry);
-				}
-			}
-		}
-		IRuntimeClasspathEntry[] bootEntriesPrep = JavaRuntime
-				.resolveRuntimeClasspath(
-						(IRuntimeClasspathEntry[]) bootEntriesPrepend
-								.toArray(new IRuntimeClasspathEntry[bootEntriesPrepend
-										.size()]), configuration);
-		String[] entriesPrep = null;
-		if (bootEntriesPrep.length > 0) {
-			entriesPrep = new String[bootEntriesPrep.length];
-			for (int i = 0; i < bootEntriesPrep.length; i++) {
-				entriesPrep[i] = bootEntriesPrep[i].getLocation();
-			}
-		}
-		if (jreContainerFound) {
-			List bootEntriesAppend = new ArrayList();
-			for (; index < entries.length; index++) {
-				IRuntimeClasspathEntry entry = entries[index];
-				if (entry.getClasspathProperty() == IRuntimeClasspathEntry.BOOTSTRAP_CLASSES) {
-					bootEntriesAppend.add(entry);
-				}
-			}
-			bootpathInfo[0] = entriesPrep;
-			IRuntimeClasspathEntry[] bootEntriesApp = JavaRuntime
-					.resolveRuntimeClasspath(
-							(IRuntimeClasspathEntry[]) bootEntriesAppend
-									.toArray(new IRuntimeClasspathEntry[bootEntriesAppend
-											.size()]), configuration);
-			if (bootEntriesApp.length > 0) {
-				bootpathInfo[2] = new String[bootEntriesApp.length];
-				for (int i = 0; i < bootEntriesApp.length; i++) {
-					bootpathInfo[2][i] = bootEntriesApp[i].getLocation();
-				}
-			}
-			IVMInstall install = getVMInstall(configuration);
-			LibraryLocation[] libraryLocations = install.getLibraryLocations();
-			if (libraryLocations != null) {
-				// determine if explicit bootpath should be used
-				if (!JRERuntimeClasspathEntryResolver.isSameArchives(libraryLocations, install.getVMInstallType().getDefaultLibraryLocations(install.getInstallLocation()))) {
-					// non-default JRE libaries - use explicit bootpath only
-					String[] bootpath = new String[bootEntriesPrep.length
-							+ libraryLocations.length + bootEntriesApp.length];
-					if (bootEntriesPrep.length > 0) {
-						System.arraycopy(bootpathInfo[0], 0, bootpath, 0,
-								bootEntriesPrep.length);
-					}
-					int dest = bootEntriesPrep.length;
-					for (int i = 0; i < libraryLocations.length; i++) {
-						bootpath[dest] = libraryLocations[i].getSystemLibraryPath()
-								.toOSString();
-						dest++;
-					}
-					if (bootEntriesApp.length > 0) {
-						System.arraycopy(bootpathInfo[2], 0, bootpath, dest,
-								bootEntriesApp.length);
-					}
-					bootpathInfo[0] = null;
-					bootpathInfo[1] = bootpath;
-					bootpathInfo[2] = null;
-				}
-			}
-		} else {
-			if (entriesPrep == null) {
-				bootpathInfo[1] = new String[0];
-			} else {
-				bootpathInfo[1] = entriesPrep;
-			}
-		}
-		return bootpathInfo;
-	}
-	/**
-	 * Returns the entries that should appear on the user portion of the
-	 * classpath as specified by the given launch configuration, as an array of
-	 * resolved strings. The returned array is empty if no classpath is
-	 * specified.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the classpath specified by the given launch configuration,
-	 *         possibly an empty array
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String[] getClasspath(ILaunchConfiguration configuration)
-			throws CoreException {
-		IRuntimeClasspathEntry[] entries = JavaRuntime
-				.computeUnresolvedRuntimeClasspath(configuration);
-		entries = JavaRuntime.resolveRuntimeClasspath(entries, configuration);
-		List userEntries = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i].getClasspathProperty() == IRuntimeClasspathEntry.USER_CLASSES) {
-				String location = entries[i].getLocation();
-				if (location != null) {
-					userEntries.add(location);
-				}
-			}
-		}
-		return (String[]) userEntries.toArray(new String[userEntries.size()]);
-	}
-	/**
-	 * Returns the Java project specified by the given launch configuration, or
-	 * <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the Java project specified by the given launch configuration, or
-	 *         <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public IJavaProject getJavaProject(ILaunchConfiguration configuration)
-			throws CoreException {
-		String projectName = getJavaProjectName(configuration);
-		if (projectName != null) {
-			projectName = projectName.trim();
-			if (projectName.length() > 0) {
-				IProject project = ResourcesPlugin.getWorkspace().getRoot()
-						.getProject(projectName);
-				IJavaProject javaProject = JavaCore.create(project);
-				if (javaProject != null && javaProject.exists()) {
-					return javaProject;
-				}
-			}
-		}
-		return null;
-	}
-	/**
-	 * Returns the Java project name specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the Java project name specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getJavaProjectName(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME,
-				(String) null);
-	}
-	/**
-	 * Returns the main type name specified by the given launch configuration,
-	 * or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the main type name specified by the given launch configuration,
-	 *         or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getMainTypeName(ILaunchConfiguration configuration)
-			throws CoreException {
-		String mainType = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
-				(String) null);
-		if (mainType == null) {
-			return null;
-		}
-		return VariablesPlugin.getDefault().getStringVariableManager()
-				.performStringSubstitution(mainType);
-	}
-	/**
-	 * Returns the program arguments specified by the given launch
-	 * configuration, as a string. The returned string is empty if no program
-	 * arguments are specified.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the program arguments specified by the given launch
-	 *         configuration, possibly an empty string
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getProgramArguments(ILaunchConfiguration configuration)
-			throws CoreException {
-		String arguments = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
-		return VariablesPlugin.getDefault().getStringVariableManager()
-				.performStringSubstitution(arguments);
-	}
-	/**
-	 * Returns the VM arguments specified by the given launch configuration, as
-	 * a string. The returned string is empty if no VM arguments are specified.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM arguments specified by the given launch configuration,
-	 *         possibly an empty string
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String getVMArguments(ILaunchConfiguration configuration) throws CoreException {
-		String arguments = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
-		String args = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(arguments);
-		int libraryPath = args.indexOf("-Djava.library.path"); //$NON-NLS-1$
-		if (libraryPath < 0) {
-			// if a library path is alread specified, do not override
-			String[] javaLibraryPath = getJavaLibraryPath(configuration);
-			if (javaLibraryPath != null && javaLibraryPath.length > 0) {
-				StringBuffer path = new StringBuffer(args);
-				path.append(" -Djava.library.path="); //$NON-NLS-1$
-				path.append("\""); //$NON-NLS-1$
-				for (int i = 0; i < javaLibraryPath.length; i++) {
-					if (i > 0) {
-						path.append(File.pathSeparatorChar);
-					}
-					path.append(javaLibraryPath[i]);
-				}
-				path.append("\""); //$NON-NLS-1$
-				args = path.toString();
-			}
-		}
-		return args;
-	}
-	/**
-	 * Returns the Map of VM-specific attributes specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the <code>Map</code> of VM-specific attributes
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public Map getVMSpecificAttributesMap(ILaunchConfiguration configuration)
-			throws CoreException {
-		Map map = configuration
-				.getAttribute(
-						IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP,
-						(Map) null);
-		String[][] paths = getBootpathExt(configuration);
-		String[] pre = paths[0];
-		String[] boot = paths[1];
-		String[] app = paths[2];
-		if (pre != null || app != null || boot != null) {
-			if (map == null) {
-				map = new HashMap(3);
-			}
-			if (pre != null) {
-				map
-						.put(
-								IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND,
-								pre);
-			}
-			if (app != null) {
-				map.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND,
-						app);
-			}
-			if (boot != null) {
-				map.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH, boot);
-			}
-		}
-		return map;
-	}
-	/**
-	 * Returns the working directory specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the working directory specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public File getWorkingDirectory(ILaunchConfiguration configuration)
-			throws CoreException {
-		return verifyWorkingDirectory(configuration);
-	}
-	/**
-	 * Returns the working directory path specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the working directory path specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public IPath getWorkingDirectoryPath(ILaunchConfiguration configuration)
-			throws CoreException {
-		String path = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
-				(String) null);
-		if (path != null) {
-			path = VariablesPlugin.getDefault().getStringVariableManager()
-					.performStringSubstitution(path);
-			return new Path(path);
-		}
-		return null;
-	}
-	/**
-	 * Verifies a Java project is specified by the given launch configuration,
-	 * and returns the Java project.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the Java project specified by the given launch configuration
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute or the attribute is
-	 *                unspecified
-	 */
-	public IJavaProject verifyJavaProject(ILaunchConfiguration configuration)
-			throws CoreException {
-		String name = getJavaProjectName(configuration);
-		if (name == null) {
-			abort(
-					LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Java_project_not_specified_9, 
-					null,
-					IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT); 
-		}
-		IJavaProject project = getJavaProject(configuration);
-		if (project == null) {
-			abort(
-					LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Project_does_not_exist_or_is_not_a_Java_project_10, 
-					null,
-					IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT); 
-		}
-		return project;
-	}
-	/**
-	 * Verifies a main type name is specified by the given launch configuration,
-	 * and returns the main type name.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the main type name specified by the given launch configuration
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute or the attribute is
-	 *                unspecified
-	 */
-	public String verifyMainTypeName(ILaunchConfiguration configuration)
-			throws CoreException {
-		String name = getMainTypeName(configuration);
-		if (name == null) {
-			abort(
-					LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Main_type_not_specified_11, 
-					null,
-					IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); 
-		}
-		return name;
-	}
-	/**
-	 * Verifies the working directory specified by the given launch
-	 * configuration exists, and returns the working directory, or
-	 * <code>null</code> if none is specified.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the working directory specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public File verifyWorkingDirectory(ILaunchConfiguration configuration)
-			throws CoreException {
-		IPath path = getWorkingDirectoryPath(configuration);
-		if (path == null) {
-			// default working dir is the project if this config has a project
-			IJavaProject jp = getJavaProject(configuration);
-			if (jp != null) {
-				IProject p = jp.getProject();
-				return p.getLocation().toFile();
-			}
-		} else {
-			if (path.isAbsolute()) {
-				File dir = new File(path.toOSString());
-				if (dir.isDirectory()) {
-					return dir;
-				}
-				// This may be a workspace relative path returned by a variable.
-				// However variable paths start with a slash and thus are thought to
-				// be absolute
-				IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-				if (res instanceof IContainer && res.exists()) {
-					return res.getLocation().toFile();
-				}
-				abort(
-					MessageFormat
-							.format(
-									LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, 
-									new String[]{path.toString()}),
-					null,
-					IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); 
-			} else {
-				IResource res = ResourcesPlugin.getWorkspace().getRoot()
-						.findMember(path);
-				if (res instanceof IContainer && res.exists()) {
-					return res.getLocation().toFile();
-				}
-				abort(
-					MessageFormat
-							.format(
-									LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12, 
-									new String[]{path.toString()}),
-					null,
-					IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); 
-			}
-		}
-		return null;
-	}
-	/**
-	 * Returns whether the given launch configuration specifies that termination
-	 * is allowed.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return whether termination is allowed
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public boolean isAllowTerminate(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, false);
-	}
-	/**
-	 * Returns whether the given launch configuration specifies that execution
-	 * should suspend on entry of the main method.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return whether execution should suspend in main
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 * @since 2.1
-	 */
-	public boolean isStopInMain(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);
-	}
-	/**
-	 * Assigns a default source locator to the given launch if a source locator
-	 * has not yet been assigned to it, and the associated launch configuration
-	 * does not specify a source locator.
-	 * 
-	 * @param launch
-	 *            launch object
-	 * @param configuration
-	 *            configuration being launched
-	 * @exception CoreException
-	 *                if unable to set the source locator
-	 */
-	protected void setDefaultSourceLocator(ILaunch launch,
-			ILaunchConfiguration configuration) throws CoreException {
-		//  set default source locator if none specified
-		if (launch.getSourceLocator() == null) {
-			ISourceLookupDirector sourceLocator = new JavaSourceLookupDirector();
-			sourceLocator
-					.setSourcePathComputer(getLaunchManager()
-							.getSourcePathComputer(
-									"org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer")); //$NON-NLS-1$
-			sourceLocator.initializeDefaults(configuration);
-			launch.setSourceLocator(sourceLocator);
-		}
-	}
-	/**
-	 * Determines if the given launch configuration specifies the "stop-in-main"
-	 * attribute, and sets up an event listener to handle the option if
-	 * required.
-	 * 
-	 * @param configuration
-	 *            configuration being launched
-	 * @exception CoreException
-	 *                if unable to access the attribute
-	 * @since 2.1
-	 */
-	protected void prepareStopInMain(ILaunchConfiguration configuration)
-			throws CoreException {
-		if (isStopInMain(configuration)) {
-			// This listener does not remove itself from the debug plug-in
-			// as an event listener (there is no dispose notification for
-			// launch delegates). However, since there is only one delegate
-			// instantiated per config type, this is tolerable.
-			DebugPlugin.getDefault().addDebugEventListener(this);
-		}
-	}
-	/**
-	 * Handles the "stop-in-main" option.
-	 * 
-	 * @param events
-	 *            the debug events.
-	 * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-	 */
-	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			DebugEvent event = events[i];
-			if (event.getKind() == DebugEvent.CREATE
-					&& event.getSource() instanceof IJavaDebugTarget) {
-				IJavaDebugTarget target = (IJavaDebugTarget) event.getSource();
-				ILaunch launch = target.getLaunch();
-				if (launch != null) {
-					ILaunchConfiguration configuration = launch
-							.getLaunchConfiguration();
-					if (configuration != null) {
-						try {
-							if (isStopInMain(configuration)) {
-								String mainType = getMainTypeName(configuration);
-								if (mainType != null) {
-									Map map = new HashMap();
-									map
-											.put(
-													IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN,
-													IJavaLaunchConfigurationConstants.ATTR_STOP_IN_MAIN);
-									IJavaMethodBreakpoint bp = JDIDebugModel
-											.createMethodBreakpoint(
-													ResourcesPlugin
-															.getWorkspace()
-															.getRoot(),
-													mainType, "main", //$NON-NLS-1$
-													"([Ljava/lang/String;)V", //$NON-NLS-1$
-													true, false, false, -1, -1,
-													-1, 1, false, map); 
-									bp.setPersisted(false);
-									target.breakpointAdded(bp);
-									DebugPlugin.getDefault()
-											.removeDebugEventListener(this);
-								}
-							}
-						} catch (CoreException e) {
-							LaunchingPlugin.log(e);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getBuildOrder(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String)
-	 */
-	protected IProject[] getBuildOrder(ILaunchConfiguration configuration,
-			String mode) throws CoreException {
-		return fOrderedProjects;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getProjectsForProblemSearch(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String)
-	 */
-	protected IProject[] getProjectsForProblemSearch(
-			ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		return fOrderedProjects;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#isLaunchProblem(org.eclipse.core.resources.IMarker)
-	 */
-	protected boolean isLaunchProblem(IMarker problemMarker) throws CoreException {
-		return super.isLaunchProblem(problemMarker) && problemMarker.getType().equals(IJavaModelMarker.JAVA_MODEL_PROBLEM_MARKER);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean preLaunchCheck(ILaunchConfiguration configuration,
-			String mode, IProgressMonitor monitor) throws CoreException {
-		// build project list
-		if (monitor != null) {
-			monitor.subTask(LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_20); 
-		}
-		fOrderedProjects = null;
-		IJavaProject javaProject = JavaRuntime.getJavaProject(configuration);
-		if (javaProject != null) {
-			fOrderedProjects = computeReferencedBuildOrder(new IProject[]{javaProject
-					.getProject()});
-		}
-		// do generic launch checks
-		return super.preLaunchCheck(configuration, mode, monitor);
-	}
-    
-     /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getBreakpoints(org.eclipse.debug.core.ILaunchConfiguration)
-     */
-    protected IBreakpoint[] getBreakpoints(ILaunchConfiguration configuration) {
-         IBreakpointManager breakpointManager = DebugPlugin.getDefault().getBreakpointManager();
-         if (!breakpointManager.isEnabled()) {
-             // no need to check breakpoints individually.
-             return null;
-         }
-         return breakpointManager.getBreakpoints(JDIDebugModel.getPluginIdentifier());
-     }
-	
-	/**
-	 * Returns the VM runner for the given launch mode to use when launching the
-	 * given configuration.
-	 *  
-	 * @param configuration launch configuration
-	 * @param mode launch node
-	 * @return VM runner to use when launching the given configuration in the given mode
-	 * @throws CoreException if a VM runner cannot be determined
-	 * @since 3.1
-	 */
-	public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode) throws CoreException {
-		IVMInstall vm = verifyVMInstall(configuration);
-		IVMRunner runner = vm.getVMRunner(mode);
-		if (runner == null) {
-			abort(MessageFormat.format(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_0, new String[]{vm.getName(), mode}), null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST); 
-		}
-		return runner;
-	}
-	
-	/** 
-	 * Returns an array of environment variables to be used when
-	 * launching the given configuration or <code>null</code> if unspecified.
-	 * 
-	 * @param configuration launch configuration
-	 * @throws CoreException if unable to access associated attribute or if
-	 * unable to resolve a variable in an environment variable's value
-	 * @since 3.1
-	 */	
-	public String[] getEnvironment(ILaunchConfiguration configuration) throws CoreException {
-		return DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-	}
-	
-	/**
-	 * Returns an array of paths to be used for the <code>java.library.path</code>
-	 * system property, or <code>null</code> if unspecified.
-	 * 
-	 * @param configuration
-	 * @return an array of paths to be used for the <code>java.library.path</code>
-	 * system property, or <code>null</code>
-	 * @throws CoreException if unable to determine the attribute
-	 * @since 3.1
-	 */
-	public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException {
-		IJavaProject project = getJavaProject(configuration);
-		if (project != null) {
-			String[] paths = JavaRuntime.computeJavaLibraryPath(project, true);
-			if (paths.length > 0) {
-				return paths;
-			}
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
deleted file mode 100644
index f40f9d2..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-/**
- * Abstract implementation of a VM install.
- * <p>
- * Clients implementing VM installs must subclass this class.
- * </p>
- */
-public abstract class AbstractVMInstall implements IVMInstall, IVMInstall2 {
-
-	private IVMInstallType fType;
-	private String fId;
-	private String fName;
-	private File fInstallLocation;
-	private LibraryLocation[] fSystemLibraryDescriptions;
-	private URL fJavadocLocation;
-	private String fVMArgs;
-	// whether change events should be fired
-	private boolean fNotify = true;
-	
-	/**
-	 * Constructs a new VM install.
-	 * 
-	 * @param	type	The type of this VM install.
-	 * 					Must not be <code>null</code>
-	 * @param	id		The unique identifier of this VM instance
-	 * 					Must not be <code>null</code>.
-	 * @throws	IllegalArgumentException	if any of the required
-	 * 					parameters are <code>null</code>.
-	 */
-	public AbstractVMInstall(IVMInstallType type, String id) {
-		if (type == null)
-			throw new IllegalArgumentException(LaunchingMessages.vmInstall_assert_typeNotNull); 
-		if (id == null)
-			throw new IllegalArgumentException(LaunchingMessages.vmInstall_assert_idNotNull); 
-		fType= type;
-		fId= id;
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMInstall#getId()
-	 */
-	public String getId() {
-		return fId;
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMInstall#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMInstall#setName(String)
-	 */
-	public void setName(String name) {
-		if (!name.equals(fName)) {
-			PropertyChangeEvent event = new PropertyChangeEvent(this, IVMInstallChangedListener.PROPERTY_NAME, fName, name);
-			fName= name;
-			if (fNotify) {
-				JavaRuntime.fireVMChanged(event);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMInstall#getInstallLocation()
-	 */
-	public File getInstallLocation() {
-		return fInstallLocation;
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMInstall#setInstallLocation(File)
-	 */
-	public void setInstallLocation(File installLocation) {
-		if (!installLocation.equals(fInstallLocation)) {
-			PropertyChangeEvent event = new PropertyChangeEvent(this, IVMInstallChangedListener.PROPERTY_INSTALL_LOCATION, fInstallLocation, installLocation);
-			fInstallLocation= installLocation;
-			if (fNotify) {
-				JavaRuntime.fireVMChanged(event);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMInstall#getVMInstallType()
-	 */
-	public IVMInstallType getVMInstallType() {
-		return fType;
-	}
-
-	/* (non-Javadoc)
-	 * @see IVMInstall#getVMRunner(String)
-	 */
-	public IVMRunner getVMRunner(String mode) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#getLibraryLocations()
-	 */
-	public LibraryLocation[] getLibraryLocations() {
-		return fSystemLibraryDescriptions;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#setLibraryLocations(org.eclipse.jdt.launching.LibraryLocation[])
-	 */
-	public void setLibraryLocations(LibraryLocation[] locations) {
-		if (locations == fSystemLibraryDescriptions) {
-			return;
-		}
-		LibraryLocation[] newLocations = locations;
-		if (newLocations == null) {
-			newLocations = getVMInstallType().getDefaultLibraryLocations(getInstallLocation()); 
-		}
-		LibraryLocation[] prevLocations = fSystemLibraryDescriptions;
-		if (prevLocations == null) {
-			prevLocations = getVMInstallType().getDefaultLibraryLocations(getInstallLocation()); 
-		}
-		
-		if (newLocations.length == prevLocations.length) {
-			int i = 0;
-			boolean equal = true;
-			while (i < newLocations.length && equal) {
-				equal = newLocations[i].equals(prevLocations[i]);
-				i++;
-			}
-			if (equal) {
-				// no change
-				return;
-			}
-		}
-
-		PropertyChangeEvent event = new PropertyChangeEvent(this, IVMInstallChangedListener.PROPERTY_LIBRARY_LOCATIONS, prevLocations, newLocations);
-		fSystemLibraryDescriptions = locations;
-		if (fNotify) {
-			JavaRuntime.fireVMChanged(event);		
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#getJavadocLocation()
-	 */
-	public URL getJavadocLocation() {
-		return fJavadocLocation;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#setJavadocLocation(java.net.URL)
-	 */
-	public void setJavadocLocation(URL url) {
-		if (url == fJavadocLocation) {
-			return;
-		}
-		if (url != null && fJavadocLocation != null) {
-			if (url.equals(fJavadocLocation)) {
-				// no change
-				return;
-			}
-		}
-		
-		PropertyChangeEvent event = new PropertyChangeEvent(this, IVMInstallChangedListener.PROPERTY_JAVADOC_LOCATION, fJavadocLocation, url);		
-		fJavadocLocation = url;
-		if (fNotify) {
-			JavaRuntime.fireVMChanged(event);
-		}
-	}
-
-	/**
-	 * Whether this VM should fire property change notifications.
-	 * 
-	 * @param notify
-	 * @since 2.1
-	 */
-	protected void setNotify(boolean notify) {
-		fNotify = notify;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-     * @since 2.1
-	 */
-	public boolean equals(Object object) {
-		if (object instanceof IVMInstall) {
-			IVMInstall vm = (IVMInstall)object;
-			return getVMInstallType().equals(vm.getVMInstallType()) &&
-				getId().equals(vm.getId());
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 * @since 2.1
-	 */
-	public int hashCode() {
-		return getVMInstallType().hashCode() + getId().hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#getDefaultVMArguments()
-	 * @since 3.0
-	 */
-	public String[] getVMArguments() {
-		String args = getVMArgs();
-		if (args == null) {
-		    return null;
-		}
-		ExecutionArguments ex = new ExecutionArguments(args, ""); //$NON-NLS-1$
-		return ex.getVMArgumentsArray();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#setDefaultVMArguments(java.lang.String[])
-	 * @since 3.0
-	 */
-	public void setVMArguments(String[] vmArgs) {
-		if (vmArgs == null) {
-			setVMArgs(null);
-		} else {
-		    StringBuffer buf = new StringBuffer();
-		    for (int i = 0; i < vmArgs.length; i++) {
-	            String string = vmArgs[i];
-	            buf.append(string);
-	            buf.append(" "); //$NON-NLS-1$
-	        }
-			setVMArgs(buf.toString().trim());
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstall#getVMArgs()
-	 */
-    public String getVMArgs() {
-        return fVMArgs;
-    }
-    
-    /*
-     *  (non-Javadoc)
-     * @see org.eclipse.jdt.launching.IVMInstall#setVMArgs(java.lang.String)
-     */
-    public void setVMArgs(String vmArgs) {
-        fVMArgs = vmArgs; 
-    }	
-    
-    
-    /* (non-Javadoc)
-     * Subclasses should override.
-     * @see org.eclipse.jdt.launching.IVMInstall#getJavaVersion()
-     */
-    public String getJavaVersion() {
-        return null;
-    }
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
deleted file mode 100644
index a677146..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.io.File;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-
-/**
- * Abstract implementation of a VM install type.
- * Subclasses should implement
- * <ul>
- * <li><code>IVMInstall doCreateVMInstall(String id)</code></li>
- * <li><code>String getName()</code></li>
- * <li><code>IStatus validateInstallLocation(File installLocation)</code></li>
- * </ul>
- * <p>
- * Clients implementing VM install types should subclass this class.
- * </p>
- */
-
-public abstract class AbstractVMInstallType implements IVMInstallType, IExecutableExtension {
-	private List fVMs;
-	private String fId;
-	
-	/**
-	 * Constructs a new VM install type.
-	 */
-	protected AbstractVMInstallType() {
-		fVMs= new ArrayList(10);
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMType#getVMs()
-	 */
-	public IVMInstall[] getVMInstalls() {
-		IVMInstall[] vms= new IVMInstall[fVMs.size()];
-		return (IVMInstall[])fVMs.toArray(vms);
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMType#disposeVM(String)
-	 */
-	public void disposeVMInstall(String id) {
-		for (int i= 0; i < fVMs.size(); i++) {
-			IVMInstall vm= (IVMInstall)fVMs.get(i);
-			if (vm.getId().equals(id)) {
-				fVMs.remove(i);
-				JavaRuntime.fireVMRemoved(vm);
-				return;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMType#getVM(String)
-	 */
-	public IVMInstall findVMInstall(String id) {
-		for (int i= 0; i < fVMs.size(); i++) {
-			IVMInstall vm= (IVMInstall)fVMs.get(i);
-			if (vm.getId().equals(id)) {
-				return vm;
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMType#createVM(String)
-	 */
-	public IVMInstall createVMInstall(String id) throws IllegalArgumentException {
-		if (findVMInstall(id) != null) {
-			String format= LaunchingMessages.vmInstallType_duplicateVM; 
-			throw new IllegalArgumentException(MessageFormat.format(format, new String[] { id }));
-		}
-		IVMInstall vm= doCreateVMInstall(id);
-		fVMs.add(vm);
-		return vm;
-	}
-	
-	/**
-	 * Subclasses should return a new instance of the appropriate
-	 * <code>IVMInstall</code> subclass from this method.
-	 * @param	id	The vm's id. The <code>IVMInstall</code> instance that is created must
-	 * 				return <code>id</code> from its <code>getId()</code> method.
-	 * 				Must not be <code>null</code>.
-	 * @return	the newly created IVMInstall instance. Must not return <code>null</code>.
-	 */
-	protected abstract IVMInstall doCreateVMInstall(String id);
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	/**
-	 * Initializes the id parameter from the "id" attribute
-	 * in the configuration markup.
-	 * Subclasses should not override this method.
-	 * @param config the configuration element used to trigger this execution. 
-	 *		It can be queried by the executable extension for specific
-	 *		configuration properties
-	 * @param propertyName the name of an attribute of the configuration element
-	 *		used on the <code>createExecutableExtension(String)</code> call. This
-	 *		argument can be used in the cases where a single configuration element
-	 *		is used to define multiple executable extensions.
-	 * @param data adapter data in the form of a <code>String</code>, 
-	 *		a <code>Hashtable</code>, or <code>null</code>.
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) {
-		fId= config.getAttribute("id"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * Subclasses should not override this method.
-	 * @see IVMType#getId()
-	 */
-	public String getId() {
-		return fId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IVMInstallType#findVMInstallByName(java.lang.String)
-	 */
-	public IVMInstall findVMInstallByName(String name) {
-		for (int i= 0; i < fVMs.size(); i++) {
-			IVMInstall vm= (IVMInstall)fVMs.get(i);
-			if (vm.getName().equals(name)) {
-				return vm;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a URL for the default javadoc location of a VM installed at the
-	 * given home location, or <code>null</code> if none. The default
-	 * implementation returns <code>null</code>, subclasses must override as
-	 * appropriate.
-	 * <p>
-	 * Note, this method would ideally be added to <code>IVMInstallType</code>,
-	 * but it would have been a breaking API change between 2.0 and 2.1. Thus,
-	 * it has been added to the abstract base class that VM install types should
-	 * subclass.
-	 * </p>
-	 * 
-	 * @param installLocation home location
-	 * @return default javadoc location or <code>null</code>
-	 * @since 2.1
-	 */
-	public URL getDefaultJavadocLocation(File installLocation) {
-		return null;		
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
deleted file mode 100644
index fad07e2..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-
-/**
- * Abstract implementation of a VM runner.
- * <p>
- * Clients implementing VM runners should subclass this class.
- * </p>
- * @see IVMRunner
- * @since 2.0
- */
-public abstract class AbstractVMRunner implements IVMRunner {
-
-	/**
-	 * Throws a core exception with an error status object built from
-	 * the given message, lower level exception, and error code.
-	 * 
-	 * @param message the status message
-	 * @param exception lower level exception associated with the
-	 *  error, or <code>null</code> if none
-	 * @param code error code
-	 * @throws CoreException The exception encapsulating the reason for the abort
-	 */
-	protected void abort(String message, Throwable exception, int code) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginIdentifier(), code, message, exception));
-	}
-	
-	/**
-	 * Returns the identifier of the plug-in this VM runner 
-	 * originated from.
-	 * 
-	 * @return plug-in identifier
-	 */
-	protected abstract String getPluginIdentifier();
-	
-	/**
-	 * @see DebugPlugin#exec(String[], File)
-	 */
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		return DebugPlugin.exec(cmdLine, workingDirectory);
-	}
-	
-	/**
-	 * @since 3.0
-	 * @see DebugPlugin#exec(String[], File, String[])
-	 */
-	protected Process exec(String[] cmdLine, File workingDirectory, String[] envp) throws CoreException {
-		return DebugPlugin.exec(cmdLine, workingDirectory, envp);
-	}	
-	
-	/**
-	 * Returns the given array of strings as a single space-delimited string.
-	 * 
-	 * @param cmdLine array of strings
-	 * @return a single space-delimited string
-	 */
-	protected String getCmdLineAsString(String[] cmdLine) {
-		StringBuffer buff= new StringBuffer();
-		for (int i = 0, numStrings= cmdLine.length; i < numStrings; i++) {
-			buff.append(cmdLine[i]);
-			buff.append(' ');	
-		} 
-		return buff.toString().trim();
-	}
-	
-	/**
-	 * Returns the default process attribute map for Java processes.
-	 * 
-	 * @return default process attribute map for Java processes
-	 */
-	protected Map getDefaultProcessMap() {
-		Map map = new HashMap();
-		map.put(IProcess.ATTR_PROCESS_TYPE, IJavaLaunchConfigurationConstants.ID_JAVA_PROCESS_TYPE);
-		return map;
-	}
-	
-	/**
-	 * Returns a new process aborting if the process could not be created.
-	 * @param launch the launch the process is contained in
-	 * @param p the system process to wrap
-	 * @param label the label assigned to the process
-	 * @param attributes values for the attribute map
-	 * @return the new process
-	 * @throws CoreException problems occurred creating the process
-	 * @since 3.0
-	 */
-	protected IProcess newProcess(ILaunch launch, Process p, String label, Map attributes) throws CoreException {
-		IProcess process= DebugPlugin.newProcess(launch, p, label, attributes);
-		if (process == null) {
-			p.destroy();
-			abort(LaunchingMessages.AbstractVMRunner_0, null, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); 
-		}
-		return process;
-	}
-	
-	/**
-	 * Combines and returns VM arguments specified by the runner configuration,
-	 * with those specified by the VM install, if any.
-	 * 
-	 * @param configuration runner configuration
-	 * @param vmInstall vm install
-	 * @return combined VM arguments specified by the runner confiugration
-	 *  and VM install
-	 * @since 3.0
-	 */
-	protected String[] combineVmArgs(VMRunnerConfiguration configuration, IVMInstall vmInstall) {
-		String[] launchVMArgs= configuration.getVMArguments();
-		String[] vmVMArgs = vmInstall.getVMArguments();
-		if (vmVMArgs == null || vmVMArgs.length == 0) {
-			return launchVMArgs;
-		}
-		String[] allVMArgs = new String[launchVMArgs.length + vmVMArgs.length];
-		System.arraycopy(launchVMArgs, 0, allVMArgs, 0, launchVMArgs.length);
-		System.arraycopy(vmVMArgs, 0, allVMArgs, launchVMArgs.length, vmVMArgs.length);
-		return allVMArgs;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java
deleted file mode 100644
index 8404ac0..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import org.eclipse.debug.core.DebugPlugin;
-
-/**
- * The execution arguments for running a Java VM. The execution arguments are
- * separated into two parts: arguments to the VM itself, and arguments to the Java 
- * main program. This class provides convenience methods for parsing a string
- * of arguments into seperate components.
- * <p>
- * Clients may instantiate this class; it is not intended to be subclassed.
- * </p>
- */
-public class ExecutionArguments {
-	private String fVMArgs;
-	private String fProgramArgs;
-		
-	/**
-	 * Creates a new execution arguments object.
-	 *
-	 * @param vmArgs command line argument string passed to the VM
-	 * @param programArgs command line argument string passed to the program
-	 */
-	public ExecutionArguments(String vmArgs, String programArgs) {
-		if (vmArgs == null || programArgs == null)
-			throw new IllegalArgumentException();
-		fVMArgs= vmArgs;
-		fProgramArgs= programArgs;
-	}
-	
-	/**
-	 * Returns the VM arguments as one string.
-	 *
-	 * @return the VM arguments as one string
-	 */
-	public String getVMArguments() {
-		return fVMArgs;
-	}
-	
-	/**
-	 * Returns the program arguments as one string.
-	 *
-	 * @return the program arguments as one string
-	 */
-	public String getProgramArguments() {
-		return fProgramArgs;
-	}
-	
-	/**
-	 * Returns the VM arguments as an array of individual arguments.
-	 *
-	 * @return the VM arguments as an array of individual arguments
-	 */
-	public String[] getVMArgumentsArray() {
-		return DebugPlugin.parseArguments(fVMArgs);
-	}
-	
-	/**
-	 * Returns the program arguments as an array of individual arguments.
-	 *
-	 * @return the program arguments as an array of individual arguments
-	 */
-	public String[] getProgramArgumentsArray() {
-		return DebugPlugin.parseArguments(fProgramArgs);
-	}	
-			
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
deleted file mode 100644
index aa8e70b..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-
- 
-/**
- * Constant definitions for Java launch configurations.
- * <p>
- * Constant definitions only; not to be implemented.
- * </p>
- * @since 2.0
- */
-public interface IJavaLaunchConfigurationConstants {
-
-	/**
-	 * Identifier for the Local Java Application launch configuration type
-	 * (value <code>"org.eclipse.jdt.launching.localJavaApplication"</code>).
-	 */
-	public static final String ID_JAVA_APPLICATION = LaunchingPlugin.getUniqueIdentifier() + ".localJavaApplication"; //$NON-NLS-1$
-	
-	/**
-	 * Identifier for the Remote Java Application launch configuration type
-	 * (value <code>"org.eclipse.jdt.launching.remoteJavaApplication"</code>).
-	 */
-	public static final String ID_REMOTE_JAVA_APPLICATION = LaunchingPlugin.getUniqueIdentifier() + ".remoteJavaApplication"; //$NON-NLS-1$	
-
-	/**
-	 * Identifier for the Java Applet launch configuration type
-	 * (value <code>"org.eclipse.jdt.launching.javaApplet"</code>).
-	 */
-	public static final String ID_JAVA_APPLET = LaunchingPlugin.getUniqueIdentifier() + ".javaApplet"; //$NON-NLS-1$	
-
-	/**
-	 * Identifier for the standard Socket Attaching VM connector
-	 * (value <code>"org.eclipse.jdt.launching.socketAttachConnector"</code>).
-	 */
-	public static final String ID_SOCKET_ATTACH_VM_CONNECTOR = LaunchingPlugin.getUniqueIdentifier() + ".socketAttachConnector"; //$NON-NLS-1$	
-	
-	/**
-	 * Identifier for the java process type, which is annotated on processes created
-	 * by the local java application launch delegate.
-	 * 
-	 * (value <code>"java"</code>).
-	 */
-	public static final String ID_JAVA_PROCESS_TYPE = "java"; //$NON-NLS-1$ 
-			
-	/**
-	 * Launch configuration attribute key. The value is a name of
-	 * a Java project associated with a Java launch configuration.
-	 */
-	public static final String ATTR_PROJECT_NAME = LaunchingPlugin.getUniqueIdentifier() + ".PROJECT_ATTR"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a fully qualified name
-	 * of a main type to launch.
-	 */
-	public static final String ATTR_MAIN_TYPE_NAME = LaunchingPlugin.getUniqueIdentifier() + ".MAIN_TYPE";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * whether execution should stop when main is entered. The default value
-	 * is <code>false</code>.
-	 * 
-	 * @since 2.1
-	 */
-	public static final String ATTR_STOP_IN_MAIN = LaunchingPlugin.getUniqueIdentifier() + ".STOP_IN_MAIN";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * program arguments for a Java launch configuration, as they should appear
-	 * on the command line.
-	 */
-	public static final String ATTR_PROGRAM_ARGUMENTS = LaunchingPlugin.getUniqueIdentifier() + ".PROGRAM_ARGUMENTS"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * VM arguments for a Java launch configuration, as they should appear
-	 * on the command line.
-	 */
-	public static final String ATTR_VM_ARGUMENTS = LaunchingPlugin.getUniqueIdentifier() + ".VM_ARGUMENTS";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying a
-	 * path to the working directory to use when launching a local VM.
-	 * When specified as an absolute path, the path represents a path in the local
-	 * file system. When specified as a full path, the path represents a workspace
-	 * relative path. When unspecified, the working directory defaults to the project
-	 * associated with a launch configuration. When no project is associated with a
-	 * launch configuration, the working directory is inherited from the current
-	 * process.
-	 */
-	public static final String ATTR_WORKING_DIRECTORY = LaunchingPlugin.getUniqueIdentifier() + ".WORKING_DIRECTORY";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a name of a VM install
-	 * to use when launching a local VM. This attribute must be qualified
-	 * by a VM install type, via the <code>ATTR_VM_INSTALL_TYPE</code>
-	 * attribute. When unspecified, the default VM is used.
-	 */
-	public static final String ATTR_VM_INSTALL_NAME = LaunchingPlugin.getUniqueIdentifier() + ".VM_INSTALL_NAME"; //$NON-NLS-1$
-		
-	/**
-	 * Launch configuration attribute key. The value is an identifier of
-	 * a VM install type. Used in conjunction with a VM install name, to 
-	 * specify the VM to use when launching a local Java application.
-	 * The associated VM install name is specified via the attribute
-	 * <code>ATTR_VM_INSTALL_NAME</code>.
-	 */
-	public static final String ATTR_VM_INSTALL_TYPE = LaunchingPlugin.getUniqueIdentifier() + ".VM_INSTALL_TYPE_ID"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a Map of attributes specific
-	 * to a particular VM install type, used when launching a local Java
-	 * application. The map is passed to a <code>VMRunner</code> via a <code>VMRunnerConfiguration</code>
-	 * when launching a VM. The attributes in the map are implementation dependent
-	 * and are limited to String keys and values.
-	 */
-	public static final String ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP = LaunchingPlugin.getUniqueIdentifier() + "VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is an identifier of
-	 * a VM connector, specifying a connector to use when attaching to
-	 * a remote VM.
-	 */
-	public static final String ATTR_VM_CONNECTOR= LaunchingPlugin.getUniqueIdentifier() + ".VM_CONNECTOR_ID"; //$NON-NLS-1$
-		
-	/**
-	 * Launch configuration attribute key. The attribute value is an ordered list of strings
-	 * which are mementos for runtime class path entries. When unspecified, a default
-	 * classpath is generated by the classpath provider associated with a launch
-	 * configuration (via the <code>ATTR_CLASSPATH_PROVIDER</code> attribute).
-	 */
-	public static final String ATTR_CLASSPATH = LaunchingPlugin.getUniqueIdentifier() + ".CLASSPATH";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specfying
-	 * whether a default classpath should be used when launching a local
-	 * Java application. When <code>false</code>, a classpath must be specified
-	 * via the <code>ATTR_CLASSPATH</code> attribute. When <code>true</code> or
-	 * unspecified, a classpath is computed by the classpath provider associated
-	 * with a launch configuration.
-	 */
-	public static final String ATTR_DEFAULT_CLASSPATH = LaunchingPlugin.getUniqueIdentifier() + ".DEFAULT_CLASSPATH"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is an identifier of a
-	 * classpath provider extension used to compute the classpath
-	 * for a launch configuration. When unspecified, the default classpath
-	 * provider is used - <code>StandardClasspathProvider</code>.
-	 */
-	public static final String ATTR_CLASSPATH_PROVIDER = LaunchingPlugin.getUniqueIdentifier() + ".CLASSPATH_PROVIDER";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is an ordered list of
-	 * strings which are mementos for associated runtime classpath entries
-	 * interpreted as locations in which to look for source code. When unspecified,
-	 * a default source lookup path is generated by the source path provider
-	 * associated with a launch configurations (via the
-	 * <code>ATTR_SOURCE_PATH_PROVIDER</code> attribute).
-	 */
-	public static final String ATTR_SOURCE_PATH = LaunchingPlugin.getUniqueIdentifier() + ".SOURCE_PATH";	 //$NON-NLS-1$
-		
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * whether a default source lookup path should be used. When
-	 * <code>false</code> a source path must be specified via the
-	 * <code>ATTR_SOURCE_PATH</code> attribute. When <code>true</code> or
-	 * unspecified, a source lookup path is computed by the source path
-	 * provider associated with a launch configuration.
-	 */
-	public static final String ATTR_DEFAULT_SOURCE_PATH = LaunchingPlugin.getUniqueIdentifier() + ".DEFAULT_SOURCE_PATH"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is an identifier of a
-	 * source path provider extension used to compute the source lookup path
-	 * for a launch configuration. When unspecified, the default source lookup
-	 * path provider is used - <code>StandardSourcePathProvider</code>.
-	 */
-	public static final String ATTR_SOURCE_PATH_PROVIDER = LaunchingPlugin.getUniqueIdentifier() + ".SOURCE_PATH_PROVIDER";	 //$NON-NLS-1$
-			
-	/**
-	 * Launch configuration attribute key. The value is a boolean, indicating
-	 * whether a VM will support/allow the terminate action.
-	 * This attribute is used for remote debugging.
-	 */
-	public static final String ATTR_ALLOW_TERMINATE = LaunchingPlugin.getUniqueIdentifier() + ".ALLOW_TERMINATE";	 //$NON-NLS-1$
-	
-	/**
-	 * Attribute key for VM specific attributes found in the
-	 * <code>ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP</code>. The value is a String,
-	 * indicating the String to use to invoke the JRE.
-	 */
-	public static final String ATTR_JAVA_COMMAND = LaunchingPlugin.getUniqueIdentifier() + ".JAVA_COMMAND";	 //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is 
-	 * a map. Keys in the map correpsond to arguments names
-	 * returned by <code>IVMConnector#getDefaultArguments()</code>.
-	 * Values are strings corresponding to the values to use when
-	 * establishing a connection to a remote VM.
-	 */
-	public static final String ATTR_CONNECT_MAP = LaunchingPlugin.getUniqueIdentifier() + ".CONNECT_MAP";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is an integer
-	 * indicating the width of the applet viewing area.
-	 * 
-	 * @since 2.1
-	 */
-	public static final String ATTR_APPLET_WIDTH = LaunchingPlugin.getUniqueIdentifier() + ".APPLET_WIDTH";	 //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is an integer
-	 * indicating the height of the applet viewing area.
-	 * 
-	 * @since 2.1
-	 */
-	public static final String ATTR_APPLET_HEIGHT = LaunchingPlugin.getUniqueIdentifier() + ".APPLET_HEIGHT";	 //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a String indicating the
-	 * HTML name of the applet.
-	 * 
-	 * @since 2.1
-	 */
-	public static final String ATTR_APPLET_NAME = LaunchingPlugin.getUniqueIdentifier() + ".APPLET_NAME";	 //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a Map. Keys in the map
-	 * represent applet parameter names and the values in the map are the
-	 * corresponding parameter values
-	 * 
-	 * @since 2.1
-	 */
-	public static final String ATTR_APPLET_PARAMETERS = LaunchingPlugin.getUniqueIdentifier() + ".APPLET_PARAMETERS";	 //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a String indicating the
-	 * fully qualified name of the appletviewer utility class to use.
-	 * 
-	 * @since 2.1
-	 */
-	public static final String ATTR_APPLET_APPLETVIEWER_CLASS = LaunchingPlugin.getUniqueIdentifier() + ".APPLET_APPLETVIEWER_CLASS";	 //$NON-NLS-1$
-	
-	/**
-	 * Attribute key for a VM specific argument. Value is an array
-	 * of strings desribing paths in the local file system that
-	 * should be prepended to the bootpath, or <code>null</code>
-	 * if none. The value is computed dynamically at launch time
-	 * and placed in the VM specific arguments map by the Java 
-	 * application launch delegate.
-	 * 
-	 * @since 3.0
-	 */
-	public static final String ATTR_BOOTPATH_PREPEND = LaunchingPlugin.getUniqueIdentifier() + ".-Xbootclasspath/p:";	 //$NON-NLS-1$
-
-	/**
-	 * Attribute key for a VM specific argument. Value is an array
-	 * of strings desribing paths in the local file system that
-	 * should be placed on the bootpath explicitly, or <code>null</code>
-	 * if none. The value is computed dynamically at launch time
-	 * and placed in the VM specific arguments map by the Java 
-	 * application launch delegate.
-	 * 
-	 * @since 3.0
-	 */
-	public static final String ATTR_BOOTPATH = LaunchingPlugin.getUniqueIdentifier() + ".-Xbootclasspath:";	 //$NON-NLS-1$
-	
-	/**
-	 * Attribute key for a VM specific argument. Value is an array
-	 * of strings desribing paths in the local file system that
-	 * should be appended to the bootpath, or <code>null</code>
-	 * if none. The value is computed dynamically at launch time
-	 * and placed in the VM specific arguments map by the Java 
-	 * application launch delegate.
-	 * 
-	 * @since 3.0
-	 */	
-	public static final String ATTR_BOOTPATH_APPEND = LaunchingPlugin.getUniqueIdentifier() + ".-Xbootclasspath/a:";	 //$NON-NLS-1$
-
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a project when a project is required.
-	 */
-	public static final int ERR_UNSPECIFIED_PROJECT = 100;	
-		
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a main type to launch.
-	 */
-	public static final int ERR_UNSPECIFIED_MAIN_TYPE = 101;	
-		
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a VM Install Type.
-	 */
-	public static final int ERR_UNSPECIFIED_VM_INSTALL_TYPE = 102;
-	
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a VM Install
-	 */
-	public static final int ERR_UNSPECIFIED_VM_INSTALL = 103;
-
-	/**
-	 * Status code indicating a launch configuration's VM install
-	 * type could not be found.
-	 */
-	public static final int ERR_VM_INSTALL_TYPE_DOES_NOT_EXIST = 104;
-		
-	/**
-	 * Status code indicating a launch configuration's VM install
-	 * could not be found.
-	 */
-	public static final int ERR_VM_INSTALL_DOES_NOT_EXIST = 105;
-	
-	/**
-	 * Status code indicating a VM runner could not be located
-	 * for the VM install specified by a launch configuration.
-	 */
-	public static final int ERR_VM_RUNNER_DOES_NOT_EXIST = 106;	
-	
-	/**
-	 * Status code indicating the project associated with
-	 * a launch configuration is not a Java project.
-	 */
-	public static final int ERR_NOT_A_JAVA_PROJECT = 107;	
-	
-	/**
-	 * Status code indicating the specified working directory
-	 * does not exist.
-	 */
-	public static final int ERR_WORKING_DIRECTORY_DOES_NOT_EXIST = 108;	
-		
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a host name value
-	 */
-	public static final int ERR_UNSPECIFIED_HOSTNAME = 109;
-
-	/**
-	 * Status code indicating a launch configuration has
-	 * specified an invalid host name attribute
-	 */
-	public static final int ERR_INVALID_HOSTNAME = 110;
-
-	/**
-	 * Status code indicating a launch configuration does not
-	 * specify a port number value
-	 */
-	public static final int ERR_UNSPECIFIED_PORT = 111;
-
-	/**
-	 * Status code indicating a launch configuration has
-	 * specified an invalid port number attribute
-	 */
-	public static final int ERR_INVALID_PORT = 112;
-
-	/**
-	 * Status code indicating an attempt to connect to a remote VM
-	 * has failed.
-	 */
-	public static final int ERR_REMOTE_VM_CONNECTION_FAILED = 113;
-
-	/**
-	 * Status code indicating that the shared memory attach connector
-	 * could not be found.
-	 */
-	public static final int ERR_SHARED_MEMORY_CONNECTOR_UNAVAILABLE = 114;
-	
-	/**
-	 * Status code indicating that the Eclipse runtime does not support
-	 * launching a program with a working directory. This feature is only
-	 * available if Eclipse is run on a 1.3 runtime or higher.
-	 * <p>
-	 * A status handler may be registered for this error condition,
-	 * and should return a Boolean indicating whether the program
-	 * should be relaunched with the default working directory.
-	 * </p>
-	 */
-	public static final int ERR_WORKING_DIRECTORY_NOT_SUPPORTED = 115;	
-	
-	/**
-	 * Status code indicating that an error occurred launching a VM.
-	 * The status error message is the text that
-	 * the VM wrote to standard error before exiting.
-	 */
-	public static final int ERR_VM_LAUNCH_ERROR = 116;	
-	
-	/**
-	 * Status code indicating that a timeout has occurred waiting for
-	 * the VM to connect with the debugger.
-	 * <p>
-	 * A status handler may be registered for this error condition,
-	 * and should return a Boolean indicating whether the program
-	 * should continue waiting for a connection for the associated
-	 * timeout period.
-	 * </p>
-	 */
-	public static final int ERR_VM_CONNECT_TIMEOUT = 117;	
-	
-	/**
-	 * Status code indicating that a free socket was not available to
-	 * communicate with the VM.
-	 */
-	public static final int ERR_NO_SOCKET_AVAILABLE = 118;		
-	
-	/**
-	 * Status code indicating that the JDI connector required for a
-	 * debug launch was not available.
-	 */
-	public static final int ERR_CONNECTOR_NOT_AVAILABLE = 119;	
-	
-	/**
-	 * Status code indicating that the debugger failed to connect
-	 * to the VM.
-	 */
-	public static final int ERR_CONNECTION_FAILED = 120;		
-
-	/**
-	 * Status code indicating that the applet launcher was asked to
-	 * launch a resource that did not extend <code>java.applet.Applet</code>.
-	 * 
-	 * @since 2.1
-	 */
-	public static final int ERR_NOT_AN_APPLET = 121;		
-
-	/**
-	 * Status code indicating that no launch configuration was specified.
-	 * 
-	 * @since 2.1
-	 */
-	public static final int ERR_UNSPECIFIED_LAUNCH_CONFIG = 122;		
-
-	/**
-	 * Status code indicating that the .html file used to initiate an applet
-	 * launch could not be built.
-	 * 
-	 * @since 2.1
-	 */
-	public static final int ERR_COULD_NOT_BUILD_HTML = 123;		
-	
-	/**
-	 * Status code indicating that the project referenced by a launch configuration
-	 * is closed.
-	 * 
-	 * @since 3.0
-	 */
-	public static final int ERR_PROJECT_CLOSED = 124;			
-
-	/**
-	 * Status code indicating an unexpected internal error.
-	 */
-	public static final int ERR_INTERNAL_ERROR = 150;		
-
-	/**
-	 * Default value for the 'ATTR_APPLET_APPLETVIEWER' attribute.
-	 * 
-	 * @since 2.1
-	 */	
-	public static final String DEFAULT_APPLETVIEWER_CLASS = "sun.applet.AppletViewer";	 //$NON-NLS-1$
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
deleted file mode 100644
index 61aa940..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * Represents an entry on a runtime classpath. A runtime classpath entry
- * may refer to one of the following:
- * <ul>
- * 	<li>A Java project (type <code>PROJECT</code>) - a project entry refers
- * 		to all of the built classes in a project, and resolves to the output
- * 		location(s) of the associated Java project.</li>
- * 	<li>An archive (type <code>ARCHIVE</code>) - an archive refers to a jar, zip, or
- * 		folder in the workspace or in the local file system containing class
- * 		files. An archive may have attached source.</li>
- * 	<li>A variable (type <code>VARIABLE</code>) - a variable refers to a 
- * 		classpath variable, which may refer to a jar.</li>
- * 	<li>A library (type <code>CONTAINER</code>) - a container refers to classpath
- * 		container variable which refers to a collection of archives derived
- * 		dynamically, on a per project basis.</li>
- *  <li>A contributed classpath entry (type <code>OTHER</code>) - a contributed
- *      classpath entry is an extension contributed by a plug-in. The resolution
- *      of a contributed classpath entry is client defined. See
- * 		<code>IRuntimeClasspathEntry2</code>.
- * </ul>
- * <p>
- * Clients may implement this interface for contributed a classpath entry
- * types (i.e. type <code>OTHER</code>). Note, contributed classpath entries
- * are new in 3.0, and are only intended to be contributed by the Java debugger.
- * </p>
- * @since 2.0
- * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry2
- */
-public interface IRuntimeClasspathEntry {
-	
-	/**
-	 * Type identifier for project entries.
-	 */
-	public static final int PROJECT = 1;
-	
-	/**
-	 * Type identifier for archive entries.
-	 */
-	public static final int ARCHIVE = 2;	
-		
-	/**
-	 * Type identifier for variable entries.
-	 */
-	public static final int VARIABLE = 3;
-	
-	/**
-	 * Type identifier for container entries.
-	 */
-	public static final int CONTAINER = 4;
-	
-	/**
-	 * Type identifier for contributed entries.
-	 * @since 3.0
-	 */
-	public static final int OTHER = 5;	
-
-	/**
-	 * Classpath property identifier for entries that appear on the
-	 * bootstrap path by default.
-	 */
-	public static final int STANDARD_CLASSES = 1;	
-	
-	/**
-	 * Classpath property identifier for entries that should appear on the
-	 * bootstrap path explicitly.
-	 */
-	public static final int BOOTSTRAP_CLASSES = 2;	
-		
-	/**
-	 * Classpath property identifier for entries that should appear on the
-	 * user classpath.
-	 */
-	public static final int USER_CLASSES = 3;	
-	
-	/**
-	 * Returns this classpath entry's type. The type of a runtime classpath entry is
-	 * identified by one of the following constants:
-	 * <ul>
-	 * <li><code>PROJECT</code></li>
-	 * <li><code>ARCHIVE</code></li>
-	 * <li><code>VARIABLE</code></li>
-	 * <li><code>CONTAINER</code></li>
-	 * <li><code>OTHER</code></li>
-	 * </ul>
-	 * <p>
-	 * Since 3.0, a type of <code>OTHER</code> may be returned.
-	 * </p>
-	 * @return this classpath entry's type
-	 */
-	public int getType();
-	
-	/**
-	 * Returns a memento for this classpath entry.
-	 * <p>
-	 * Since 3.0, the memento for a contributed classpath entry (i.e. of
-	 * type <code>OTHER</code>), must be in the form of an XML document,
-	 * with the following element structure:
-	 * <pre>
-	 * <runtimeClasspathEntry id="exampleId">
-	 *    <memento
-	 *       key1="value1"
-	 * 		 ...>
-	 *    </memento>
-	 * </runtimeClasspathEntry>
-	 * </pre>
-	 * The <code>id</code> attribute is the unique identifier of the extension
-	 * that contributed this runtime classpath entry type, via the extension
-	 * point <code>org.eclipse.jdt.launching.runtimeClasspathEntries</code>.
-	 * The <code>memento</code> element will be used to initialize a
-	 * restored runtime classpath entry, via the method
-	 * <code>IRuntimeClasspathEntry2.initializeFrom(Element memento)</code>. The 
-	 * attributes of the <code>memento</code> element are client defined.
-	 * </p>
-	 * 
-	 * @return a memento for this classpath entry
-	 * @exception CoreException if an exception occurs generating a memento
-	 */
-	public String getMemento() throws CoreException;
-	
-	/**
-	 * Returns the path associated with this entry, or <code>null</code>
-	 * if none. The format of the
-	 * path returned depends on this entry's type:
-	 * <ul>
-	 * <li><code>PROJECT</code> - a workspace relative path to the associated
-	 * 		project.</li>
-	 * <li><code>ARCHIVE</code> - the absolute path of the assoicated archive,
-	 * 		which may or may not be in the workspace.</li>
-	 * <li><code>VARIABLE</code> - the path corresponding to the associated
-	 * 		classpath variable entry.</li>
-	 * <li><code>CONTAINER</code> - the path corresponding to the associated
-	 * 		classpath container variable entry.</li>
-	 * <li><code>OTHER</code> - the path returned is client defined.</li>
-	 * </ul>
-	 * <p>
-	 * Since 3.0, this method may return <code>null</code>.
-	 * </p>
-	 * @return the path associated with this entry, or <code>null</code>
-	 * @see org.eclipse.jdt.core.IClasspathEntry#getPath()
-	 */
-	public IPath getPath();
-		
-	/**
-	 * Returns the resource associated with this entry, or <code>null</code>
-	 * if none. A project, archive, or folder entry may be associated
-	 * with a resource.
-	 * 
-	 * @return the resource associated with this entry, or <code>null</code>
-	 */ 
-	public IResource getResource();
-	
-	/**
-	 * Returns the path to the source archive associated with this
-	 * entry, or <code>null</code> if this classpath entry has no
-	 * source attachment.
-	 * <p>
-	 * Only archive and variable entries may have source attachments.
-	 * For archive entries, the path (if present) locates a source
-	 * archive. For variable entries, the path (if present) has
-	 * an analogous form and meaning as the variable path, namely the first segment 
-	 * is the name of a classpath variable.
-	 * </p>
-	 *
-	 * @return the path to the source archive, or <code>null</code> if none
-	 */
-	public IPath getSourceAttachmentPath();
-
-	/**
-	 * Sets the path to the source archive associated with this
-	 * entry, or <code>null</code> if this classpath entry has no
-	 * source attachment.
-	 * <p>
-	 * Only archive and variable entries may have source attachments.
-	 * For archive entries, the path refers to a source
-	 * archive. For variable entries, the path has
-	 * an analogous form and meaning as the variable path, namely the
-	 * first segment  is the name of a classpath variable.
-	 * </p>
-	 * <p>
-	 * Note that an empty path (<code>Path.EMPTY</code>) is considered
-	 * <code>null</code>.
-	 * </p>
-	 *
-	 * @param path the path to the source archive, or <code>null</code> if none
-	 */
-	public void setSourceAttachmentPath(IPath path);
-	
-	/**
-	 * Returns the path within the source archive where package fragments
-	 * are located. An empty path indicates that packages are located at
-	 * the root of the source archive. Returns a non-<code>null</code> value
-	 * if and only if <code>getSourceAttachmentPath</code> returns 
-	 * a non-<code>null</code> value.
-	 *
-	 * @return root path within the source archive, or <code>null</code> if
-	 *    not applicable
-	 */
-	public IPath getSourceAttachmentRootPath();
-	
-	/**
-	 * Sets the path within the source archive where package fragments
-	 * are located. A root path indicates that packages are located at
-	 * the root of the source archive. Only valid if a source attachment
-	 * path is also specified.
-	 * <p>
-	 * Note that an empty path (<code>Path.EMPTY</code>) is considered
-	 * <code>null</code>.
-	 * </p>
-	 * 
-	 * @param path root path within the source archive, or <code>null</code>
-	 */	
-	public void setSourceAttachmentRootPath(IPath path);
-	
-	/**
-	 * Returns a constant indicating where this entry should appear on the 
-	 * runtime classpath by default.
-	 * The value returned is one of the following:
-	 * <ul>
-	 * <li><code>STANDARD_CLASSES</code> - a standard entry does not need to appear
-	 * 		on the runtime classpath</li>
-	 * <li><code>BOOTSTRAP_CLASSES</code> - a bootstrap entry should appear on the
-	 * 		boot path</li>
-	 * <li><code>USER_CLASSES</code> - a user entry should appear on the path
-	 * 		containing user or application classes</li>
-	 * </ul>
-	 * 
-	 * @return where this entry should appear on the runtime classpath
-	 */
-	public int getClasspathProperty();
-	
-	/**
-	 * Sets whether this entry should appear on the bootstrap classpath,
-	 * the user classpath, or whether this entry is a standard bootstrap entry
-	 * that does not need to appear on the classpath.
-	 * The location is one of:
-	 * <ul>
-	 * <li><code>STANDARD_CLASSES</code> - a standard entry does not need to appear
-	 * 		on the runtime classpath</li>
-	 * <li><code>BOOTSTRAP_CLASSES</code> - a bootstrap entry should appear on the
-	 * 		boot path</li>
-	 * <li><code>USER_CLASSES</code> - a user entry should appear on the path
-	 * 		conatining user or application classes</li>
-	 * </ul>
-	 * 
-	 * @param location a classpat property constant
-	 */
-	public void setClasspathProperty(int location);	
-	
-	/**
-	 * Returns an absolute path in the local file system for this entry,
-	 * or <code>null</code> if none, or if this entry is of type <code>CONTAINER</code>.
-	 * 
-	 * @return an absolute path in the local file system for this entry,
-	 *  or <code>null</code> if none
-	 */
-	public String getLocation();
-		
-	/**
-	 * Returns an absolute path in the local file system for the source
-	 * attachment associated with this entry entry, or <code>null</code> if none.
-	 * 
-	 * @return an absolute path in the local file system for the source
-	 *  attachment associated with this entry entry, or <code>null</code> if none
-	 */
-	public String getSourceAttachmentLocation();	
-	
-	/**
-	 * Returns a path relative to this entry's source attachment path for the
-	 * root location containing source, or <code>null</code> if none.
-	 * 
-	 * @return a path relative to this entry's source attachment path for the
-	 *  root location containing source, or <code>null</code> if none
-	 */
-	public String getSourceAttachmentRootLocation();		
-	
-	/**
-	 * Returns the first segment of the path associated with this entry, or <code>null</code>
-	 * if this entry is not of type <code>VARIABLE</code> or <code>CONTAINER</code>.
-	 * 
-	 * @return the first segment of the path associated with this entry, or <code>null</code>
-	 *  if this entry is not of type <code>VARIABLE</code> or <code>CONTAINER</code>
-	 */
-	public String getVariableName();
-	
-	/**
-	 * Returns a classpath entry equivalent to this runtime classpath entry,
-	 * or <code>null</code> if none.
-	 * <p>
-	 * Since 3.0, this method may return <code>null</code>.
-	 * </p>
-	 * @return a classpath entry equivalent to this runtime classpath entry,
-	 *  or <code>null</code>
-	 * @since 2.1
-	 */
-	public IClasspathEntry getClasspathEntry();
-	
-	/**
-	 * Returns the Java project associated with this runtime classpath entry
-	 * or <code>null</code> if none. Runtime classpath entries of type
-	 * <code>CONTAINER</code> may be associated with a project for the
-	 * purposes of resolving the entries in a container. 
-	 * 
-	 * @return the Java project associated with this runtime classpath entry
-	 * or <code>null</code> if none
-	 * @since 3.0
-	 */
-	public IJavaProject getJavaProject();
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry2.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry2.java
deleted file mode 100644
index 5f34adc..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry2.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.w3c.dom.Element;
-
-/**
- * Enhancements to <code>IRuntimeClasspathEntry</code> to support
- * extensible runtime classpath entries. Contributed runtime classpath
- * entries have a type of <code>OTHER</code>, and are contributed to
- * the <code>runtimeClasspathEntries</code> extension point.
- * <p>
- * Clients are not intended to implement this interface, as new types
- * of runtime classpath entries are only intended to be contributed
- * by the Java debugger.
- * </p>
- * @since 3.0 
- * @see org.eclipse.jdt.launching.IRuntimeClasspathEntry
- */
-public interface IRuntimeClasspathEntry2 extends IRuntimeClasspathEntry {
-	
-	/**
-	 * Initializes this runtime classpath entry from the given memento.
-	 * 
-	 * @param memento memento created by a classpath entry of the same type
-	 * @throws CoreException if unable to initialize from the given memento
-	 */
-	public void initializeFrom(Element memento) throws CoreException;
-	
-	/**
-	 * Returns the unique identifier of the extension that contributed
-	 * this classpath entry type, or <code>null</code> if this classpath
-	 * entry type was not contributed.
-	 * 
-	 * @return the unique identifier of the extension that contributed
-	 *  this classpath entry type, or <code>null</code> if this classpath
-	 *  entry type was not contributed
-	 */
-	public String getTypeId();
-	
-	/**
-	 * Returns whether this classpath entry is composed of other entries.
-	 * 
-	 * @return whether this classpath entry is composed of other entries
-	 */
-	public boolean isComposite();
-	
-	/**
-	 * Returns the classpath entries this entry is composed of, or an
-	 * empty collection if this entry is not a composite entry.
-	 * 
-	 * @param configuration the context (launch configuration) in which
-	 *  this runtime classpath entry is being queried for contained
-	 * 	entries, possibly <code>null</code> 
-	 * @return the classpath entries this entry is composed of, or an
-	 * empty collection if this entry is not a composite entry
-	 * @throws CoreException if unable to retrieve contained entries
-	 */
-	public IRuntimeClasspathEntry[] getRuntimeClasspathEntries(ILaunchConfiguration configuration) throws CoreException;
-	
-	/**
-	 * Returns a human readable name for this classpath entry.
-	 * 
-	 * @return a human readable name for this classpath entry
-	 */
-	public String getName();
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntryResolver.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntryResolver.java
deleted file mode 100644
index 089b4c1..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntryResolver.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * Resolves variable and/or container runtime classpath entries in
- * the context of a launch configuration or Java project. A resolver can be declared
- * as an extension (<code>org.eclipse.jdt.launching.runtimeClasspathEntryResolver</code>),
- * or be registered with the <code>JavaRuntime</code> programatically.
- * <p>
- * A resolver is registered for a specific classpath
- * <code>VARIABLE</code> and/or <code>CONTAINER</code>. A resolver is
- * consulted when a runtime classpath entry is needs to be resolved.
- * </p>
- * A resolver extension is defined in <code>plugin.xml</code>.
- * Following is an example definition of a runtime classpath entry
- * resolver extension.
- * <pre>
- * &lt;extension point="org.eclipse.jdt.launching.runtimeClasspathEntryResolvers"&gt;
- *   &lt;runtimeClasspathEntryResolver 
- *      id="com.example.ExampleResolver"
- *      class="com.example.ExampleResolverImpl"
- *      variable="VAR_NAME"
- *      container="CONTAINER_ID"
- *   &lt;/runtimeClasspathEntryResolver&gt;
- * &lt;/extension&gt;
- * </pre>
- * The attributes are specified as follows:
- * <ul>
- * <li><code>id</code> specifies a unique identifier for this extension.</li>
- * <li><code>class</code> specifies the fully qualified name of the Java class
- *   that implements <code>IRuntimeClasspathEntryResolver</code>.</li>
- * <li><code>variable</code> name of the classpath variable this resolver
- * 	is registered for.</li>
- * <li><code>container</code> identifier of the classpath container this
- * 	resolver is registered for.</li>
- * </ul>
- * At least one of <code>variable</code> or <code>container</code> must be
- * specified.
- * </p>
- * <p>
- * Clients may implement this interface.
- * </p>
- * @since 2.0
- */
-public interface IRuntimeClasspathEntryResolver {
-	
-	/**
-	 * Returns resolved runtime classpath entries for the given runtime classpath entry,
-	 * in the context of the given launch configuration.
-	 * 
-	 * @param entry runtime classpath entry to resolve, of type
-	 * 	<code>VARIABLE</code> or <code>CONTAINTER</code>
-	 * @param configuration the context in which the runtime classpath entry
-	 * 	needs to be resolved
-	 * @return resolved entries (zero or more)
-	 * @exception CoreException if unable to resolve the entry  
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException;
-	
-	/**
-	 * Returns resolved runtime classpath entries for the given runtime classpath entry,
-	 * in the context of the given Java project.
-	 * 
-	 * @param entry runtime classpath entry to resolve, of type
-	 * 	<code>VARIABLE</code> or <code>CONTAINTER</code>
-	 * @param project context in which the runtime classpath entry
-	 * 	needs to be resolved
-	 * @return resolved entries (zero or more)
-	 * @exception CoreException if unable to resolve the entry  
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException;	
-	
-	/**
-	 * Returns a VM install associated with the given classpath entry,
-	 * or <code>null</code> if none.
-	 * 
-	 * @param entry classpath entry
-	 * @return vm install associated with entry or <code>null</code> if none
-	 * @exception CoreException if unable to resolve a VM
-	 */
-	public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException;
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathProvider.java
deleted file mode 100644
index ee124f9..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-
-/**
- * A classpath provider computes an unresolved classpath for a launch
- * configuration, and resolves classpath entries for a launch configuration.
- * A classpath provider is defined as an extension of type 
- * <code>org.eclipse.jdt.launching.classpathProvider</code>.
- * <p>
- * A provider is registered with an identifier that can be
- * referenced by a launch configuration. A classpath provider is consulted
- * to compute a classpath or source lookup path when a launch configuration
- * references a provider in one or both of the following attributes:
- * <ul>
- * <li><code>ATTR_CLASSPATH_PROVIDER</code></li>
- * <li><code>ATTR_SOURCE_PATH_PROVIDER</code></li>
- * </ul>
- * </p>
- * A provider extension is defined in <code>plugin.xml</code>.
- * Following is an example definition of a runtime classpath provider
- * extension.
- * <pre>
- * &lt;extension point="org.eclipse.jdt.launching.classpathProviders"&gt;
- *   &lt;classpathProvider 
- *      id="com.example.ExampleClasspathProvider"
- *      class="com.example.ExampleClasspathProviderImpl"
- *   &lt;/classpathProvider&gt;
- * &lt;/extension&gt;
- * </pre>
- * The attributes are specified as follows:
- * <ul>
- * <li><code>id</code> specifies a unique identifier for this extension. This 
- * 	identifier may be used to reference a provider on one of the launch
- *  configuration attributes mentioned above.</li>
- * <li><code>class</code> specifies the fully qualified name of the Java class
- *   that implements <code>IRuntimeClasspathProvider</code>.</li>
- * </ul>
- * </p>
- * <p>
- * Clients may implement this interface.
- * </p>
- * 
- * @since 2.0
- */
-public interface IRuntimeClasspathProvider {
-	
-	/**
-	 * Computes and returns an unresolved classpath for the given launch configuration.
-	 * Variable and container entries are not resolved.
-	 * 
-	 * @param configuration launch configuration
-	 * @return unresolved path
-	 * @exception CoreException if unable to compute a path
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException;
-	
-	/**
-	 * Returns the resolved path corresponding to the given path, in the context of the
-	 * given launch configuration. Variable and container entries are resolved. The returned
-	 * (resolved) path need not have the same number of entries as the given (unresolved)
-	 * path.
-	 * 
-	 * @param entries entries to resolve
-	 * @param configuration launch configuration context to resolve in
-	 * @return resolved path
-	 * @exception CoreException if unable to resolve a path
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException;
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeContainerComparator.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeContainerComparator.java
deleted file mode 100644
index a52f943..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeContainerComparator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * Determines if container entries are duplicates/redundant on a runtime
- * classpath. If an <code>IClasspathContianer</code> implements this interface,
- * the <code>isDuplicate</code> method is used to determine if containers are
- * duplicates/redundant. Otherwise, containers with the same identifier are
- * considered duplicates. 
- * 
- * @since 2.0.1
- * @deprecated support has been added to <code>ClasspathContainerInitializer</code>
- *  to handle comparison of classpath containers. Use
- *  <code>ClasspathContainerInitializer.getComparisonID(IPath,IJavaProject)</code>.
- *  When a classpath container implements this interface, this interface is
- *  used to determine equality before using the support defined in
- *  <code>ClasspathContainerInitializer</code>. 
- */
-public interface IRuntimeContainerComparator {
-	
-	/**
-	 * Returns whether this container is a duplicate of the conatiner
-	 * identified by the given path.
-	 * 
-	 * @param containerPath the container to compare against
-	 * @return whether this container is a duplicate of the conatiner
-	 * identified by the given path
-	 */
-	public boolean isDuplicate(IPath containerPath);
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMConnector.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMConnector.java
deleted file mode 100644
index 7e8d858..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMConnector.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
- 
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-
-/**
- * A VM connector establishes a JDI connection with a debuggable
- * virtual machine. This extension point provides a mechanism for
- * abstracting the connection to a remote virtual machine.
- * <p>
- * A VM connector extension is defined in <code>plugin.xml</code>.
- * Following is an example definition of a VM connector extension.
- * <pre>
- * &lt;extension point="org.eclipse.jdt.launching.vmConnectors"&gt;
- *   &lt;vmConnector 
- *      id="com.example.VMConnector"
- *      class="com.example.VMConnectorClass"
- *   &lt;/vmConnector&gt;
- * &lt;/extension&gt;
- * </pre>
- * The attributes are specified as follows:
- * <ul>
- * <li><code>id</code> specifies a unique identifier for this VM connector.</li>
- * <li><code>class</code> specifies the fully qualified name of the Java class
- *   that implements <code>IVMConnector</code>.</li>
- * </ul>
- * </p>
- * @since 2.0
- */
-
-public interface IVMConnector {
-	
-	/**
-	 * Establishes a JDI connection with a debuggable VM using the arguments
-	 * specified in the given map, contributing results (debug targets and processes),
-	 * to the given launch.
-	 * 
-	 * @param arguments Argument map to use in establishing a connection. The keys of
-	 * 	the map are strings corresponding to the names of arguments returned by this
-	 * 	connector's <code>getDefaultAgruments()</code> method. The values of the map
-	 * 	are strings corresponding to the (String) values of the asscoiated
-	 *  <code>com.sun.jdi.connect.Connector.Argument</code>s to use.
-	 * @param monitor progress monitor
-	 * @param launch launch to contribute debug target(s) and/or process(es) to
-	 * @exception CoreException if unable to establish a connection with the target VM
-	 */
-	public void connect(Map arguments, IProgressMonitor monitor, ILaunch launch) throws CoreException;
-		
-	/**
-	 * Returns the name of this connector.
-	 * 
-	 * @return the name of this connector
-	 */
-	public String getName();
-	
-	/**
-	 * Returns a unique indentifier for this kind of connector.
-	 * 
-	 * @return a unique indentifier for this kind of connector
-	 */
-	public String getIdentifier();
-	
-	/**
-	 * Returns a map of default arguments used by this connector. 
-	 * The keys of the map are names of arguments used by this
-	 * connector, and the values are of type
-	 * <code>com.sun.jdi.connect.Connector.Argument</code>.
-	 * 
-	 * @return argument map with default values
-	 * @exception CoreException if unable to retrieve a default argument map
-	 */
-	public Map getDefaultArguments() throws CoreException;
-	
-	/**
-	 * Returns a list of argument names found in this connector's
-	 * default argument map, defining the order in which arguments
-	 * should be presented to the user. Since a map is not ordered,
-	 * this provides control on how arguments will be presented to 
-	 * the user.
-	 * 
-	 * @return list of argument names
-	 */
-	public List getArgumentOrder();	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall.java
deleted file mode 100644
index 20c5884..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.launching;
-
-import java.io.File;
-import java.net.URL;
-
-/**
- * Represents a particular installation of a VM. A VM instance holds all parameters
- * specific to a VM installation. Unlike VM types, VM instances can be created and
- * configured dynamically at run-time. This is typically done by the user 
- * interactively in the UI.
- * <p>
- * A VM install is responsible for creating VM runners to launch a Java program
- * in a specific mode.
- * </p>
- * <p>
- * This interface is intended to be implemented by clients that contribute
- * to the <code>"org.eclipse.jdt.launching.vmInstallTypes"</code> extension point.
- * Rather than implementing this interface directly, it is strongly recommended that
- * clients subclass {@link org.eclipse.jdt.launching.AbstractVMInstall} to be insulated
- * from potential API additions. In 3.1, a new optional interface has been added for
- * implementors of this interface - {@link org.eclipse.jdt.launching.IVMInstall2}.
- * The new interface is implemented by {@link org.eclipse.jdt.launching.AbstractVMInstall}.
- * </p>
- * @see org.eclipse.jdt.launching.IVMInstall2
- */
-public interface IVMInstall {
-	/**
-	 * Returns a VM runner that runs this installed VM in the given mode.
-	 * 
-	 * @param mode the mode the VM should be launched in; one of the constants
-	 *   declared in <code>org.eclipse.debug.core.ILaunchManager</code>
-	 * @return 	a VMRunner for a given mode May return <code>null</code> if the given mode
-	 * 			is not supported by this VM.
-	 * @see org.eclipse.debug.core.ILaunchManager
-	 */
-	IVMRunner getVMRunner(String mode);
-	/**
-	 * Returns the id for this VM. VM ids are unique within the VMs 
-	 * of a given VM type. The VM id is not intended to be presented to users.
-	 * 
-	 * @return the VM identifier. Must not return <code>null</code>.
-	 */
-	String getId();
-	/**
-	 * Returns the display name of this VM.
-	 * The VM name is intended to be presented to users.
-	 * 
-	 * @return the display name of this VM. May return <code>null</code>.
-	 */
-	String getName();
-	/**
-	 * Sets the display name of this VM.
-	 * The VM name is intended to be presented to users.
-	 * 
-	 * @param name the display name of this VM
-	 */
-	void setName(String name);
-	/**
-	 * Returns the root directory of the install location of this VM.
-	 * 
-	 * @return the root directory of this VM installation. May
-	 * 			return <code>null</code>.
-	 */
-	File getInstallLocation();
-	/**
-	 * Sets the root directory of the install location of this VM.
-	 * 
-	 * @param installLocation the root directory of this VM installation
-	 */
-	void setInstallLocation(File installLocation);
-		
-	/**
-	 * Returns the VM type of this VM.
-	 * 
-	 * @return the VM type that created this IVMInstall instance
-	 */
-	IVMInstallType getVMInstallType();
-	
-	/**
-	 * Returns the library locations of this IVMInstall. Generally,
-	 * clients should use <code>JavaRuntime.getLibraryLocations(IVMInstall)</code>
-	 * to determine the libraries associated with this VM install.
-	 * 
-	 * @see IVMInstall#setLibraryLocations(LibraryLocation[])
-	 * @return 	The library locations of this IVMInstall.
-	 * 			Returns <code>null</code> to indicate that this VM install uses
-	 * 			the default library locations associated with this VM's install type.
-	 * @since 2.0
-	 */
-	LibraryLocation[] getLibraryLocations();	
-	
-	/**
-	 * Sets the library locations of this IVMInstall.
-	 * @param	locations The <code>LibraryLocation</code>s to associate
-	 * 			with this IVMInstall.
-	 * 			May be <code>null</code> to indicate that this VM install uses
-	 * 			the default library locations associated with this VM's install type.
-	 * @since 2.0
-	 */
-	void setLibraryLocations(LibraryLocation[] locations);	
-	
-	/**
-	 * Sets the Javadoc location associated with this VM install.
-	 * 
-	 * @param url a url pointing to the Javadoc location associated with
-	 * 	this VM install
-	 * @since 2.0
-	 */
-	public void setJavadocLocation(URL url);
-	
-	/**
-	 * Returns the Javadoc location associated with this VM install.
-	 * 
-	 * @return a url pointing to the Javadoc location associated with
-	 * 	this VM install, or <code>null</code> if none
-	 * @since 2.0
-	 */
-	public URL getJavadocLocation();
-	
-	/**
-	 * Returns VM arguments to be used with this vm install whenever this
-	 * VM is launched as they should be passed to the command line, or
-	 * <code>null</code> if none.
-	 * 
-	 * @return VM arguments to be used with this vm install whenever this
-	 * VM is launched as they should be passed to the command line, or
-	 * <code>null</code> if none
-	 * @since 3.0
-	 */
-	public String[] getVMArguments();
-	
-	/**
-	 * Sets VM arguments to be used with this vm install whenever this
-	 * VM is launched, possibly <code>null</code>. This is equivalent
-	 * to <code>setVMArgs(String)</code> with whitespace character delimited
-	 * arguments.  
-	 * 
-	 * @param vmArgs VM arguments to be used with this vm install whenever this
-	 * VM is launched, possibly <code>null</code>
-	 * @since 3.0
-	 * @deprecated if possible, clients should use setVMArgs(String) on
-	 *  {@link IVMInstall2} when possible
-	 */
-	public void setVMArguments(String[] vmArgs);
-	    
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall2.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall2.java
deleted file mode 100644
index b9d68a2..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.launching;
-
-
-/**
- * Optional extensions that may be implemented by an
- * {@link org.eclipse.jdt.launching.IVMInstall}.
- * <p>
- * When an <code>IVMInstall</code> implements this interface,
- * clients must call <code>getVMArgs()</code> in place of 
- * <code>getVMArguments()</code> and <code>setVMArgs(String)</code> in place of
- * <code>setVMArguments(String[])</code>. This avoids the problem noted
- * in bug 73493.
- * </p>
- * <p>
- * Additionally, this interface optionally provides the Java version
- * associated with a VM install. 
- * </p>
- * <p>
- * Clients that implement {@link org.eclipse.jdt.launching.IVMInstall} may additionally
- * implement this interface. However, it is strongly recommended that clients subclass
- * {@link org.eclipse.jdt.launching.AbstractVMInstall} instead, which already implements
- * this interface, and will insulate clients from additional API additions in the future.
- * </p>
- * @since 3.1
- */
-public interface IVMInstall2 {
-	
-	/**
-	 * Returns VM arguments to be used with this vm install whenever this
-	 * VM is launched as a raw string, or <code>null</code> if none.
-	 * 
-	 * @return VM arguments to be used with this vm install whenever this
-	 * VM is launched as a raw string, or <code>null</code> if none
-	 */	
-	public String getVMArgs();
-	
-	/**
-	 * Sets VM arguments to be used with this vm install whenever this
-	 * VM is launched as a raw string, possibly <code>null</code>.
-	 * 
-	 * @param vmArgs VM arguments to be used with this vm install whenever this
-	 * VM is launched as a raw string, possibly <code>null</code>
-	 */
-	public void setVMArgs(String vmArgs);
-    
-    /**
-     * Returns a string representing the <code>java.version</code> system property
-     * of this VM install, or <code>null</code> if unknown.
-     * 
-     * @return a string representing the <code>java.version</code> system property
-     * of this VM install, or <code>null</code> if unknown.
-     */
-    public String getJavaVersion();
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallChangedListener.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallChangedListener.java
deleted file mode 100644
index 4948b3b..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallChangedListener.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
- 
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-
-/**
- * A VM install changed listener is notified when
- * the workspace default VM install changes, or when an attribute of
- * a specific VM install changes.
- * Listeners register with <code>JavaRuntime</code>.
- * <p>
- * Clients may implement this interface.
- * </p>
- * @since 2.0
- */
-public interface IVMInstallChangedListener {
-	
-	/**
-	 * Property constant indicating the library locations associated
-	 * with a VM install have changed.
-	 */
-	public static final String PROPERTY_LIBRARY_LOCATIONS = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_LIBRARY_LOCATIONS"; //$NON-NLS-1$
-
-	/**
-	 * Property constant indicating the name associated
-	 * with a VM install has changed.
-	 */
-	public static final String PROPERTY_NAME = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_NAME"; //$NON-NLS-1$
-	
-	/**
-	 * Property constant indicating the install location of
-	 * a VM install has changed.
-	 */
-	public static final String PROPERTY_INSTALL_LOCATION = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_INSTALL_LOCATION";	 //$NON-NLS-1$
-			
-	/**
-	 * Property constant indicating the Javadoc location associated
-	 * with a VM install has changed.
-	 */
-	public static final String PROPERTY_JAVADOC_LOCATION = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_JAVADOC_LOCATION"; //$NON-NLS-1$
-			
-	/**
-	 * Notification that the workspace default VM install
-	 * has changed.
-	 * 
-	 * @param previous the VM install that was previously assigned
-	 * 	to the workspace, possibly <code>null</code>
-	 * @param current the VM install that is currently assigned to the
-	 * 	workspace, possibly <code>null</code>
-	 */
-	public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current);
-	
-	/**
-	 * Notification that a property of a VM install has changed.
-	 * 
-	 * @param event event describing the change. The VM that has changed
-	 * 	is the source object associated with the event.
-	 */
-	public void vmChanged(PropertyChangeEvent event);	
-	
-	/**
-	 * Notification that a VM has been created.
-	 * 
-	 * @param vm the vm that has been created
-	 */
-	public void vmAdded(IVMInstall vm);		
-	
-	/**
-	 * Notification that a VM has been disposed.
-	 * 
-	 * @param vm the vm that has been disposed
-	 */
-	public void vmRemoved(IVMInstall vm);			
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallType.java
deleted file mode 100644
index aa29424..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.launching;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Represents a particular type of VM for which there may be
- * any number of VM installations. An example of a VM type
- * is the standard JRE which might have instances corresponding 
- * to different installed versions such as JRE 1.2.2 and
- * JRE 1.3.
- * <p>
- * This interface is intended to be implemented by clients that contribute
- * to the <code>"org.eclipse.jdt.launching.vmType"</code> extension point.
- * </p>
- * 
- * @see	IVMInstall
- */
-public interface IVMInstallType {
-	/**
-	 * Creates a new instance of this VM Install type.
-	 * The newly created IVMInstall is managed by this IVMInstallType.
-	 * 
-	 * @param	id	An id String that must be unique within this IVMInstallType.
-	 * 
-	 * @return the newly created VM instance
-	 * 
-	 * @throws	IllegalArgumentException	If the id exists already.
-	 */
-	IVMInstall createVMInstall(String id);
-	/**
-	 * Finds the VM with the given id.
-	 * 
-	 * @param id the VM id
-	 * @return a VM instance, or <code>null</code> if not found
-	 */
-	IVMInstall findVMInstall(String id);
-	/**
-	 * Finds the VM with the given name.
-	 * 
-	 * @param name the VM name
-	 * @return a VM instance, or <code>null</code> if not found
-	 * @since 2.0
-	 */
-	IVMInstall findVMInstallByName(String name);	
-	
-	/**
-	 * Remove the VM associated with the given id from the set of VMs managed by
-	 * this VM type. Has no effect if a VM with the given id is not currently managed
-	 * by this type.
-	 * A VM install that is disposed may not be used anymore.
-	 * 
-	 * @param id the id of the VM to be disposed.
-	 */
-	void disposeVMInstall(String id);
-	/**
-	 * Returns all VM instances managed by this VM type.
-	 * 
-	 * @return the list of VM instances managed by this VM type
-	 */
-	IVMInstall[] getVMInstalls();
-	/**
-	 * Returns the display name of this VM type.
-	 * 
-	 * @return the name of this IVMInstallType
-	 */ 
-	String getName();
-	
-	/**
-	 * Returns the globally unique id of this VM type.
-	 * Clients are reponsible for providing a unique id.
-	 * 
-	 * @return the id of this IVMInstallType
-	 */ 
-	String getId();
-	/**
-	 * Validates the given location of a VM installation.
-	 * <p>
-	 * For example, an implementation might check whether the VM executeable 
-	 * is present.
-	 * </p>
-	 * 
-	 * @param installLocation the root directory of a potential installation for
-	 *   this type of VM
-	 * @return a status object describing whether the install location is valid
-	 */
-	IStatus validateInstallLocation(File installLocation);
-	
-	/**
-	 * Tries to detect an installed VM that matches this VM install type.
-	 * Typically, this method will detect the VM installation the
-	 * Eclipse platform runs on. Implementers should return <code>null</code> if they
-	 * can't assure that a given vm install matches this IVMInstallType.
-	 * @return The location of an VM installation that can be used
-	 * 			with this VM install type, or <code>null</code> if unable
-	 * 			to locate an installed VM.
-	 */
-	File detectInstallLocation();
-		
-	/**
-	 * Returns a collection of <code>LibraryLocation</code>s that represent the
-	 * default system libraries of this VM install type, if a VM was installed
-	 * at the given <code>installLocation</code>.
-	 * The returned <code>LibraryLocation</code>s may not exist if the
-	 * <code>installLocation</code> is not a valid install location.
-	 * 
-	 * @param installLocation home location
-	 * @see LibraryLocation
-	 * @see IVMInstallType#validateInstallLocation(File)
-	 * 
-	 * @return default library locations based on the given <code>installLocation</code>.
-	 * @since 2.0
-	 */
-	LibraryLocation[] getDefaultLibraryLocations(File installLocation);	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMRunner.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMRunner.java
deleted file mode 100644
index 2fa92e9..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMRunner.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-
-
-
-/**
- * A VM runner starts a Java VM running a Java program.
- * <p>
- * Clients may implement this interface to launch a new kind of VM.
- * </p>
- */
-public interface IVMRunner {
-		
-	/**
-	 * Launches a Java VM as specified in the given configuration,
-	 * contributing results (debug targets and processes), to the
-	 * given launch.
-	 *
-	 * @param configuration the configuration settings for this run
-	 * @param launch the launch to contribute to
-	 * @param monitor progress monitor or <code>null</code>
-	 * @exception CoreException if an exception occurs while launching
-	 */
-	public void run(VMRunnerConfiguration configuration, ILaunch launch, IProgressMonitor monitor) throws CoreException;	
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
deleted file mode 100644
index 14589d1..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-
-/**
- * A launch delegate for launching local Java applications.
- * <p>
- * Clients may subclass and instantiate this class.
- * </p>
- * @since 3.1
- */
-public class JavaLaunchDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		monitor.beginTask(MessageFormat.format("{0}...", new String[]{configuration.getName()}), 3); //$NON-NLS-1$
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		monitor.subTask(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_Verifying_launch_attributes____1); 
-						
-		String mainTypeName = verifyMainTypeName(configuration);
-		IVMRunner runner = getVMRunner(configuration, mode);
-
-		File workingDir = verifyWorkingDirectory(configuration);
-		String workingDirName = null;
-		if (workingDir != null) {
-			workingDirName = workingDir.getAbsolutePath();
-		}
-		
-		// Environment variables
-		String[] envp= getEnvironment(configuration);
-		
-		// Program & VM args
-		String pgmArgs = getProgramArguments(configuration);
-		String vmArgs = getVMArguments(configuration);
-		ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-		
-		// VM-specific attributes
-		Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-		
-		// Classpath
-		String[] classpath = getClasspath(configuration);
-		
-		// Create VM config
-		VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
-		runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
-		runConfig.setEnvironment(envp);
-		runConfig.setVMArguments(execArgs.getVMArgumentsArray());
-		runConfig.setWorkingDirectory(workingDirName);
-		runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
-		// Bootpath
-		runConfig.setBootClassPath(getBootpath(configuration));
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-		
-		// stop in main
-		prepareStopInMain(configuration);
-		
-		// done the verification phase
-		monitor.worked(1);
-		
-		monitor.subTask(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_Creating_source_locator____2); 
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-		monitor.worked(1);		
-		
-		// Launch the configuration - 1 unit of work
-		runner.run(runConfig, launch, monitor);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}	
-		
-		monitor.done();
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
deleted file mode 100644
index 5101687..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ /dev/null
@@ -1,2080 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.CompositeId;
-import org.eclipse.jdt.internal.launching.DefaultEntryResolver;
-import org.eclipse.jdt.internal.launching.DefaultProjectClasspathEntry;
-import org.eclipse.jdt.internal.launching.JavaSourceLookupUtil;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.internal.launching.ListenerList;
-import org.eclipse.jdt.internal.launching.RuntimeClasspathEntry;
-import org.eclipse.jdt.internal.launching.RuntimeClasspathEntryResolver;
-import org.eclipse.jdt.internal.launching.RuntimeClasspathProvider;
-import org.eclipse.jdt.internal.launching.SocketAttachConnector;
-import org.eclipse.jdt.internal.launching.VMDefinitionsContainer;
-import org.eclipse.jdt.internal.launching.VariableClasspathEntry;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * The central access point for launching support. This class manages
- * the registered VM types contributed through the 
- * <code>"org.eclipse.jdt.launching.vmType"</code> extension point.
- * As well, this class provides VM install change notification,
- * and computes classpaths and source lookup paths for launch
- * configurations.
- * <p>
- * This class provides static methods only; it is not intended to be
- * instantiated or subclassed by clients.
- * </p>
- */
-public final class JavaRuntime {
-	
-	/**
-	 * Classpath variable name used for the default JRE's library
-	 * (value <code>"JRE_LIB"</code>).
-	 */
-	public static final String JRELIB_VARIABLE= "JRE_LIB"; //$NON-NLS-1$
-
-	/**
-	 * Classpath variable name used for the default JRE's library source
-	 * (value <code>"JRE_SRC"</code>).
-	 */
-	public static final String JRESRC_VARIABLE= "JRE_SRC"; //$NON-NLS-1$
-	
-	/**
-	 * Classpath variable name used for the default JRE's library source root
-	 * (value <code>"JRE_SRCROOT"</code>).
-	 */	
-	public static final String JRESRCROOT_VARIABLE= "JRE_SRCROOT"; //$NON-NLS-1$
-	
-	/**
-	 * Simple identifier constant (value <code>"runtimeClasspathEntryResolvers"</code>) for the
-	 * runtime classpath entry resolvers extension point.
-	 * 
-	 * @since 2.0
-	 */
-	public static final String EXTENSION_POINT_RUNTIME_CLASSPATH_ENTRY_RESOLVERS= "runtimeClasspathEntryResolvers";	 //$NON-NLS-1$	
-	
-	/**
-	 * Simple identifier constant (value <code>"classpathProviders"</code>) for the
-	 * runtime classpath providers extension point.
-	 * 
-	 * @since 2.0
-	 */
-	public static final String EXTENSION_POINT_RUNTIME_CLASSPATH_PROVIDERS= "classpathProviders";	 //$NON-NLS-1$		
-		
-	/**
-	 * Classpath container used for a project's JRE
-	 * (value <code>"org.eclipse.jdt.launching.JRE_CONTAINER"</code>). A
-	 * container is resolved in the context of a specific Java project, to one
-	 * or more system libraries contained in a JRE. The container can have zero
-	 * or two path segments following the container name. When no segments
-	 * follow the container name, the workspace default JRE is used to build a
-	 * project. Otherwise the segments identify a specific JRE used to build a
-	 * project:
-	 * <ol>
-	 * <li>VM Install Type Identifier - identifies the type of JRE used to build the
-	 * 	project. For example, the standard VM.</li>
-	 * <li>VM Install Name - a user defined name that identifies that a specific VM
-	 * 	of the above kind. For example, <code>IBM 1.3.1</code>. This information is
-	 *  shared in a projects classpath file, so teams must agree on JRE naming
-	 * 	conventions.</li>
-	 * </ol>
-	 * 
-	 * @since 2.0
-	 */
-	public static final String JRE_CONTAINER = LaunchingPlugin.getUniqueIdentifier() + ".JRE_CONTAINER"; //$NON-NLS-1$
-	
-	/**
-	 * A status code indicating that a JRE could not be resolved for a project.
-	 * When a JRE cannot be resolved for a project by this plug-in's container
-	 * initializer, an exception is thrown with this status code. A status handler
-	 * may be registered for this status code. The <code>source</code> object provided
-	 * to the status handler is the Java project for which the path could not be
-	 * resolved. The status handler must return an <code>IVMInstall</code> or <code>null</code>.
-	 * The container resolver will re-set the project's classpath if required.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int ERR_UNABLE_TO_RESOLVE_JRE = 160;
-	
-	/**
-	 * Preference key for launch/connect timeout. VM Runners should honor this timeout
-	 * value when attempting to launch and connect to a debuggable VM. The value is
-	 * an int, indicating a number of milliseconds.
-	 * 
-	 * @since 2.0
-	 */
-	public static final String PREF_CONNECT_TIMEOUT = LaunchingPlugin.getUniqueIdentifier() + ".PREF_CONNECT_TIMEOUT"; //$NON-NLS-1$
-	
-	/**
-	 * Preference key for the String of XML that defines all installed VMs.
-	 * 
-	 * @since 2.1
-	 */
-	public static final String PREF_VM_XML = LaunchingPlugin.getUniqueIdentifier() + ".PREF_VM_XML"; //$NON-NLS-1$
-	
-	/**
-	 * Default launch/connect timeout (ms).
-	 * 
-	 * @since 2.0
-	 */
-	public static final int DEF_CONNECT_TIMEOUT = 20000;
-	
-	/**
-	 * Attribute key for a process property. The class
-	 * <code>org.eclipse.debug.core.model.IProcess</code> allows attaching
-	 * String properties to processes.
-	 * The value of this attribute is the command line a process
-	 * was launched with. Implementers of <code>IVMRunner</code> should use
-	 * this attribute key to attach the command lines to the processes they create.
-	 * 
-	 * @deprecated - use <code>IProcess.ATTR_CMDLINE</code>
-	 */
-	public final static String ATTR_CMDLINE= LaunchingPlugin.getUniqueIdentifier() + ".launcher.cmdLine"; //$NON-NLS-1$
-	
-	/**
-	 * Attribute key for a classpath attribute referencing a
-	 * list of shared libraries that should appear on the
-	 * <code>-Djava.library.path</code> system property.
-	 * <p>
-	 * The factory methods <code>newLibraryPathsAttribute(String[])</code>
-	 * and <code>getLibraryPaths(IClasspathAttribute)</code> should be used to
-	 * encode and decode the attribute value. 
-	 * </p>
-	 * <p>
-	 * Each string is used to create an <code>IPath</code> using the constructor
-	 * <code>Path(String)</code>, and may contain <code>IStringVariable</code>'s.
-	 * Variable substitution is performed on the string prior to constructing
-	 * a path from the string.
-	 * If the resulting <code>IPath</code> is a relative path, it is interpretted
-	 * as relative to the workspace location. If the path is absolute, it is 
-	 * interpretted as an absolute path in the local file system.
-	 * </p>
-	 * @since 3.1
-	 * @see org.eclipse.jdt.core.IClasspathAttribute
-	 */
-	public static final String CLASSPATH_ATTR_LIBRARY_PATH_ENTRY =  LaunchingPlugin.getUniqueIdentifier() + ".CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"; //$NON-NLS-1$
-
-	private static IVMInstallType[] fgVMTypes= null;
-	private static String fgDefaultVMId= null;
-	private static String fgDefaultVMConnectorId = null;
-	
-	/**
-	 * Resolvers keyed by variable name, container id,
-	 * and runtime classpath entry id.
-	 */
-	private static Map fgVariableResolvers = null;
-	private static Map fgContainerResolvers = null;
-	private static Map fgRuntimeClasspathEntryResolvers = null;
-	
-	/**
-	 * Path providers keyed by id
-	 */
-	private static Map fgPathProviders = null;
-	
-	/**
-	 * Default classpath and source path providers.
-	 */
-	private static IRuntimeClasspathProvider fgDefaultClasspathProvider = new StandardClasspathProvider();
-	private static IRuntimeClasspathProvider fgDefaultSourcePathProvider = new StandardSourcePathProvider();
-	
-	/**
-	 * VM change listeners
-	 */
-	private static ListenerList fgVMListeners = new ListenerList(5);
-	
-	/**
-	 * Cache of already resolved projects in container entries. Used to avoid
-	 * cycles in project dependencies when resolving classpath container entries.
-	 */
-	private static ThreadLocal fgProjects = new ThreadLocal();
-	
-	/**
-	 * This class contains only static methods, and is not intended
-	 * to be instantiated.
-	 */
-	private JavaRuntime() {
-	}
-
-	private static synchronized void initializeVMTypes() {
-		IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.ID_PLUGIN, "vmInstallTypes"); //$NON-NLS-1$
-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements(); 
-		MultiStatus status= new MultiStatus(LaunchingPlugin.getUniqueIdentifier(), IStatus.OK, LaunchingMessages.JavaRuntime_exceptionOccurred, null); 
-		fgVMTypes= new IVMInstallType[configs.length];
-
-		for (int i= 0; i < configs.length; i++) {
-			try {
-				IVMInstallType vmType= (IVMInstallType)configs[i].createExecutableExtension("class"); //$NON-NLS-1$
-				fgVMTypes[i]= vmType;
-			} catch (CoreException e) {
-				status.add(e.getStatus());
-			}
-		}
-		if (!status.isOK()) {
-			//only happens on a CoreException
-			LaunchingPlugin.log(status);
-			//cleanup null entries in fgVMTypes
-			List temp= new ArrayList(fgVMTypes.length);
-			for (int i = 0; i < fgVMTypes.length; i++) {
-				if(fgVMTypes[i] != null) {
-					temp.add(fgVMTypes[i]);
-				}
-				fgVMTypes= new IVMInstallType[temp.size()];
-				fgVMTypes= (IVMInstallType[])temp.toArray(fgVMTypes);
-			}
-		}
-		
-		try {
-			initializeVMConfiguration();
-		} catch (IOException e) {
-			LaunchingPlugin.log(e);
-		} catch (ParserConfigurationException e) {
-			LaunchingPlugin.log(e);
-		} catch (TransformerException e) {
-			LaunchingPlugin.log(e);
-		}
-	}
-
-	/**
-	 * Returns the VM assigned to build the given Java project.
-	 * The project must exist. The VM assigned to a project is
-	 * determined from its build path.
-	 * 
-	 * @param project the project to retrieve the VM from
-	 * @return the VM instance that is assigned to build the given Java project
-	 * 		   Returns <code>null</code> if no VM is referenced on the project's build path.
-	 * @throws CoreException if unable to determine the project's VM install
-	 */
-	public static IVMInstall getVMInstall(IJavaProject project) throws CoreException {
-		// check the classpath
-		IVMInstall vm = null;
-		IClasspathEntry[] classpath = project.getRawClasspath();
-		IRuntimeClasspathEntryResolver resolver = null;
-		for (int i = 0; i < classpath.length; i++) {
-			IClasspathEntry entry = classpath[i];
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_VARIABLE:
-					resolver = getVariableResolver(entry.getPath().segment(0));
-					if (resolver != null) {
-						vm = resolver.resolveVMInstall(entry);
-					}
-					break;
-				case IClasspathEntry.CPE_CONTAINER:
-					resolver = getContainerResolver(entry.getPath().segment(0));
-					if (resolver != null) {
-						vm = resolver.resolveVMInstall(entry);
-					}
-					break;
-			}
-			if (vm != null) {
-				return vm;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the VM install type with the given unique id. 
-	 * @param id the VM install type unique id
-	 * @return	The VM install type for the given id, or <code>null</code> if no
-	 * 			VM install type with the given id is registered.
-	 */
-	public static IVMInstallType getVMInstallType(String id) {
-		IVMInstallType[] vmTypes= getVMInstallTypes();
-		for (int i= 0; i < vmTypes.length; i++) {
-			if (vmTypes[i].getId().equals(id)) {
-				return vmTypes[i];
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Sets a VM as the system-wide default VM, and notifies registered VM install
-	 * change listeners of the change.
-	 * 
-	 * @param vm	The vm to make the default. May be <code>null</code> to clear 
-	 * 				the default.
-	 * @param monitor progress monitor or <code>null</code>
-	 */
-	public static void setDefaultVMInstall(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
-		setDefaultVMInstall(vm, monitor, true);
-	}	
-	
-	/**
-	 * Sets a VM as the system-wide default VM, and notifies registered VM install
-	 * change listeners of the change.
-	 * 
-	 * @param vm	The vm to make the default. May be <code>null</code> to clear 
-	 * 				the default.
-	 * @param monitor progress monitor or <code>null</code>
-	 * @param savePreference If <code>true</code>, update workbench preferences to reflect
-	 * 		   				  the new default VM.
-	 * @since 2.1
-	 */
-	public static void setDefaultVMInstall(IVMInstall vm, IProgressMonitor monitor, boolean savePreference) throws CoreException {
-		IVMInstall previous = null;
-		if (fgDefaultVMId != null) {
-			previous = getVMFromCompositeId(fgDefaultVMId);
-		}
-		fgDefaultVMId= getCompositeIdFromVM(vm);
-		if (savePreference) {
-			saveVMConfiguration();
-		}
-		IVMInstall current = null;
-		if (fgDefaultVMId != null) {
-			current = getVMFromCompositeId(fgDefaultVMId);
-		}
-		if (previous != current) {
-			notifyDefaultVMChanged(previous, current);
-		}
-	}
-	
-	/**
-	 * Sets a VM connector as the system-wide default VM. This setting is persisted when
-	 * saveVMConfiguration is called. 
-	 * @param	connector The connector to make the default. May be <code>null</code> to clear 
-	 * 				the default.
-	 * @param monitor The progress monitor to use
-	 * @since 2.0
-	 * @throws CoreException Thrown if saving the new default setting fails
-	 */
-	public static void setDefaultVMConnector(IVMConnector connector, IProgressMonitor monitor) throws CoreException {
-		fgDefaultVMConnectorId= connector.getIdentifier();
-		saveVMConfiguration();
-	}		
-	
-	/**
-	 * Return the default VM set with <code>setDefaultVM()</code>.
-	 * @return	Returns the default VM. May return <code>null</code> when no default
-	 * 			VM was set or when the default VM has been disposed.
-	 */
-	public static IVMInstall getDefaultVMInstall() {
-		IVMInstall install= getVMFromCompositeId(getDefaultVMId());
-		if (install != null && install.getInstallLocation().exists()) {
-			return install;
-		}
-		// if the default JRE goes missing, re-detect
-		if (install != null) {
-			install.getVMInstallType().disposeVMInstall(install.getId());
-		}
-		fgDefaultVMId = null;
-		// re-detect
-		detectDefaultVM();
-		// update VM prefs 
-		try {
-			saveVMConfiguration();
-		} catch(CoreException e) {
-			LaunchingPlugin.log(e);
-		}
-		return getVMFromCompositeId(getDefaultVMId());
-	}
-	
-	/**
-	 * Return the default VM connector.
-	 * @return	Returns the default VM connector.
-	 * @since 2.0
-	 */
-	public static IVMConnector getDefaultVMConnector() {
-		String id = getDefaultVMConnectorId();
-		IVMConnector connector = null;
-		if (id != null) {
-			connector = getVMConnector(id);
-		}
-		if (connector == null) {
-			connector = new SocketAttachConnector();
-		}
-		return connector;
-	}	
-	
-	/**
-	 * Returns the list of registered VM types. VM types are registered via
-	 * <code>"org.eclipse.jdt.launching.vmTypes"</code> extension point.
-	 * Returns an empty list if there are no registered VM types.
-	 * 
-	 * @return the list of registered VM types
-	 */
-	public static synchronized IVMInstallType[] getVMInstallTypes() {
-		if (fgVMTypes == null) {
-			initializeVMTypes();
-		}
-		return fgVMTypes; 
-	}
-	
-	private static synchronized String getDefaultVMId() {
-		if (fgVMTypes == null) {
-			initializeVMTypes();
-		}
-		return fgDefaultVMId;
-	}
-	
-	private static synchronized String getDefaultVMConnectorId() {
-		if (fgVMTypes == null) {
-			initializeVMTypes();
-		}
-		return fgDefaultVMConnectorId;
-	}	
-	
-	/** 
-	 * Returns a String that uniquely identifies the specified VM across all VM types.
-	 * 
-	 * @param vm the instance of IVMInstallType to be indentified
-	 * 
-	 * @since 2.1
-	 */
-	public static String getCompositeIdFromVM(IVMInstall vm) {
-		if (vm == null) {
-			return null;
-		}
-		IVMInstallType vmType= vm.getVMInstallType();
-		String typeID= vmType.getId();
-		CompositeId id= new CompositeId(new String[] { typeID, vm.getId() });
-		return id.toString();
-	}
-	
-	/**
-	 * Return the VM corrseponding to the specified composite Id.  The id uniquely
-	 * identifies a VM across all vm types.  
-	 * 
-	 * @param idString the composite id that specifies an instance of IVMInstall
-	 * 
-	 * @since 2.1
-	 */
-	public static IVMInstall getVMFromCompositeId(String idString) {
-		if (idString == null || idString.length() == 0) {
-			return null;
-		}
-		CompositeId id= CompositeId.fromString(idString);
-		if (id.getPartCount() == 2) {
-			IVMInstallType vmType= getVMInstallType(id.get(0));
-			if (vmType != null) {
-				return vmType.findVMInstall(id.get(1));
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a new runtime classpath entry for the given expression that
-	 * may contain string substitution variable references. The resulting expression
-	 * refers to an archive (jar or directory) containing class files.
-	 * 
-	 * @param expression an expression that resolves to the location of an archive
-	 * @return runtime classpath entry
-	 * @since 3.0
-	 */
-	public static IRuntimeClasspathEntry newStringVariableClasspathEntry(String expression) {
-		return new VariableClasspathEntry(expression);
-	}
-	
-	/**
-	 * Returns a new runtime classpath entry containing the default classpath
-	 * for the specified Java project. 
-	 * 
-	 * @param project Java project
-	 * @return runtime classpath entry
-	 * @since 3.0
-	 */
-	public static IRuntimeClasspathEntry newDefaultProjectClasspathEntry(IJavaProject project) {
-		return new DefaultProjectClasspathEntry(project);
-	}	
-	
-	/**
-	 * Returns a new runtime classpath entry for the given project.
-	 * 
-	 * @param project Java project
-	 * @return runtime classpath entry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry newProjectRuntimeClasspathEntry(IJavaProject project) {
-		IClasspathEntry cpe = JavaCore.newProjectEntry(project.getProject().getFullPath());
-		return newRuntimeClasspathEntry(cpe);
-	}
-	
-	
-	/**
-	 * Returns a new runtime classpath entry for the given archive.
-	 * 
-	 * @param resource archive resource
-	 * @return runtime classpath entry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry newArchiveRuntimeClasspathEntry(IResource resource) {
-		IClasspathEntry cpe = JavaCore.newLibraryEntry(resource.getFullPath(), null, null);
-		return newRuntimeClasspathEntry(cpe);
-	}
-	
-	/**
-	 * Returns a new runtime classpath entry for the given archive (possibly
-	 * external).
-	 * 
-	 * @param path absolute path to an archive
-	 * @return runtime classpath entry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry newArchiveRuntimeClasspathEntry(IPath path) {
-		IClasspathEntry cpe = JavaCore.newLibraryEntry(path, null, null);
-		return newRuntimeClasspathEntry(cpe);
-	}
-
-	/**
-	 * Returns a new runtime classpath entry for the classpath
-	 * variable with the given path.
-	 * 
-	 * @param path variable path; first segment is the name of the variable; 
-	 * 	trailing segments are appended to the resolved variable value
-	 * @return runtime classpath entry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry newVariableRuntimeClasspathEntry(IPath path) {
-		IClasspathEntry cpe = JavaCore.newVariableEntry(path, null, null);
-		return newRuntimeClasspathEntry(cpe);
-	}
-
-	/**
-	 * Returns a runtime classpath entry for the given container path with the given
-	 * classpath property.
-	 * 
-	 * @param path container path
-	 * @param classpathProperty the type of entry - one of <code>USER_CLASSES</code>,
-	 * 	<code>BOOTSTRAP_CLASSES</code>, or <code>STANDARD_CLASSES</code>
-	 * @return runtime classpath entry
-	 * @exception CoreException if unable to construct a runtime classpath entry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry newRuntimeContainerClasspathEntry(IPath path, int classpathProperty) throws CoreException {
-		return newRuntimeContainerClasspathEntry(path, classpathProperty, null);
-	}
-	
-	/**
-	 * Returns a runtime classpath entry for the given container path with the given
-	 * classpath property to be resolved in the context of the given Java project.
-	 * 
-	 * @param path container path
-	 * @param classpathProperty the type of entry - one of <code>USER_CLASSES</code>,
-	 * 	<code>BOOTSTRAP_CLASSES</code>, or <code>STANDARD_CLASSES</code>
-	 * @param project Java project context used for resolution, or <code>null</code>
-	 *  if to be resolved in the context of the launch configuration this entry
-	 *  is referenced in
-	 * @return runtime classpath entry
-	 * @exception CoreException if unable to construct a runtime classpath entry
-	 * @since 3.0
-	 */
-	public static IRuntimeClasspathEntry newRuntimeContainerClasspathEntry(IPath path, int classpathProperty, IJavaProject project) throws CoreException {
-		IClasspathEntry cpe = JavaCore.newContainerEntry(path);
-		RuntimeClasspathEntry entry = new RuntimeClasspathEntry(cpe, classpathProperty);
-		entry.setJavaProject(project);
-		return entry;
-	}	
-		
-	/**
-	 * Returns a runtime classpath entry constructed from the given memento.
-	 * 
-	 * @param memento a memento for a runtime classpath entry
-	 * @return runtime classpath entry
-	 * @exception CoreException if unable to construct a runtime classpath entry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry newRuntimeClasspathEntry(String memento) throws CoreException {
-		try {
-			Element root = null;
-			DocumentBuilder parser = LaunchingPlugin.getParser();
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			String id = root.getAttribute("id"); //$NON-NLS-1$
-			if (id == null || id.length() == 0) {
-				// assume an old format
-				return new RuntimeClasspathEntry(root);
-			}
-			// get the extension & create a new one
-			IRuntimeClasspathEntry2 entry = LaunchingPlugin.getDefault().newRuntimeClasspathEntry(id);
-			NodeList list = root.getChildNodes();
-			for (int i = 0; i < list.getLength(); i++) {
-				Node node = list.item(i);
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					Element element = (Element)node;
-					if ("memento".equals(element.getNodeName())) { //$NON-NLS-1$
-						entry.initializeFrom(element);
-					}
-				}
-			}
-			return entry;
-		} catch (SAXException e) {
-			abort(LaunchingMessages.JavaRuntime_31, e); 
-		} catch (IOException e) {
-			abort(LaunchingMessages.JavaRuntime_32, e); 
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a runtime classpath entry that corresponds to the given
-	 * classpath entry. The classpath entry may not be of type <code>CPE_SOURCE</code>
-	 * or <code>CPE_CONTAINER</code>.
-	 * 
-	 * @param entry a classpath entry
-	 * @return runtime classpath entry
-	 * @since 2.0
-	 */
-	private static IRuntimeClasspathEntry newRuntimeClasspathEntry(IClasspathEntry entry) {
-		return new RuntimeClasspathEntry(entry);
-	}	
-			
-	/**
-	 * Computes and returns the default unresolved runtime claspath for the
-	 * given project.
-	 * 
-	 * @return runtime classpath entries
-	 * @exception CoreException if unable to compute the runtime classpath
-	 * @see IRuntimeClasspathEntry
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] computeUnresolvedRuntimeClasspath(IJavaProject project) throws CoreException {
-		IClasspathEntry[] entries = project.getRawClasspath();
-		List classpathEntries = new ArrayList(3);
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_CONTAINER:
-					IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-					if (container != null) {
-						switch (container.getKind()) {
-							case IClasspathContainer.K_APPLICATION:
-								// don't look at application entries
-								break;
-							case IClasspathContainer.K_DEFAULT_SYSTEM:
-								classpathEntries.add(newRuntimeContainerClasspathEntry(container.getPath(), IRuntimeClasspathEntry.STANDARD_CLASSES, project));
-								break;	
-							case IClasspathContainer.K_SYSTEM:
-								classpathEntries.add(newRuntimeContainerClasspathEntry(container.getPath(), IRuntimeClasspathEntry.BOOTSTRAP_CLASSES, project));
-								break;
-						}						
-					}
-					break;
-				case IClasspathEntry.CPE_VARIABLE:
-					if (JRELIB_VARIABLE.equals(entry.getPath().segment(0))) {
-						IRuntimeClasspathEntry jre = newVariableRuntimeClasspathEntry(entry.getPath());
-						jre.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-						classpathEntries.add(jre);
-					}
-					break;
-				default:
-					break;
-			}
-		}
-		classpathEntries.add(newDefaultProjectClasspathEntry(project));
-		return (IRuntimeClasspathEntry[]) classpathEntries.toArray(new IRuntimeClasspathEntry[classpathEntries.size()]);
-		
-
-	}
-	
-	/**
-	 * Computes and returns the unresolved source lookup path for the given launch
-	 * configuration.
-	 * 
-	 * @param configuration launch configuration
-	 * @return runtime classpath entries
-	 * @exception CoreException if unable to compute the source lookup path
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] computeUnresolvedSourceLookupPath(ILaunchConfiguration configuration) throws CoreException {
-		return getSourceLookupPathProvider(configuration).computeUnresolvedClasspath(configuration);
-	}
-	
-	/**
-	 * Resolves the given source lookup path, returning the resolved source lookup path
-	 * in the context of the given launch configuration.
-	 * 
-	 * @param entries unresolved entries
-	 * @param configuration launch configuration
-	 * @return resolved entries
-	 * @exception CoreException if unable to resolve the source lookup path
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] resolveSourceLookupPath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		return getSourceLookupPathProvider(configuration).resolveClasspath(entries, configuration);
-	}	
-	
-	/**
-	 * Returns the classpath provider for the given launch configuration.
-	 * 
-	 * @param configuration launch configuration
-	 * @return classpath provider
-	 * @exception CoreException if unable to resolve the path provider
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathProvider getClasspathProvider(ILaunchConfiguration configuration) throws CoreException {
-		String providerId = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, (String)null);
-		IRuntimeClasspathProvider provider = null;
-		if (providerId == null) {
-			provider = fgDefaultClasspathProvider;
-		} else {
-			provider = (IRuntimeClasspathProvider)getClasspathProviders().get(providerId);
-			if (provider == null) {
-				abort(MessageFormat.format(LaunchingMessages.JavaRuntime_26, new String[]{providerId}), null); 
-			}
-		}
-		return provider;
-	}	
-		
-	/**
-	 * Returns the source lookup path provider for the given launch configuration.
-	 * 
-	 * @param configuration launch configuration
-	 * @return source lookup path provider
-	 * @exception CoreException if unable to resolve the path provider
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathProvider getSourceLookupPathProvider(ILaunchConfiguration configuration) throws CoreException {
-		String providerId = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, (String)null);
-		IRuntimeClasspathProvider provider = null;
-		if (providerId == null) {
-			provider = fgDefaultSourcePathProvider;
-		} else {
-			provider = (IRuntimeClasspathProvider)getClasspathProviders().get(providerId);
-			if (provider == null) {
-				abort(MessageFormat.format(LaunchingMessages.JavaRuntime_27, new String[]{providerId}), null); 
-			}
-		}
-		return provider;
-	}	
-		
-	/**
-	 * Returns resolved entries for the given entry in the context of the given
-	 * launch configuration. If the entry is of kind
-	 * <code>VARIABLE</code> or <code>CONTAINER</code>, variable and contanier
-	 * resolvers are consulted. If the entry is of kind <code>PROJECT</code>,
-	 * and the associated Java project specifies non-default output locations,
-	 * the corresponding output locations are returned. Otherwise, the given
-	 * entry is returned.
-	 * <p>
-	 * If the given entry is a variable entry, and a resolver is not registered,
-	 * the entry itself is returned. If the given entry is a container, and a
-	 * resolver is not registered, resolved runtime classpath entries are calculated
-	 * from the associated container classpath entries, in the context of the project
-	 * associated with the given launch configuration.
-	 * </p>
-	 * @param entry runtime classpath entry
-	 * @param configuration launch configuration
-	 * @return resolved runtime classpath entry
-	 * @exception CoreException if unable to resolve
-	 * @see IRuntimeClasspathEntryResolver
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, ILaunchConfiguration configuration) throws CoreException {
-		switch (entry.getType()) {
-			case IRuntimeClasspathEntry.PROJECT:
-				// if the project has multiple output locations, they must be returned
-				IResource resource = entry.getResource();
-				if (resource instanceof IProject) {
-					IProject p = (IProject)resource;
-					IJavaProject project = JavaCore.create(p);
-					if (project == null || !p.isOpen() || !project.exists()) { 
-						return new IRuntimeClasspathEntry[0];
-					}
-					IRuntimeClasspathEntry[] entries = resolveOutputLocations(project, entry.getClasspathProperty());
-					if (entries != null) {
-						return entries;
-					}
-				} else {
-					// could not resolve project
-					abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_project___0__3, new String[]{entry.getPath().lastSegment()}), null); 
-				}
-				break;
-			case IRuntimeClasspathEntry.VARIABLE:
-				IRuntimeClasspathEntryResolver resolver = getVariableResolver(entry.getVariableName());
-				if (resolver == null) {
-					IRuntimeClasspathEntry[] resolved = resolveVariableEntry(entry, null, configuration);
-					if (resolved != null) { 
-						return resolved;
-					}
-					break;
-				} 
-				return resolver.resolveRuntimeClasspathEntry(entry, configuration);				
-			case IRuntimeClasspathEntry.CONTAINER:
-				resolver = getContainerResolver(entry.getVariableName());
-				if (resolver == null) {
-					return computeDefaultContainerEntries(entry, configuration);
-				} 
-				return resolver.resolveRuntimeClasspathEntry(entry, configuration);
-			case IRuntimeClasspathEntry.ARCHIVE:
-				// verify the archive exists
-				String location = entry.getLocation();
-				if (location == null) {
-					abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, new String[]{entry.getPath().toString()}), null); 
-				}
-				File file = new File(location);
-				if (!file.exists()) {
-					abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, new String[]{entry.getPath().toString()}), null); 
-				}
-				break;
-			case IRuntimeClasspathEntry.OTHER:
-				resolver = getContributedResolver(((IRuntimeClasspathEntry2)entry).getTypeId());
-				return resolver.resolveRuntimeClasspathEntry(entry, configuration);
-			default:
-				break;
-		}
-		return new IRuntimeClasspathEntry[] {entry};
-	}
-	
-	/**
-	 * Default resolution for a classpath variable - resolve to an archive. Only
-	 * one of project/configuration can be non-null.
-	 * 
-	 * @param entry
-	 * @param project the project context or <code>null</code>
-	 * @param configuration configuration context or <code>null</code>
-	 * @return IRuntimeClasspathEntry[]
-	 * @throws CoreException
-	 */
-	private static IRuntimeClasspathEntry[] resolveVariableEntry(IRuntimeClasspathEntry entry, IJavaProject project, ILaunchConfiguration configuration) throws CoreException {
-		// default resolution - an archive
-		IPath archPath = JavaCore.getClasspathVariable(entry.getVariableName());
-		if (archPath != null) {
-			if (entry.getPath().segmentCount() > 1) {
-				archPath = archPath.append(entry.getPath().removeFirstSegments(1));
-			}
-			IPath srcPath = null;
-			IPath srcVar = entry.getSourceAttachmentPath();
-			IPath srcRootPath = null;
-			IPath srcRootVar = entry.getSourceAttachmentRootPath();
-			if (archPath != null && !archPath.isEmpty()) {
-				if (srcVar != null && !srcVar.isEmpty()) {
-					srcPath = JavaCore.getClasspathVariable(srcVar.segment(0));
-					if (srcPath != null) {
-						if (srcVar.segmentCount() > 1) {
-							srcPath = srcPath.append(srcVar.removeFirstSegments(1));
-						}
-						if (srcRootVar != null && !srcRootVar.isEmpty()) {
-							srcRootPath = JavaCore.getClasspathVariable(srcRootVar.segment(0));	
-							if (srcRootPath != null) {
-								if (srcRootVar.segmentCount() > 1) {
-									srcRootPath = srcRootPath.append(srcRootVar.removeFirstSegments(1));					
-								}
-							}
-						}
-					}
-				}
-				// now resolve the archive (recursively)
-				IClasspathEntry archEntry = JavaCore.newLibraryEntry(archPath, srcPath, srcRootPath, entry.getClasspathEntry().isExported());
-				IRuntimeClasspathEntry runtimeArchEntry = newRuntimeClasspathEntry(archEntry);
-				runtimeArchEntry.setClasspathProperty(entry.getClasspathProperty());
-				if (configuration == null) {
-					return resolveRuntimeClasspathEntry(runtimeArchEntry, project);
-				} 
-				return resolveRuntimeClasspathEntry(runtimeArchEntry, configuration);
-			}		
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns runtime classpath entries corresponding to the output locations
-	 * of the given project, or null if the project only uses the default
-	 * output location.
-	 * 
-	 * @param project
-	 * @param classpathProperty the type of classpath entries to create
-	 * @return IRuntimeClasspathEntry[] or <code>null</code>
-	 * @throws CoreException
-	 */
-	private static IRuntimeClasspathEntry[] resolveOutputLocations(IJavaProject project, int classpathProperty) throws CoreException {
-		List nonDefault = new ArrayList();
-		if (project.exists() && project.getProject().isOpen()) {
-			IClasspathEntry entries[] = project.getRawClasspath();
-			for (int i = 0; i < entries.length; i++) {
-				IClasspathEntry classpathEntry = entries[i];
-				if (classpathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					IPath path = classpathEntry.getOutputLocation();
-					if (path != null) {
-						nonDefault.add(path);
-					}
-				}
-			}
-		}
-		if (nonDefault.isEmpty()) {
-			return null; 
-		} 
-		// add the default location if not already included
-		IPath def = project.getOutputLocation();
-		if (!nonDefault.contains(def)) {
-			nonDefault.add(def);						
-		}
-		IRuntimeClasspathEntry[] locations = new IRuntimeClasspathEntry[nonDefault.size()];
-		for (int i = 0; i < locations.length; i++) {
-			IClasspathEntry newEntry = JavaCore.newLibraryEntry((IPath)nonDefault.get(i), null, null);
-			locations[i] = new RuntimeClasspathEntry(newEntry);
-			locations[i].setClasspathProperty(classpathProperty);
-		}
-		return locations;						
-	}
-	
-	/**
-	 * Returns resolved entries for the given entry in the context of the given
-	 * Java project. If the entry is of kind
-	 * <code>VARIABLE</code> or <code>CONTAINER</code>, variable and contanier
-	 * resolvers are consulted. If the entry is of kind <code>PROJECT</code>,
-	 * and the associated Java project specifies non-default output locations,
-	 * the corresponding output locations are returned. Otherwise, the given
-	 * entry is returned.
-	 * <p>
-	 * If the given entry is a variable entry, and a resolver is not registered,
-	 * the entry itself is returned. If the given entry is a container, and a
-	 * resolver is not registered, resolved runtime classpath entries are calculated
-	 * from the associated container classpath entries, in the context of the 
-	 * given project.
-	 * </p>
-	 * @param entry runtime classpath entry
-	 * @param project Java project context
-	 * @return resolved runtime classpath entry
-	 * @exception CoreException if unable to resolve
-	 * @see IRuntimeClasspathEntryResolver
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		switch (entry.getType()) {
-			case IRuntimeClasspathEntry.PROJECT:
-				// if the project has multiple output locations, they must be returned
-				IResource resource = entry.getResource();
-				if (resource instanceof IProject) {
-					IProject p = (IProject)resource;
-					IJavaProject jp = JavaCore.create(p);
-					if (jp != null && p.isOpen() && jp.exists()) {
-						IRuntimeClasspathEntry[] entries = resolveOutputLocations(jp, entry.getClasspathProperty());
-						if (entries != null) {
-							return entries;
-						}
-					} else {
-						return new IRuntimeClasspathEntry[0];
-					}
-				}
-				break;			
-			case IRuntimeClasspathEntry.VARIABLE:
-				IRuntimeClasspathEntryResolver resolver = getVariableResolver(entry.getVariableName());
-				if (resolver == null) {
-					IRuntimeClasspathEntry[] resolved = resolveVariableEntry(entry, project, null);
-					if (resolved != null) { 
-						return resolved;
-					}
-					break;
-				} 
-				return resolver.resolveRuntimeClasspathEntry(entry, project);				
-			case IRuntimeClasspathEntry.CONTAINER:
-				resolver = getContainerResolver(entry.getVariableName());
-				if (resolver == null) {
-					return computeDefaultContainerEntries(entry, project);
-				} 
-				return resolver.resolveRuntimeClasspathEntry(entry, project);
-			case IRuntimeClasspathEntry.OTHER:
-				resolver = getContributedResolver(((IRuntimeClasspathEntry2)entry).getTypeId());
-				return resolver.resolveRuntimeClasspathEntry(entry, project);				
-			default:
-				break;
-		}
-		return new IRuntimeClasspathEntry[] {entry};
-	}	
-		
-	/**
-	 * Performs default resolution for a container entry.
-	 * Delegates to the Java model.
-	 */
-	private static IRuntimeClasspathEntry[] computeDefaultContainerEntries(IRuntimeClasspathEntry entry, ILaunchConfiguration config) throws CoreException {
-		IJavaProject project = entry.getJavaProject();
-		if (project == null) {
-			project = getJavaProject(config);
-		}
-		return computeDefaultContainerEntries(entry, project);
-	}
-	
-	/**
-	 * Performs default resolution for a container entry.
-	 * Delegates to the Java model.
-	 */
-	private static IRuntimeClasspathEntry[] computeDefaultContainerEntries(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		if (project == null || entry == null) {
-			// cannot resolve without entry or project context
-			return new IRuntimeClasspathEntry[0];
-		} 
-		IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-		if (container == null) {
-			abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Could_not_resolve_classpath_container___0__1, new String[]{entry.getPath().toString()}), null); 
-			// execution will not reach here - exception will be thrown
-			return null;
-		} 
-		IClasspathEntry[] cpes = container.getClasspathEntries();
-		int property = -1;
-		switch (container.getKind()) {
-			case IClasspathContainer.K_APPLICATION:
-				property = IRuntimeClasspathEntry.USER_CLASSES;
-				break;
-			case IClasspathContainer.K_DEFAULT_SYSTEM:
-				property = IRuntimeClasspathEntry.STANDARD_CLASSES;
-				break;	
-			case IClasspathContainer.K_SYSTEM:
-				property = IRuntimeClasspathEntry.BOOTSTRAP_CLASSES;
-				break;
-		}			
-		List resolved = new ArrayList(cpes.length);
-		for (int i = 0; i < cpes.length; i++) {
-			IClasspathEntry cpe = cpes[i];
-			if (cpe.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-				IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(cpe.getPath().segment(0));
-				IJavaProject jp = JavaCore.create(p);
-				List projects = (List) fgProjects.get();
-				if (projects == null) {
-					projects = new ArrayList();
-					fgProjects.set(projects);
-				}
-				if (!projects.contains(jp)) {
-					try {
-						projects.add(jp);
-						IRuntimeClasspathEntry classpath = newDefaultProjectClasspathEntry(jp);
-						IRuntimeClasspathEntry[] entries = resolveRuntimeClasspathEntry(classpath, jp);
-						for (int j = 0; j < entries.length; j++) {
-							IRuntimeClasspathEntry e = entries[j];
-							if (!resolved.contains(e)) {
-								resolved.add(entries[j]);
-							}
-						}
-					} finally {
-						projects.remove(jp);
-					}
-				}
-				if (projects.isEmpty()) {
-					fgProjects.set(null);
-				}
-			} else {
-				IRuntimeClasspathEntry e = newRuntimeClasspathEntry(cpe);
-				if (!resolved.contains(e)) {
-					resolved.add(e);
-				}
-			}
-		}
-		// set classpath property
-		IRuntimeClasspathEntry[] result = new IRuntimeClasspathEntry[resolved.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (IRuntimeClasspathEntry) resolved.get(i);
-			result[i].setClasspathProperty(property);
-		}
-		return result;
-	}
-			
-	/**
-	 * Computes and returns the unresolved class path for the given launch configuration.
-	 * Variable and container entries are unresolved.
-	 * 
-	 * @param configuration launch configuration
-	 * @return unresolved runtime classpath entries
-	 * @exception CoreException if unable to compute the classpath
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] computeUnresolvedRuntimeClasspath(ILaunchConfiguration configuration) throws CoreException {
-		return getClasspathProvider(configuration).computeUnresolvedClasspath(configuration);
-	}
-	
-	/**
-	 * Resolves the given classpath, returning the resolved classpath
-	 * in the context of the given launch configuration.
-	 *
-	 * @param entries unresolved classpath
-	 * @param configuration launch configuration
-	 * @return resolved runtime classpath entries
-	 * @exception CoreException if unable to compute the classpath
-	 * @since 2.0
-	 */
-	public static IRuntimeClasspathEntry[] resolveRuntimeClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		return getClasspathProvider(configuration).resolveClasspath(entries, configuration);
-	}	
-	
-	/**
-	 * Return the <code>IJavaProject</code> referenced in the specified configuration or
-	 * <code>null</code> if none.
-	 *
-	 * @exception CoreException if the referenced Java project does not exist
-	 * @since 2.0
-	 */
-	public static IJavaProject getJavaProject(ILaunchConfiguration configuration) throws CoreException {
-		String projectName = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null);
-		if ((projectName == null) || (projectName.trim().length() < 1)) {
-			return null;
-		}			
-		IJavaProject javaProject = getJavaModel().getJavaProject(projectName);
-		if (javaProject != null && javaProject.getProject().exists() && !javaProject.getProject().isOpen()) {
-			abort(MessageFormat.format(LaunchingMessages.JavaRuntime_28, new String[] {configuration.getName(), projectName}), IJavaLaunchConfigurationConstants.ERR_PROJECT_CLOSED, null); 
-		}
-		if ((javaProject == null) || !javaProject.exists()) {
-			abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1, new String[] {configuration.getName(), projectName}), IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT, null); 
-		}
-		return javaProject;
-	}
-				
-	/**
-	 * Convenience method to get the java model.
-	 */
-	private static IJavaModel getJavaModel() {
-		return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-	}
-	
-	/**
-	 * Returns the VM install for the given launch configuration.
-	 * The VM install is determined in the following prioritized way:
-	 * <ol>
-	 * <li>The VM install is explicitly specified on the launch configuration
-	 * 	via the <code>ATTR_VM_INSTALL_TYPE</code> and <code>ATTR_VM_INSTALL_ID</code>
-	 *  attributes.</li>
-	 * <li>If no explicit VM install is specified, the VM install associated with
-	 * 	the launch confiugration's project is returned.</li>
-	 * <li>If no project is specified, or the project does not specify a custom
-	 * 	VM install, the workspace default VM install is returned.</li>
-	 * </ol>
-	 * 
-	 * @param configuration launch configuration
-	 * @return vm install
-	 * @exception CoreException if unable to compute a vm install
-	 * @since 2.0
-	 */
-	public static IVMInstall computeVMInstall(ILaunchConfiguration configuration) throws CoreException {
-		String type = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-		if (type == null) {
-			IJavaProject proj = getJavaProject(configuration);
-			if (proj != null) {
-				IVMInstall vm = getVMInstall(proj);
-				if (vm != null) {
-					return vm;
-				}
-			}
-		} else {
-			IVMInstallType vt = getVMInstallType(type);
-			if (vt == null) {
-				// error type does not exist
-				abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Specified_VM_install_type_does_not_exist___0__2, new String[] {type}), null); 
-			}
-			IVMInstall vm = null;
-			// look for a name
-			String name = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String)null);
-			if (name == null) {
-				// error - type specified without a specific install (could be an old config that specified a VM ID)
-				// log the error, but choose the default VM.
-				IStatus status = new Status(IStatus.WARNING, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_VM_INSTALL, MessageFormat.format(LaunchingMessages.JavaRuntime_VM_not_fully_specified_in_launch_configuration__0____missing_VM_name__Reverting_to_default_VM__1, new String[] {configuration.getName()}), null); 
-				LaunchingPlugin.log(status);
-				return getDefaultVMInstall();
-			} 
-			vm = vt.findVMInstallByName(name);
-			if (vm == null) {
-				// error - install not found
-				abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2, new String[] {vt.getName(), name}), null);					 
-			} else {
-				return vm;
-			}
-		}
-		
-		return getDefaultVMInstall();
-	}
-	
-	/**
-	 * Throws a core exception with an internal error status.
-	 * 
-	 * @param message the status message
-	 * @param exception lower level exception associated with the
-	 *  error, or <code>null</code> if none
-	 */
-	private static void abort(String message, Throwable exception) throws CoreException {
-		abort(message, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, exception);
-	}	
-		
-		
-	/**
-	 * Throws a core exception with an internal error status.
-	 * 
-	 * @param message the status message
-	 * @param code status code
-	 * @param exception lower level exception associated with the
-	 * 
-	 *  error, or <code>null</code> if none
-	 */
-	private static void abort(String message, int code, Throwable exception) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), code, message, exception));
-	}	
-		
-	/**
-	 * Computes the default application classpath entries for the given 
-	 * project.
-	 * 
-	 * @param	jproject The project to compute the classpath for
-	 * @return	The computed classpath. May be empty, but not null.
-	 * @throws	CoreException if unable to compute the default classpath
-	 */
-	public static String[] computeDefaultRuntimeClassPath(IJavaProject jproject) throws CoreException {
-		IRuntimeClasspathEntry[] unresolved = computeUnresolvedRuntimeClasspath(jproject);
-		// 1. remove bootpath entries
-		// 2. resolve & translate to local file system paths
-		List resolved = new ArrayList(unresolved.length);
-		for (int i = 0; i < unresolved.length; i++) {
-			IRuntimeClasspathEntry entry = unresolved[i];
-			if (entry.getClasspathProperty() == IRuntimeClasspathEntry.USER_CLASSES) {
-				IRuntimeClasspathEntry[] entries = resolveRuntimeClasspathEntry(entry, jproject);
-				for (int j = 0; j < entries.length; j++) {
-					String location = entries[j].getLocation();
-					if (location != null) {
-						resolved.add(location); 
-					}
-				}
-			}
-		}
-		return (String[])resolved.toArray(new String[resolved.size()]);
-	}	
-		
-	/**
-	 * Saves the VM configuration information to the preferences. This includes
-	 * the following information:
-	 * <ul>
-	 * <li>The list of all defined IVMInstall instances.</li>
-	 * <li>The default VM</li>
-	 * <ul>
-	 * This state will be read again upon first access to VM
-	 * configuration information.
-	 */
-	public static void saveVMConfiguration() throws CoreException {
-		if (fgVMTypes == null) {
-			// if the VM types have not been instantiated, there can be no changes.
-			return;
-		}
-		try {
-			String xml = getVMsAsXML();
-			getPreferences().setValue(PREF_VM_XML, xml);
-			savePreferences();
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IStatus.ERROR, LaunchingMessages.JavaRuntime_exceptionsOccurred, e)); 
-		} catch (ParserConfigurationException e) {
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IStatus.ERROR, LaunchingMessages.JavaRuntime_exceptionsOccurred, e)); 
-		} catch (TransformerException e) {
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IStatus.ERROR, LaunchingMessages.JavaRuntime_exceptionsOccurred, e)); 
-		}
-	}
-	
-	/**
-	 * Write out the specified String as the new value of the VM definitions preference
-	 * and save all preferences.
-	 */
-	private static void saveVMDefinitions(final String vmDefXML) {
-		Job prefJob = new Job(LaunchingMessages.JavaRuntime_0) { 
-			protected IStatus run(IProgressMonitor monitor) {
-				LaunchingPlugin.getDefault().getPluginPreferences().setValue(PREF_VM_XML, vmDefXML);
-				LaunchingPlugin.getDefault().savePluginPreferences();
-				return Status.OK_STATUS;
-			}
-		};
-		prefJob.setSystem(true);
-		prefJob.schedule();
-
-	}
-
-	private static String getVMsAsXML() throws IOException, ParserConfigurationException, TransformerException {
-		VMDefinitionsContainer container = new VMDefinitionsContainer();	
-		container.setDefaultVMInstallCompositeID(getDefaultVMId());
-		container.setDefaultVMInstallConnectorTypeID(getDefaultVMConnectorId());	
-		IVMInstallType[] vmTypes= getVMInstallTypes();
-		for (int i = 0; i < vmTypes.length; ++i) {
-			IVMInstall[] vms = vmTypes[i].getVMInstalls();
-			for (int j = 0; j < vms.length; j++) {
-				IVMInstall install = vms[j];
-				container.addVM(install);
-			}
-		}
-		return container.getAsXML();
-	}
-	
-	/**
-	 * This method loads the set of installed JREs.  This definition is stored in the
-	 * workbench preferences, however older workspaces may store this information in
-	 * a meta-data file.  In both cases, the VMs are described as an XML document.
-	 * If neither the preference nor the meta-data file is found, the file system is
-	 * searched for VMs.
-	 */
-	private static void initializeVMConfiguration() throws ParserConfigurationException, IOException, TransformerException {
-		// Try retrieving the VM preferences from the preference store
-		String vmXMLString = getPreferences().getString(PREF_VM_XML);
-		
-		// If the preference was found, load VMs from it into memory
-		if (vmXMLString.length() > 0) {
-			try {
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(vmXMLString.getBytes());
-				VMDefinitionsContainer vmDefs = VMDefinitionsContainer.parseXMLIntoContainer(inputStream);
-				loadVMDefsIntoMemory(vmDefs);
-			} catch (IOException ioe) {
-				LaunchingPlugin.log(ioe);
-			}			
-		} else {			
-			// Otherwise, look for the old file that previously held the VM defs
-			IPath stateLocation= LaunchingPlugin.getDefault().getStateLocation();
-			IPath stateFile= stateLocation.append("vmConfiguration.xml"); //$NON-NLS-1$
-			File file = new File(stateFile.toOSString());
-			
-			VMDefinitionsContainer vmDefs = null;
-			if (file.exists()) {        
-				// If file exists, load VM defs from it into memory and write the defs to
-				// the preference store WITHOUT triggering any processing of the new value
-				FileInputStream fileInputStream = new FileInputStream(file);
-				vmDefs = VMDefinitionsContainer.parseXMLIntoContainer(fileInputStream);
-				loadVMDefsIntoMemory(vmDefs);
-				LaunchingPlugin.getDefault().setIgnoreVMDefPropertyChangeEvents(true);
-				saveVMDefinitions(vmDefs.getAsXML());
-				LaunchingPlugin.getDefault().setIgnoreVMDefPropertyChangeEvents(false);				
-			} else {				 
-				// Otherwise go looking for VMs in the file system.  Write the results
-				// to the preference store.  This will be treated just like a user change
-				// to the VM prefs with full notification to all VM listeners.
-				detectAndSaveVMDefinitions();
-			}			
-		}
-	}
-	
-	/**
-	 * For each VMStandin object in the specified VM container, convert it into a 'real' VM.
-	 */
-	private static void loadVMDefsIntoMemory(VMDefinitionsContainer vmContainer) {
-		fgDefaultVMId = vmContainer.getDefaultVMInstallCompositeID();
-		fgDefaultVMConnectorId = vmContainer.getDefaultVMInstallConnectorTypeID();
-		
-		// Create the underlying VMs for each VMStandin
-		List vmList = vmContainer.getValidVMList();
-		Iterator vmListIterator = vmList.iterator();
-		while (vmListIterator.hasNext()) {
-			VMStandin vmStandin = (VMStandin) vmListIterator.next();
-			vmStandin.convertToRealVM();
-		}
-		
-	}
-	
-	/**
-	 * Evaluates library locations for a IVMInstall. If no library locations are set on the install, a default
-	 * location is evaluated and checked if it exists.
-	 * @return library locations with paths that exist or are empty
-	 * @since 2.0
-	 */
-	public static LibraryLocation[] getLibraryLocations(IVMInstall vm)  {
-		IPath[] libraryPaths;
-		IPath[] sourcePaths;
-		IPath[] sourceRootPaths;
-		URL[] javadocLocations;
-		LibraryLocation[] locations= vm.getLibraryLocations();
-		if (locations == null) {
-			LibraryLocation[] dflts= vm.getVMInstallType().getDefaultLibraryLocations(vm.getInstallLocation());
-			libraryPaths = new IPath[dflts.length];
-			sourcePaths = new IPath[dflts.length];
-			sourceRootPaths = new IPath[dflts.length];
-			javadocLocations= new URL[dflts.length];
-			for (int i = 0; i < dflts.length; i++) {
-				libraryPaths[i]= dflts[i].getSystemLibraryPath();
-				if (!libraryPaths[i].toFile().isFile()) {
-					libraryPaths[i]= Path.EMPTY;
-				}
-				
-				sourcePaths[i]= dflts[i].getSystemLibrarySourcePath();
-				if (sourcePaths[i].toFile().isFile()) {
-					sourceRootPaths[i]= dflts[i].getPackageRootPath();
-				} else {
-					sourcePaths[i]= Path.EMPTY;
-					sourceRootPaths[i]= Path.EMPTY;
-				}
-			}
-		} else {
-			libraryPaths = new IPath[locations.length];
-			sourcePaths = new IPath[locations.length];
-			sourceRootPaths = new IPath[locations.length];
-			javadocLocations= new URL[locations.length];
-			for (int i = 0; i < locations.length; i++) {			
-				libraryPaths[i]= locations[i].getSystemLibraryPath();
-				sourcePaths[i]= locations[i].getSystemLibrarySourcePath();
-				sourceRootPaths[i]= locations[i].getPackageRootPath();
-				javadocLocations[i]= locations[i].getJavadocLocation();
-			}
-		}
-		locations = new LibraryLocation[sourcePaths.length];
-		for (int i = 0; i < sourcePaths.length; i++) {
-			locations[i] = new LibraryLocation(libraryPaths[i], sourcePaths[i], sourceRootPaths[i], javadocLocations[i]);
-		}
-		return locations;
-	}
-	
-	/**
-	 * Detect the VM that Eclipse is running on.
-	 * 
-	 * @return a VM standin representing the VM that Eclipse is running on, or
-	 * <code>null</code> if unable to detect the runtime VM
-	 */
-	private static VMStandin detectEclipseRuntime() {
-		VMStandin detectedVMStandin = null;
-		// Try to detect a VM for each declared VM type
-		IVMInstallType[] vmTypes= getVMInstallTypes();
-		for (int i = 0; i < vmTypes.length; i++) {
-			
-			File detectedLocation= vmTypes[i].detectInstallLocation();
-			if (detectedLocation != null && detectedVMStandin == null) {
-				
-				// Make sure the VM id is unique
-				int unique = i;
-				IVMInstallType vmType = vmTypes[i];
-				while (vmType.findVMInstall(String.valueOf(unique)) != null) {
-					unique++;
-				}
-
-				// Create a standin for the detected VM and add it to the result collector
-				String vmID = String.valueOf(unique);
-				detectedVMStandin = new VMStandin(vmType, vmID);
-				if (detectedVMStandin != null) {
-					detectedVMStandin.setInstallLocation(detectedLocation);
-					detectedVMStandin.setName(generateDetectedVMName(detectedVMStandin));
-					if (vmType instanceof AbstractVMInstallType) {
-						AbstractVMInstallType abs = (AbstractVMInstallType)vmType;
-						URL url = abs.getDefaultJavadocLocation(detectedLocation);
-						detectedVMStandin.setJavadocLocation(url);						
-					}
-				}				
-			}
-		}
-		return detectedVMStandin;
-	}
-
-	/**
-	 * Tries to locate a default VM (if one is not currently set). Sets the
-	 * default VM to be the Eclipse runtime or the first VM found. Log an error
-	 * with the workspace if a no VMs can be located.
-	 */
-	private static void detectDefaultVM() {
-		if (getDefaultVMId() == null) {
-			VMStandin eclipseRuntime = detectEclipseRuntime();
-			IVMInstall defaultVM = null;
-			IVMInstallType[] vmTypes= getVMInstallTypes();
-			if  (eclipseRuntime == null) {
-				// No default VM or Eclipse runtime. Set the first VM as the default (if any)
-				for (int i = 0; i < vmTypes.length; i++) {
-					IVMInstallType type = vmTypes[i];
-					IVMInstall[] vms = type.getVMInstalls();
-					for (int j = 0; j < vms.length; j++) {
-						defaultVM = vms[j];
-						break;
-					}
-					if (defaultVM != null) {
-						break;
-					}
-				}
-			} else {
-				// if there is no default VM, set the Eclipse runtime to be the default
-				// VM. First search for an existing VM install with the same
-				// install location as the detected runtime
-				IVMInstallType type = eclipseRuntime.getVMInstallType();
-				IVMInstall[] vms = type.getVMInstalls();
-				for (int j = 0; j < vms.length; j++) {
-					IVMInstall install = vms[j];
-					if (install.getInstallLocation().equals(eclipseRuntime.getInstallLocation())) {
-						defaultVM = install;
-						break;
-					}
-				}
-				if (defaultVM == null) {
-					// There is no VM install that corresponds to the Eclipse runtime.
-					// Create a VM install for the Eclipse runtime.
-					defaultVM = eclipseRuntime.convertToRealVM();
-				}
-			}
-			if (defaultVM != null) {
-				fgDefaultVMId = getCompositeIdFromVM(defaultVM);
-			}
-		}		
-	}
-	/**
-	 * Detects VM installations, and a default VM (if required). Saves the
-	 * results.
-	 */
-	private static void detectAndSaveVMDefinitions() {
-		detectDefaultVM();
-		try {
-			String vmDefXML = getVMsAsXML();
-			saveVMDefinitions(vmDefXML);
-		} catch (IOException ioe) {
-			LaunchingPlugin.log(ioe);
-		} catch (ParserConfigurationException e) {
-			LaunchingPlugin.log(e);
-		} catch (TransformerException e) {
-			LaunchingPlugin.log(e);
-		}
-	}
-	
-	/**
-	 * Make the name of a detected VM stand out.
-	 */
-	private static String generateDetectedVMName(IVMInstall vm) {
-		return vm.getInstallLocation().getName();
-	}
-	
-	/**
-	 * Creates and returns a classpath entry describing
-	 * the JRE_LIB classpath variable.
-	 * 
-	 * @return a new IClasspathEntry that describes the JRE_LIB classpath variable
-	 */
-	public static IClasspathEntry getJREVariableEntry() {
-		return JavaCore.newVariableEntry(
-			new Path(JRELIB_VARIABLE),
-			new Path(JRESRC_VARIABLE),
-			new Path(JRESRCROOT_VARIABLE)
-		);
-	}
-	
-	/**
-	 * Creates and returns a classpath entry describing
-	 * the default JRE container entry.
-	 * 
-	 * @return a new IClasspathEntry that describes the default JRE container entry
-	 * @since 2.0
-	 */
-	public static IClasspathEntry getDefaultJREContainerEntry() {
-		return JavaCore.newContainerEntry(new Path(JRE_CONTAINER));
-	}	
-	
-	/**
-	 * Returns the VM connector defined with the specified identifier,
-	 * or <code>null</code> if none.
-	 * 
-	 * @param id VM connector identifier
-	 * @return VM connector or <code>null</code> if none
-	 * @since 2.0
-	 */
-	public static IVMConnector getVMConnector(String id) {
-		return LaunchingPlugin.getDefault().getVMConnector(id);
-	}
-	
-	/**
-	 * Returns all VM connector extensions.
-	 *
-	 * @return VM connectors
-	 * @since 2.0
-	 */
-	public static IVMConnector[] getVMConnectors() {
-		return LaunchingPlugin.getDefault().getVMConnectors();
-	}	
-	
-	/**
-	 * Returns the preference store for the launching plug-in.
-	 * 
-	 * @return the preference store for the launching plug-in
-	 * @since 2.0
-	 */
-	public static Preferences getPreferences() {
-		return LaunchingPlugin.getDefault().getPluginPreferences();
-	}
-	
-	/**
-	 * Saves the preferences for the launching plug-in.
-	 * 
-	 * @since 2.0
-	 */
-	public static void savePreferences() {
-		LaunchingPlugin.getDefault().savePluginPreferences();
-	}
-	
-	/**
-	 * Registers the given resolver for the specified variable.
-	 * 
-	 * @param resolver runtime classpathe entry resolver
-	 * @param variableName variable name to register for
-	 * @since 2.0
-	 */
-	public static void addVariableResolver(IRuntimeClasspathEntryResolver resolver, String variableName) {
-		Map map = getVariableResolvers();
-		map.put(variableName, resolver);
-	}
-	
-	/**
-	 * Registers the given resolver for the specified container.
-	 * 
-	 * @param resolver runtime classpathe entry resolver
-	 * @param containerIdentifier identifier of the classpath container to register for
-	 * @since 2.0
-	 */
-	public static void addContainerResolver(IRuntimeClasspathEntryResolver resolver, String containerIdentifier) {
-		Map map = getContainerResolvers();
-		map.put(containerIdentifier, resolver);
-	}	
-	
-	/**
-	 * Returns all registered variable resolvers.
-	 */
-	private static Map getVariableResolvers() {
-		if (fgVariableResolvers == null) {
-			initializeResolvers();
-		}
-		return fgVariableResolvers;
-	}
-	
-	/**
-	 * Returns all registered container resolvers.
-	 */
-	private static Map getContainerResolvers() {
-		if (fgContainerResolvers == null) {
-			initializeResolvers();
-		}
-		return fgContainerResolvers;
-	}
-	
-	/**
-	 * Returns all registered runtime classpath entry resolvers.
-	 */
-	private static Map getEntryResolvers() {
-		if (fgRuntimeClasspathEntryResolvers == null) {
-			initializeResolvers();
-		}
-		return fgRuntimeClasspathEntryResolvers;
-	}	
-
-	private static void initializeResolvers() {
-		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.ID_PLUGIN, EXTENSION_POINT_RUNTIME_CLASSPATH_ENTRY_RESOLVERS);
-		IConfigurationElement[] extensions = point.getConfigurationElements();
-		fgVariableResolvers = new HashMap(extensions.length);
-		fgContainerResolvers = new HashMap(extensions.length);
-		fgRuntimeClasspathEntryResolvers = new HashMap(extensions.length);
-		for (int i = 0; i < extensions.length; i++) {
-			RuntimeClasspathEntryResolver res = new RuntimeClasspathEntryResolver(extensions[i]);
-			String variable = res.getVariableName();
-			String container = res.getContainerId();
-			String entryId = res.getRuntimeClasspathEntryId();
-			if (variable != null) {
-				fgVariableResolvers.put(variable, res);
-			}
-			if (container != null) {
-				fgContainerResolvers.put(container, res);
-			}
-			if (entryId != null) {
-				fgRuntimeClasspathEntryResolvers.put(entryId, res);
-			}
-		}		
-	}
-
-	/**
-	 * Returns all registered classpath providers.
-	 */
-	private static Map getClasspathProviders() {
-		if (fgPathProviders == null) {
-			initializeProviders();
-		}
-		return fgPathProviders;
-	}
-		
-	private static void initializeProviders() {
-		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.ID_PLUGIN, EXTENSION_POINT_RUNTIME_CLASSPATH_PROVIDERS);
-		IConfigurationElement[] extensions = point.getConfigurationElements();
-		fgPathProviders = new HashMap(extensions.length);
-		for (int i = 0; i < extensions.length; i++) {
-			RuntimeClasspathProvider res = new RuntimeClasspathProvider(extensions[i]);
-			fgPathProviders.put(res.getIdentifier(), res);
-		}		
-	}
-		
-	/**
-	 * Returns the resolver registered for the given variable, or
-	 * <code>null</code> if none.
-	 * 
-	 * @param variableName the variable to determine the resolver for
-	 * @return the resolver registered for the given variable, or
-	 * <code>null</code> if none
-	 */
-	private static IRuntimeClasspathEntryResolver getVariableResolver(String variableName) {
-		return (IRuntimeClasspathEntryResolver)getVariableResolvers().get(variableName);
-	}
-	
-	/**
-	 * Returns the resolver registered for the given container id, or
-	 * <code>null</code> if none.
-	 * 
-	 * @param containerId the container to determine the resolver for
-	 * @return the resolver registered for the given container id, or
-	 * <code>null</code> if none
-	 */	
-	private static IRuntimeClasspathEntryResolver getContainerResolver(String containerId) {
-		return (IRuntimeClasspathEntryResolver)getContainerResolvers().get(containerId);
-	}
-	
-	/**
-	 * Returns the resolver registered for the given contributed classpath
-	 * entry type.
-	 * 
-	 * @param typeId the id of the contributed classpath entry
-	 * @return the resolver registered for the given clsspath entry
-	 */	
-	private static IRuntimeClasspathEntryResolver getContributedResolver(String typeId) {
-		IRuntimeClasspathEntryResolver resolver = (IRuntimeClasspathEntryResolver)getEntryResolvers().get(typeId);
-		if (resolver == null) {
-			return new DefaultEntryResolver();
-		}
-		return resolver;
-	}	
-	
-	/**
-	 * Adds the given listener to the list of registered VM install changed
-	 * listeners. Has no effect if an identical listener is already registered.
-	 * 
-	 * @param listener the listener to add
-	 * @since 2.0
-	 */
-	public static void addVMInstallChangedListener(IVMInstallChangedListener listener) {
-		fgVMListeners.add(listener);
-	}
-	
-	/**
-	 * Removes the given listener from the list of registered VM install changed
-	 * listeners. Has no effect if an identical listener is not already registered.
-	 * 
-	 * @param listener the listener to remove
-	 * @since 2.0
-	 */
-	public static void removeVMInstallChangedListener(IVMInstallChangedListener listener) {
-		fgVMListeners.remove(listener);
-	}	
-	
-	private static void notifyDefaultVMChanged(IVMInstall previous, IVMInstall current) {
-		Object[] listeners = fgVMListeners.getListeners();
-		for (int i = 0; i < listeners.length; i++) {
-			IVMInstallChangedListener listener = (IVMInstallChangedListener)listeners[i];
-			listener.defaultVMInstallChanged(previous, current);
-		}
-	}
-	
-	/**
-	 * Notifies all VM install changed listeners of the given property change.
-	 * 
-	 * @param event event describing the change.
-	 * @since 2.0
-	 */
-	public static void fireVMChanged(PropertyChangeEvent event) {
-		Object[] listeners = fgVMListeners.getListeners();
-		for (int i = 0; i < listeners.length; i++) {
-			IVMInstallChangedListener listener = (IVMInstallChangedListener)listeners[i];
-			listener.vmChanged(event);
-		}		
-	}
-	
-	/**
-	 * Notifies all VM install changed listeners of the VM addition
-	 * 
-	 * @param vm the VM that has been added
-	 * @since 2.0
-	 */
-	public static void fireVMAdded(IVMInstall vm) {
-		Object[] listeners = fgVMListeners.getListeners();
-		for (int i = 0; i < listeners.length; i++) {
-			IVMInstallChangedListener listener = (IVMInstallChangedListener)listeners[i];
-			listener.vmAdded(vm);
-		}		
-	}	
-	
-	/**
-	 * Notifies all VM install changed listeners of the VM removal
-	 * 
-	 * @param vm the VM that has been removed
-	 * @since 2.0
-	 */
-	public static void fireVMRemoved(IVMInstall vm) {
-		Object[] listeners = fgVMListeners.getListeners();
-		for (int i = 0; i < listeners.length; i++) {
-			IVMInstallChangedListener listener = (IVMInstallChangedListener)listeners[i];
-			listener.vmRemoved(vm);
-		}		
-	}		
-	
-	/**
-	 * Return the String representation of the default output directory of the
-	 * launch config's project or <code>null</code> if there is no config, no
-	 * project or some sort of problem.
-	 * 
-	 * @return the default output directory for the specified launch
-	 * configuration's project
-	 * @since 2.1
-	 */
-	public static String getProjectOutputDirectory(ILaunchConfiguration config) {
-		try {
-			if (config != null) {
-				IJavaProject javaProject = JavaRuntime.getJavaProject(config);
-				if (javaProject != null) {
-					IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-					IPath outputLocation = javaProject.getOutputLocation();
-					IResource resource = root.findMember(outputLocation);
-					if (resource != null) {
-						IPath path = resource.getFullPath();
-						if (path != null)  {
-							return path.makeRelative().toString();
-						}
-					}
-				} 
-			}
-		} catch (CoreException ce) {
-		} 
-		return null;
-	}
-	
-	/**
-	 * Returns a collection of source containers corresponding to the given
-	 * resolved runtime classpath entries.
-	 * <p>
-	 * Note that the entries must be resolved to ARCHIVE and PROJECT entries,
-	 * as source containers cannot be determined for unresolved entries.
-	 * </p>
-	 * @param entries entries to translate
-	 * @return source containers corresponding to the given runtime classpath entries
-	 * @since 3.1
-	 */
-	public static ISourceContainer[] getSourceContainers(IRuntimeClasspathEntry[] entries) {
-		return JavaSourceLookupUtil.translate(entries);
-	}
-	
-	/**
-	 * Returns a collection of paths that should be appended to the given project's
-	 * <code>java.library.path</code> system property when launched. Entries are
-	 * searched for on the project's build path as extra classpath attributes.
-	 * Each entry represents an absolute path in the local file system.
-	 *
-	 * @param project the project to compute the <code>java.library.path</code> for
-	 * @param requiredProjects whether to consider entries in required projects
-	 * @return a collection of paths representing entries that should be appended
-	 *  to the given project's <code>java.library.path</code>
-	 * @throws CoreException if unable to compute the Java library path
-	 * @since 3.1
-	 * @see org.eclipse.jdt.core.IClasspathAttribute
-	 * @see JavaRuntime#CLASSPATH_ATTR_LIBRARY_PATH_ENTRY
-	 */
-	public static String[] computeJavaLibraryPath(IJavaProject project, boolean requiredProjects) throws CoreException {
-		Set visited = new HashSet();
-		List entries = new ArrayList();
-		gatherJavaLibraryPathEntries(project, requiredProjects, visited, entries);
-		List resolved = new ArrayList(entries.size());
-		Iterator iterator = entries.iterator();
-		IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		while (iterator.hasNext()) {
-			String entry = (String) iterator.next();
-			String resolvedEntry = manager.performStringSubstitution(entry);
-			IPath path = new Path(resolvedEntry);
-			if (path.isAbsolute()) {
-				File file = path.toFile();
-				resolved.add(file.getAbsolutePath());
-			} else {
-				IResource resource = root.findMember(path);
-				if (resource != null) {
-					IPath location = resource.getLocation();
-					if (location != null) {
-						resolved.add(location.toFile().getAbsolutePath());
-					}
-				}
-			}
-		}
-		return (String[])resolved.toArray(new String[resolved.size()]);
-	}
-
-	/**
-	 * Gathers all Java library entries for the given project and optionally its required
-	 * projects.
-	 * 
-	 * @param project project to gather entries for
-	 * @param requiredProjects whether to consider required projects 
-	 * @param visited projects already considered
-	 * @param entries collection to add library entries to
-	 * @throws CoreException if unable to gather classpath entries
-	 * @since 3.1
-	 */
-	private static void gatherJavaLibraryPathEntries(IJavaProject project, boolean requiredProjects, Set visited, List entries) throws CoreException {
-		if (visited.contains(project)) {
-			return;
-		}
-		visited.add(project);
-		IClasspathEntry[] rawClasspath = project.getRawClasspath();
-		IClasspathEntry[] required = processJavaLibraryPathEntries(project, requiredProjects, rawClasspath, entries);
-		if (required != null) {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			for (int i = 0; i < required.length; i++) {
-				IClasspathEntry entry = required[i];
-				String projectName = entry.getPath().segment(0);
-				IProject p = root.getProject(projectName);
-				if (p.exists()) {
-					IJavaProject requiredProject = JavaCore.create(p);
-					if (requiredProject != null) {
-						gatherJavaLibraryPathEntries(requiredProject, requiredProjects, visited, entries);
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Adds all java library path extra classpath entry values to the given entries collection
-	 * specified on the given project's classpath, and returns a collection of required
-	 * projects, or <code>null</code>.
-	 *  
-	 * @param project project being processed
-	 * @param collectRequired whether to collect required projects
-	 * @param classpathEntries the project's raw classpath
-	 * @param entries collection to add java library path entries to
-	 * @return required project classpath entries or <code>null</code>
-	 * @throws CoreException
-	 * @since 3.1
-	 */
-	private static IClasspathEntry[] processJavaLibraryPathEntries(IJavaProject project, boolean collectRequired, IClasspathEntry[] classpathEntries, List entries) throws CoreException {
-		List req = null;
-		for (int i = 0; i < classpathEntries.length; i++) {
-			IClasspathEntry entry = classpathEntries[i];
-			IClasspathAttribute[] extraAttributes = entry.getExtraAttributes();
-			for (int j = 0; j < extraAttributes.length; j++) {
-				String[] paths = getLibraryPaths(extraAttributes[j]);
-				if (paths != null) {
-					for (int k = 0; k < paths.length; k++) {
-						entries.add(paths[k]);
-					}
-				}
-			}
-			if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
-				IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-				if (container != null) {
-					IClasspathEntry[] requiredProjects = processJavaLibraryPathEntries(project, collectRequired, container.getClasspathEntries(), entries);
-					if (requiredProjects != null) {
-						if (req == null) {
-							req = new ArrayList();
-						}
-						for (int j = 0; j < requiredProjects.length; j++) {
-							req.add(requiredProjects[j]);
-						}
-					}
-				}
-			} else if (collectRequired && entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-				if (req == null) {
-					req = new ArrayList();
-				}
-				req.add(entry);
-			}
-		}
-		if (req != null) {
-			return (IClasspathEntry[]) req.toArray(new IClasspathEntry[req.size()]);
-		}
-		return null;
-	}
-	
-	/**
-	 * Creates a new classpath attribute referencing a list of shared libraries that should
-	 * appear on the <code>-Djava.library.path</code> system property at runtime
-	 * for an associated {@link IClasspathEntry}.
-	 * <p>
-	 * The factory methods <code>newLibraryPathsAttribute(String[])</code>
-	 * and <code>getLibraryPaths(IClasspathAttribute)</code> should be used to
-	 * encode and decode the attribute value.
-	 * </p>
-	 * @param paths an array of strings representing paths of shared libraries.
-	 * Each string is used to create an <code>IPath</code> using the constructor
-	 * <code>Path(String)</code>, and may contain <code>IStringVariable</code>'s.
-	 * Variable substitution is performed on each string before a path is constructed
-	 * from a string.
-	 * @return a claspath attribute with the name <code>CLASSPATH_ATTR_LIBRARY_PATH_ENTRY</code>
-	 * and an value encoded to the specified paths.
-	 * @since 3.1
-	 */
-	public static IClasspathAttribute newLibraryPathsAttribute(String[] paths) {
-		StringBuffer value = new StringBuffer();
-		for (int i = 0; i < paths.length; i++) {
-			value.append(paths[i]);
-			if (i < (paths.length - 1)) {
-				value.append("|"); //$NON-NLS-1$
-			}
-		}
-		return JavaCore.newClasspathAttribute(CLASSPATH_ATTR_LIBRARY_PATH_ENTRY, value.toString());
-	}
-	
-	/**
-	 * Returns an array of strings referencing shared libraries that should
-	 * appear on the <code>-Djava.library.path</code> system property at runtime
-	 * for an associated {@link IClasspathEntry}, or <code>null</code> if the
-	 * given attribute is not a <code>CLASSPATH_ATTR_LIBRARY_PATH_ENTRY</code>.
-	 * Each string is used to create an <code>IPath</code> using the constructor
-	 * <code>Path(String)</code>, and may contain <code>IStringVariable</code>'s. 
-	 * <p>
-	 * The factory methods <code>newLibraryPathsAttribute(String[])</code>
-	 * and <code>getLibraryPaths(IClasspathAttribute)</code> should be used to
-	 * encode and decode the attribute value. 
-	 * </p>
-	 * @param attribute a <code>CLASSPATH_ATTR_LIBRARY_PATH_ENTRY</code> classpath attribute
-	 * @return an array of strings referencing shared libraries that should
-	 * appear on the <code>-Djava.library.path</code> system property at runtime
-	 * for an associated {@link IClasspathEntry}, or <code>null</code> if the
-	 * given attribute is not a <code>CLASSPATH_ATTR_LIBRARY_PATH_ENTRY</code>.
-	 * Each string is used to create an <code>IPath</code> using the constructor
-	 * <code>Path(String)</code>, and may contain <code>IStringVariable</code>'s.
-	 * @since 3.1
-	 */	
-	public static String[] getLibraryPaths(IClasspathAttribute attribute) {
-		if (CLASSPATH_ATTR_LIBRARY_PATH_ENTRY.equals(attribute.getName())) {
-			String value = attribute.getValue();
-			return value.split("\\|"); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java
deleted file mode 100644
index 85e03be..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-
-
-/**
- * The location of a library (for example rt.jar).
- * <p>
- * Clients may instantiate this class; it is not intended to be subclassed.
- * </p>
- */
-public final class LibraryLocation {
-	private IPath fSystemLibrary;
-	private IPath fSystemLibrarySource;
-	private IPath fPackageRootPath;
-	private URL fJavadocLocation;
-	
-	/**
-	 * Creates a new library location.
-	 * 
-	 * @param libraryPath	The location of the JAR containing java.lang.Object
-	 * 					Must not be <code>null</code>.
-	 * @param sourcePath	The location of the zip file containing the sources for <code>library</code>
-	 * 					Must not be <code>null</code> (Use Path.EMPTY instead)
-	 * @param packageRoot The path inside the <code>source</code> zip file where packages names
-	 * 					  begin. If the source for java.lang.Object source is found at 
-	 * 					  "src/java/lang/Object.java" in the zip file, the 
-	 * 					  packageRoot should be "src"
-	 * 					  Must not be <code>null</code>. (Use Path.EMPTY or IPath.ROOT)
-	 * @throws	IllegalArgumentException	If the library path is <code>null</code>.
-	 */	
-	public LibraryLocation(IPath libraryPath, IPath sourcePath, IPath packageRoot) {
-		this(libraryPath, sourcePath, packageRoot, null);
-	}
-
-	/**
-	 * Creates a new library location.
-	 * 
-	 * @param libraryPath	The location of the JAR containing java.lang.Object
-	 * 					Must not be <code>null</code>.
-	 * @param sourcePath	The location of the zip file containing the sources for <code>library</code>
-	 * 					Must not be <code>null</code> (Use Path.EMPTY instead)
-	 * @param packageRoot The path inside the <code>source</code> zip file where packages names
-	 * 					  begin. If the source for java.lang.Object source is found at 
-	 * 					  "src/java/lang/Object.java" in the zip file, the 
-	 * 					  packageRoot should be "src"
-	 * 					  Must not be <code>null</code>. (Use Path.EMPTY or IPath.ROOT)
-	 * @param javadocLocation The location of the javadoc for <code>library</code>
-	 * @throws	IllegalArgumentException	If the library path is <code>null</code>.
-	 * @since 3.1
-	 */	
-	public LibraryLocation(IPath libraryPath, IPath sourcePath, IPath packageRoot, URL javadocLocation) {
-		if (libraryPath == null)
-			throw new IllegalArgumentException(LaunchingMessages.libraryLocation_assert_libraryNotNull); 
-
-		fSystemLibrary= libraryPath;
-		fSystemLibrarySource= sourcePath;
-		fPackageRootPath= packageRoot;
-		fJavadocLocation= javadocLocation;
-	}		
-		
-	/**
-	 * Returns the JRE library jar location.
-	 * 
-	 * @return The JRE library jar location.
-	 */
-	public IPath getSystemLibraryPath() {
-		return fSystemLibrary;
-	}
-	
-	/**
-	 * Returns the JRE library source zip location.
-	 * 
-	 * @return The JRE library source zip location.
-	 */
-	public IPath getSystemLibrarySourcePath() {
-		return fSystemLibrarySource;
-	}	
-	
-	/**
-	 * Returns the path to the default package in the sources zip file
-	 * 
-	 * @return The path to the default package in the sources zip file.
-	 */
-	public IPath getPackageRootPath() {
-		return fPackageRootPath;
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof LibraryLocation) {
-			LibraryLocation lib = (LibraryLocation)obj;
-			return getSystemLibraryPath().equals(lib.getSystemLibraryPath()) 
-				&& equals(getSystemLibrarySourcePath(), lib.getSystemLibrarySourcePath())
-				&& equals(getPackageRootPath(), lib.getPackageRootPath())
-				&& equalsOrNull(getJavadocLocation(), lib.getJavadocLocation());
-		} 
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getSystemLibraryPath().hashCode();
-	}
-	
-	/**
-	 * Returns whether the given paths are equal - either may be <code>null</code>.
-	 * @param path1 path to be compared
-	 * @param path2 path to be compared
-	 * @return whether the given paths are equal
-	 */
-	protected boolean equals(IPath path1, IPath path2) {
-		return equalsOrNull(path1, path2);
-	}
-	
-	/**
-	 * Returns whether the given objects are equal - either may be <code>null</code>.
-	 * @param o1 object to be compared
-	 * @param o2 object to be compared
-	 * @return whether the given objects are equal or both null
-	 * @since 3.1
-	 */	
-	private boolean equalsOrNull(Object o1, Object o2) {
-		if (o1 == null) {
-			return o2 == null;
-		}
-		if (o2 == null) {
-			return false;
-		}
-		return o1.equals(o2);
-	}
-
-	/**
-	 * Returns the Javadoc location associated with this Library location.
-	 * 
-	 * @return a url pointing to the Javadoc location associated with
-	 * 	this Library location, or <code>null</code> if none
-	 * @since 3.1
-	 */
-	public URL getJavadocLocation() {
-		return fJavadocLocation;
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java
deleted file mode 100644
index 54be5b3..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.util.EventObject;
-/**
- * An event object describing a change to a named property.
- * <p>
- * JavaRuntime provides change notification for properties of VM installs
- * </p>
- * <p>
- * Clients may instantiate this class; not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-public class PropertyChangeEvent extends EventObject {
-    
-    /**
-     * All serializable objects should have a stable serialVersionUID
-     */
-    private static final long serialVersionUID = 1L;
-
-	/**
-	 * The name of the changed property.
-	 */
-	private String propertyName;
-	
-	/**
-	 * The old value of the changed property, or <code>null</code> if
-	 * not known or not relevant.
-	 */
-	private Object oldValue;
-	
-	/**
-	 * The new value of the changed property, or <code>null</code> if
-	 * not known or not relevant.
-	 */
-	private Object newValue;
-	
-	/**
-	 * Creates a new property change event.
-	 *
-	 * @param source the object whose property has changed
-	 * @param property the property that has changed (must not be 
-	 *    <code>null</code>)
-	 * @param oldValue the old value of the property, or 
-	 *    <code>null</code> if none
-	 * @param newValue the new value of the property, or 
-	 *    <code>null</code> if none
-	 */
-	public PropertyChangeEvent(
-		Object source,
-		String property,
-		Object oldValue,
-		Object newValue) {
-	
-		super(source);
-		if (property == null) {
-			throw new IllegalArgumentException();
-		}
-		this.propertyName = property;
-		this.oldValue = oldValue;
-		this.newValue = newValue;
-	}
-	
-	/**
-	 * Returns the name of the property that changed.
-	 *
-	 * @return the name of the property that changed
-	 */
-	public String getProperty() {
-		return propertyName;
-	}
-	
-	/**
-	 * Returns the new value of the property.
-	 *
-	 * @return the new value, or <code>null</code> if not known
-	 *  or not relevant
-	 */
-	public Object getNewValue() {
-		return newValue;
-	}
-	
-	/**
-	 * Returns the old value of the property.
-	 *
-	 * @return the old value, or <code>null</code> if not known
-	 *  or not relevant
-	 */
-	public Object getOldValue() {
-		return oldValue;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
deleted file mode 100644
index 58d68bc..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Random;
-
-/**
- * Utility class to find a port to debug on.
- * <p>
- * Clients are not intended to subclass or instantiate this class.
- * </p>
- */
-public class SocketUtil {
-	private static final Random fgRandom= new Random(System.currentTimeMillis());
-	
-	/**
-	 * Returns a free port number on the specified host within the given range,
-	 * or -1 if none found.
-	 * 
-	 * @param host name or IP addres of host on which to find a free port
-	 * @param searchFrom the port number from which to start searching 
-	 * @param searchTo the port number at which to stop searching
-	 * @return a free port in the specified range, or -1 of none found
-	 * @deprecated Use <code>findFreePort()</code> instead. It is possible that this
-	 * 	 method can return a port that is already in use since the implementation does
-	 *   not bind to the given port to ensure that it is free.
-	 */
-	public static int findUnusedLocalPort(String host, int searchFrom, int searchTo) {
-
-		for (int i= 0; i < 10; i++) {
-			Socket s= null;
-			int port= getRandomPort(searchFrom, searchTo);
-			try {
-				s= new Socket(host, port);
-			} catch (ConnectException e) {
-				return port;
-			} catch (IOException e) {
-			} finally {
-				if (s != null) {
-					try {
-						s.close();
-					} catch (IOException ioe) {
-					}
-				}
-			}
-		}
-		return -1;
-	}
-	
-	private static int getRandomPort(int low, int high) {
-		return (int)(fgRandom.nextFloat() * (high-low)) + low;
-	}
-	
-	/**
-	 * Returns a free port number on localhost, or -1 if unable to find a free port.
-	 * 
-	 * @return a free port number on localhost, or -1 if unable to find a free port
-	 * @since 3.0
-	 */
-	public static int findFreePort() {
-		ServerSocket socket= null;
-		try {
-			socket= new ServerSocket(0);
-			return socket.getLocalPort();
-		} catch (IOException e) { 
-		} finally {
-			if (socket != null) {
-				try {
-					socket.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return -1;		
-	}	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
deleted file mode 100644
index 006545c..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * Default implementation for classpath provider.
- * <p>
- * This class may be subclassed.
- * </p>
- * @since 2.0
- */
-public class StandardClasspathProvider implements IRuntimeClasspathProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
-		if (useDefault) {
-			IJavaProject proj = JavaRuntime.getJavaProject(configuration);
-			if (proj == null) {
-				//no project - use JRE's default libraries
-				return new IRuntimeClasspathEntry[]{computeJRELibraryEntry(configuration)};				
-			}
-			IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedRuntimeClasspath(proj);
-			// replace JRE with config's JRE if different
-			IVMInstall projJRE = JavaRuntime.getVMInstall(proj);
-			IVMInstall configJRE = JavaRuntime.computeVMInstall(configuration);
-			if (configJRE.equals(projJRE)) {
-				return entries;
-			}
-			for (int i = 0; i < entries.length; i++) {
-				IRuntimeClasspathEntry entry = entries[i];
-				switch (entry.getType()) {
-					case IRuntimeClasspathEntry.CONTAINER:
-						if (entry.getPath().segment(0).equals(JavaRuntime.JRE_CONTAINER)) {
-							entries[i] = computeJRELibraryEntry(configuration);
-							return entries;
-						}
-					case IRuntimeClasspathEntry.VARIABLE:
-						if (entry.getPath().segment(0).equals(JavaRuntime.JRELIB_VARIABLE)) {
-							entries[i] = computeJRELibraryEntry(configuration);
-							return entries;
-						}
-				}
-			}
-			return entries;
-		}
-		// recover persisted classpath
-		return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
-	}
-
-	private IRuntimeClasspathEntry computeJRELibraryEntry(ILaunchConfiguration configuration) throws CoreException {
-		IVMInstall vm = JavaRuntime.computeVMInstall(configuration);
-		IPath path = new Path(JavaRuntime.JRE_CONTAINER);
-		path = path.append(vm.getVMInstallType().getId()).append(vm.getName());
-		return JavaRuntime.newRuntimeContainerClasspathEntry(path, IRuntimeClasspathEntry.STANDARD_CLASSES);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#resolveClasspath(org.eclipse.jdt.launching.IRuntimeClasspathEntry[], org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		List all = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry[] resolved =JavaRuntime.resolveRuntimeClasspathEntry(entries[i], configuration);
-			for (int j = 0; j < resolved.length; j++) {
-				all.add(resolved[j]);
-			}
-		}
-		return (IRuntimeClasspathEntry[])all.toArray(new IRuntimeClasspathEntry[all.size()]);
-	}
-	
-	/**
-	 * Returns a collection of runtime classpath entries that are defined in the
-	 * specified attribute of the given launch configuration. When present,
-	 * the attribute must contain a list of runtime classpath entry mementos.
-	 * 
-	 * @param configuration launch configuration
-	 * @param attribute attribute name containing the list of entries
-	 * @return collection of runtime classpath entries that are defined in the
-	 *  specified attribute of the given launch configuration
-	 * @exception CoreException if unable to retrieve the list
-	 */
-	protected IRuntimeClasspathEntry[] recoverRuntimePath(ILaunchConfiguration configuration, String attribute) throws CoreException {
-		List entries = configuration.getAttribute(attribute, Collections.EMPTY_LIST);
-		IRuntimeClasspathEntry[] rtes = new IRuntimeClasspathEntry[entries.size()];
-		Iterator iter = entries.iterator();
-		int i = 0;
-		while (iter.hasNext()) {
-			rtes[i] = JavaRuntime.newRuntimeClasspathEntry((String)iter.next());
-			i++;
-		}
-		return rtes;		
-	}	
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
deleted file mode 100644
index c97a88f..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.internal.launching.DefaultProjectClasspathEntry;
-import org.eclipse.jdt.internal.launching.VariableClasspathEntry;
-
-/**
- * Default implementation of source lookup path computation and resolution.
- * <p>
- * This class may be subclassed.
- * </p>
- * @since 2.0
- */
-public class StandardSourcePathProvider extends StandardClasspathProvider {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, true);
-		IRuntimeClasspathEntry[] entries = null;
-		if (useDefault) {
-			// the default source lookup path is the same as the classpath
-			entries = super.computeUnresolvedClasspath(configuration);
-		} else {
-			// recover persisted source path
-			entries = recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH);
-		}
-		return entries;
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#resolveClasspath(org.eclipse.jdt.launching.IRuntimeClasspathEntry[], org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		List all = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			switch (entries[i].getType()) {
-				case IRuntimeClasspathEntry.PROJECT:
-					// a project resolves to itself for source lookup (rather than the class file output locations)
-					all.add(entries[i]);
-					break;
-				case IRuntimeClasspathEntry.OTHER:
-					IRuntimeClasspathEntry2 entry = (IRuntimeClasspathEntry2)entries[i];
-					String typeId = entry.getTypeId();
-					IRuntimeClasspathEntry[] res = null;
-					if (typeId.equals(DefaultProjectClasspathEntry.TYPE_ID)) {
-						// add the resolved children of the project
-						IRuntimeClasspathEntry[] children = entry.getRuntimeClasspathEntries(configuration);
-						res = JavaRuntime.resolveSourceLookupPath(children, configuration);
-					} else if (typeId.equals(VariableClasspathEntry.TYPE_ID)) {
-						// add the archive itself - we currently do not allow a source attachment
-						res = JavaRuntime.resolveRuntimeClasspathEntry(entry, configuration);
-					} else {
-                        res = JavaRuntime.resolveRuntimeClasspathEntry(entry, configuration);
-                    }
-					if (res != null) {
-						for (int j = 0; j < res.length; j++) {
-							all.add(res[j]);
-                            addManifestReferences(res[j], all);
-						}
-					}
-					break;
-				default:
-					IRuntimeClasspathEntry[] resolved =JavaRuntime.resolveRuntimeClasspathEntry(entries[i], configuration);
-					for (int j = 0; j < resolved.length; j++) {
-						all.add(resolved[j]);
-                        addManifestReferences(resolved[j], all);
-					}
-					break;
-			}
-		}
-		return (IRuntimeClasspathEntry[])all.toArray(new IRuntimeClasspathEntry[all.size()]);
-	}
-
-    /**
-     * If the given entry is an archive, adds any archives referenced by the associated manifest.
-     * 
-     * @param entry runtime classpath entry
-     * @param all list to add references to
-     */
-    protected void addManifestReferences(IRuntimeClasspathEntry entry, List all) {
-        if (entry.getType() == IRuntimeClasspathEntry.ARCHIVE) {
-            String location = entry.getLocation();
-            if (location != null) {
-                JarFile jar = null;
-                try {
-                    jar = new JarFile(location);
-                    Manifest manifest = jar.getManifest();
-                    if (manifest != null) {
-                        Attributes mainAttributes = manifest.getMainAttributes();
-                        if (mainAttributes != null) {
-                            String value = mainAttributes.getValue(Attributes.Name.CLASS_PATH);
-                            if (value != null) {
-                                String[] entries = value.split("\\s+"); //$NON-NLS-1$
-                                IPath base = new Path(location);
-                                base = base.removeLastSegments(1);
-                                for (int i = 0; i < entries.length; i++) {
-                                    IPath path = base.append(entries[i]);
-                                    if (path.toFile().exists()) {
-                                        IRuntimeClasspathEntry ref = JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-                                        if (!all.contains(ref)) {
-                                            all.add(ref);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } catch (IOException e) {
-                } finally {
-                    if (jar != null) {
-                        try {
-                            jar.close();
-                        } catch (IOException e) {
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
deleted file mode 100644
index 6b8d914..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.launching;
-
- 
-import java.util.Map;
-
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-
-/**
- * Holder for various arguments passed to a VM runner.
- * Mandatory parameters are passed in the constructor; optional arguments, via setters.
- * <p>
- * Clients may instantiate this class; it is not intended to be subclassed.
- * </p>
- */
-public class VMRunnerConfiguration {
-	private String fClassToLaunch;
-	private String[] fVMArgs;
-	private String[] fProgramArgs;
-	private String[] fEnvironment;
-	private String[] fClassPath;
-	private String[] fBootClassPath;
-	private String fWorkingDirectory;
-	private Map fVMSpecificAttributesMap;
-	private boolean fResume = true;
-	
-	private static final String[] fgEmpty= new String[0];
-	
-	/**
-	 * Creates a new configuration for launching a VM to run the given main class
-	 * using the given class path.
-	 *
-	 * @param classToLaunch The fully qualified name of the class to launch. May not be null.
-	 * @param classPath 	The classpath. May not be null.
-	 */
-	public VMRunnerConfiguration(String classToLaunch, String[] classPath) {
-		if (classToLaunch == null) {
-			throw new IllegalArgumentException(LaunchingMessages.vmRunnerConfig_assert_classNotNull); 
-		}
-		if (classPath == null) {
-			throw new IllegalArgumentException(LaunchingMessages.vmRunnerConfig_assert_classPathNotNull); 
-		}
-		fClassToLaunch= classToLaunch;
-		fClassPath= classPath;
-	}
-
-	/**
-	 * Sets the <code>Map</code> that contains String name/value pairs that represent
-	 * VM-specific attributes.
-	 * 
-	 * @param map the <code>Map</code> of VM-specific attributes.
-	 * @since 2.0
-	 */
-	public void setVMSpecificAttributesMap(Map map) {
-		fVMSpecificAttributesMap = map;
-	}
-
-	/**
-	 * Sets the custom VM arguments. These arguments will be appended to the list of 
-	 * VM arguments that a VM runner uses when launching a VM. Typically, these VM arguments
-	 * are set by the user.
-	 * These arguments will not be interpreted by a VM runner, the client is responsible for
-	 * passing arguments compatible with a particular VM runner.
-	 *
-	 * @param args the list of VM arguments
-	 */
-	public void setVMArguments(String[] args) {
-		if (args == null) {
-			throw new IllegalArgumentException(LaunchingMessages.vmRunnerConfig_assert_vmArgsNotNull); 
-		}
-		fVMArgs= args;
-	}
-	
-	/**
-	 * Sets the custom program arguments. These arguments will be appended to the list of 
-	 * program arguments that a VM runner uses when launching a VM (in general: none). 
-	 * Typically, these VM arguments are set by the user.
-	 * These arguments will not be interpreted by a VM runner, the client is responsible for
-	 * passing arguments compatible with a particular VM runner.
-	 *
-	 * @param args the list of arguments	
-	 */
-	public void setProgramArguments(String[] args) {
-		if (args == null) {
-			throw new IllegalArgumentException(LaunchingMessages.vmRunnerConfig_assert_programArgsNotNull); 
-		}
-		fProgramArgs= args;
-	}
-	
-	/**
-	 * Sets the environment for the Java program. The Java VM will be
-	 * launched in the given environment.
-	 * 
-	 * @param environment the environment for the Java program specified as an array
-	 *  of strings, each element specifying an environment variable setting in the
-	 *  format <i>name</i>=<i>value</i>
-	 * @since 3.0
-	 */
-	public void setEnvironment(String[] environment) {
-		fEnvironment= environment;
-	}
-		
-	/**
-	 * Sets the boot classpath. Note that the boot classpath will be passed to the 
-	 * VM "as is". This means it has to be complete. Interpretation of the boot class path
-	 * is up to the VM runner this object is passed to.
-	 * <p>
-	 * In release 3.0, support has been added for appending and prepending the
-	 * boot classpath. Generally an <code>IVMRunner</code> should use the prepend,
-	 * main, and append boot classpaths provided. However, in the case that an
-	 * <code>IVMRunner</code> does not support these options, a complete boothpath
-	 * should also be specified.
-	 * </p>
-	 * @param bootClassPath The boot classpath. An emptry array indicates an empty
-	 *  bootpath and <code>null</code> indicates a default bootpath.
-	 */
-	public void setBootClassPath(String[] bootClassPath) {
-		fBootClassPath= bootClassPath;
-	}
-	
-	/**
-	 * Returns the <code>Map</code> that contains String name/value pairs that represent
-	 * VM-specific attributes.
-	 * 
-	 * @return The <code>Map</code> of VM-specific attributes or <code>null</code>.
-	 * @since 2.0
-	 */
-	public Map getVMSpecificAttributesMap() {
-		return fVMSpecificAttributesMap;
-	}
-	
-	/**
-	 * Returns the name of the class to launch.
-	 *
-	 * @return The fully qualified name of the class to launch. Will not be <code>null</code>.
-	 */
-	public String getClassToLaunch() {
-		return fClassToLaunch;
-	}
-	
-	/**
-	 * Returns the classpath.
-	 *
-	 * @return the classpath
-	 */
-	public String[] getClassPath() {
-		return fClassPath;
-	}
-	
-	/**
-	 * Returns the boot classpath. An empty array indicates an empty
-	 * bootpath and <code>null</code> indicates a default bootpah.
-	 * <p>
-	 * In 3.0, support has been added for prepending and appending to the
-	 * boot classpath. The new attributes are stored in the VM specific
-	 * attributes map using the following keys defined in 
-	 * <code>IJavaLaunchConfigurationConstants</code>:
-	 * <ul>
-	 * <li>ATTR_BOOTPATH_PREPEND</li>
-	 * <li>ATTR_BOOTPATH_APPEND</li>
-	 * <li>ATTR_BOOTPATH</li>
-	 * </ul>
-	 * </p>
-	 * @return The boot classpath. An emptry array indicates an empty
-	 *  bootpath and <code>null</code> indicates a default bootpah.
-	 * @see #setBootClassPath(String[])
-	 * @see IJavaLaunchConfigurationConstants
-	 */
-	public String[] getBootClassPath() {
-		return fBootClassPath;
-	}
-
-	/**
-	 * Returns the arguments to the VM itself.
-	 *
-	 * @return The VM arguments. Default is an empty array. Will not be <code>null</code>.
-	 * @see #setVMArguments(String[])
-	 */
-	public String[] getVMArguments() {
-		if (fVMArgs == null) {
-			return fgEmpty;
-		}
-		return fVMArgs;
-	}
-	
-	/**
-	 * Returns the arguments to the Java program.
-	 *
-	 * @return The Java program arguments. Default is an empty array. Will not be <code>null</code>.
-	 * @see #setProgramArguments(String[])
-	 */
-	public String[] getProgramArguments() {
-		if (fProgramArgs == null) {
-			return fgEmpty;
-		}
-		return fProgramArgs;
-	}
-	
-	/**
-	 * Returns the environment for the Java program or <code>null</code>
-	 * 
-	 * @return The Java program environment. Default is <code>null</code>
-	 * @since 3.0
-	 */
-	public String[] getEnvironment() {
-		return fEnvironment;
-	}
-	
-	/**
-	 * Sets the working directory for a launched VM.
-	 * 
-	 * @param path the absolute path to the working directory
-	 *  to be used by a launched VM, or <code>null</code> if
-	 *  the default working directory is to be inherited from the
-	 *  current process
-	 * @since 2.0
-	 */
-	public void setWorkingDirectory(String path) {
-		fWorkingDirectory = path;
-	}
-	
-	/**
-	 * Returns the working directory of a launched VM.
-	 * 
-	 * @return the absolute path to the working directory
-	 *  of a launched VM, or <code>null</code> if the working
-	 *  directory is inherited from the current process
-	 * @since 2.0
-	 */
-	public String getWorkingDirectory() {
-		return fWorkingDirectory;
-	}	
-	
-	/**
-	 * Sets whether the VM is resumed on startup when launched in
-	 * debug mode. Has no effect when not in debug mode.
-	 *  
-	 * @param resume whehter to resume the VM on startup
-	 * @since 3.0
-	 */
-	public void setResumeOnStartup(boolean resume) {
-		fResume = resume;
-	}
-	
-	/**
-	 * Returns whether the VM is resumed on startup when lanched
-	 * in debug mode. Has no effect when no in debug mode. Default
-	 * value is <code>true</code> for backwards compatibility.
-	 * 
-	 * @return whether to resume the VM on startup
-	 * @since 3.0
-	 */
-	public boolean isResumeOnStartup() {
-		return fResume;
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMStandin.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMStandin.java
deleted file mode 100644
index a1d1a24..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMStandin.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching;
-
-
-
-/**
- * An implementation of IVMInstall that is used for manipulating VMs without necessarily 
- * committing changes.
- * <p>
- * Instances of this class act like wrappers.  All other instances of IVMInstall represent 
- * 'real live' VMs that may be used for building or launching.  Instances of this class
- * behave like 'temporary' VMs that are not visible and not available for building or launching.
- * </p>
- * <p>
- * Instances of this class may be constructed as a preliminary step to creating a 'live' VM
- * or as a preliminary step to making changes to a 'real' VM.
- * </p>
- * When <code>convertToRealVM</code> is called, a corresponding 'real' VM is created
- * if one did not previously exist, or the corresponding 'real' VM is updated.
- * </p>
- * <p>
- * Clients may instantiate this class; it is not intended to be subclassed.
- * </p>
- * 
- * @since 2.1
- */
-public class VMStandin extends AbstractVMInstall {
-    
-    /**
-     * <code>java.version</code> system property, or <code>null</code>
-     * @since 3.1
-     */
-    private String fJavaVersion = null;
-
-	/*
-	 * @see org.eclipse.jdt.launching.AbstractVMInstall#AbstractVMInstall(org.eclipse.jdt.launching.IVMInstallType, java.lang.String)
-	 */
-	public VMStandin(IVMInstallType type, String id) {
-		super(type, id);
-		setNotify(false);
-	}
-	
-	/**
-	 * Construct a <code>VMStandin</code> instance based on the specified <code>IVMInstall</code>.
-	 * Changes to this standin will not be reflected in the 'real' VM until <code>convertToRealVM</code>
-	 * is called.
-	 * 
-	 * @param realVM the 'real' VM from which to construct this standin VM
-	 */
-	public VMStandin(IVMInstall realVM) {
-		this (realVM.getVMInstallType(), realVM.getId());
-		setName(realVM.getName());
-		setInstallLocation(realVM.getInstallLocation());
-		setLibraryLocations(realVM.getLibraryLocations());
-		setJavadocLocation(realVM.getJavadocLocation());
-		if (realVM instanceof IVMInstall2) {
-			IVMInstall2 vm2 = (IVMInstall2) realVM;
-			setVMArgs(vm2.getVMArgs());
-	        fJavaVersion = vm2.getJavaVersion();			
-		} else {
-			setVMArguments(realVM.getVMArguments());
-			fJavaVersion = null;
-		}
-	}
-	
-	/**
-	 * If no corresponding 'real' VM exists, create one and populate it from this standin instance. 
-	 * If a corresponding VM exists, update its attributes from this standin instance.
-	 * 
-	 * @return IVMInstall the 'real' corresponding to this standin VM
-	 */
-	public IVMInstall convertToRealVM() {
-		IVMInstallType vmType= getVMInstallType();
-		IVMInstall realVM= vmType.findVMInstall(getId());
-		boolean notify = true;
-		
-		if (realVM == null) {
-			realVM= vmType.createVMInstall(getId());
-			notify = false;
-		}
-		// do not notify of property changes on new VMs
-		if (realVM instanceof AbstractVMInstall) {
-			 ((AbstractVMInstall)realVM).setNotify(notify);
-		}
-		realVM.setName(getName());
-		realVM.setInstallLocation(getInstallLocation());
-		realVM.setLibraryLocations(getLibraryLocations());
-		realVM.setJavadocLocation(getJavadocLocation());
-		if (realVM instanceof IVMInstall2) {
-			IVMInstall2 vm2 = (IVMInstall2) realVM;
-			vm2.setVMArgs(getVMArgs());
-		} else {
-			realVM.setVMArguments(getVMArguments());
-		}
-		
-		if (realVM instanceof AbstractVMInstall) {
-			 ((AbstractVMInstall)realVM).setNotify(true);
-		}		
-		if (!notify) {
-			JavaRuntime.fireVMAdded(realVM);
-		}
-		return realVM;
-	}
-		
-    /* (non-Javadoc)
-     * @see org.eclipse.jdt.launching.IVMInstall#getJavaVersion()
-     */
-    public String getJavaVersion() {
-        return fJavaVersion;
-    }
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/package.html b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/package.html
deleted file mode 100644
index 1cd36bb..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/package.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Application programming interfaces for interaction
-with the Eclipse Java launching support.
-<h2>
-Package Specification</h2>
-Provides support for describing installed Java runtime environments and launching
-Java virtual machines.
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
deleted file mode 100644
index d1efa97..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.internal.launching.JavaLaunchConfigurationUtils;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
- 
-/**
- * Locates source elements in an archive (zip) in the local file system. Returns
- * instances of <code>ZipEntryStorage</code>.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see IJavaSourceLocation
- * @since 2.0
- * @deprecated In 3.0, the debug platform provides source lookup facilities that
- *  should be used in place of the Java source lookup support provided in 2.0.
- *  The new facilities provide a source lookup director that coordinates source
- *  lookup among a set of participants, searching a set of source containers.
- *  See the following packages: <code>org.eclipse.debug.core.sourcelookup</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers</code>. This class
- *  has been replaced by the following classes:
- *  <code>org.eclipse.debug.core.sourcelookup.containers.ArchiveSourceContainer</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers.ExternalArchiveSourceContainer</code>.
- */
-public class ArchiveSourceLocation extends PlatformObject implements IJavaSourceLocation {
-	
-	/**
-	 * Cache of shared zip files. Zip files are closed
-	 * when the launching plug-in is shutdown.
-	 */
-	private static HashMap fZipFileCache = new HashMap(5);
-
-	/**
-	 * Returns a zip file with the given name
-	 * 
-	 * @param name zip file name
-	 * @return The zip file with the given name
-	 * @exception IOException if unable to create the specified zip
-	 * 	file
-	 */
-	private static ZipFile getZipFile(String name) throws IOException {
-		synchronized (fZipFileCache) {
-			ZipFile zip = (ZipFile)fZipFileCache.get(name);
-			if (zip == null) {
-				zip = new ZipFile(name);
-				fZipFileCache.put(name, zip);
-			}
-			return zip;
-		}
-	}
-	
-	/**
-	 * Closes all zip files that have been opened,
-	 * and removes them from the zip file cache.
-	 * This method is only to be called by the launching
-	 * plug-in.
-	 */
-	public static void closeArchives() {
-		synchronized (fZipFileCache) {
-			Iterator iter = fZipFileCache.values().iterator();
-			while (iter.hasNext()) {
-				ZipFile file = (ZipFile)iter.next();
-				synchronized (file) {
-					try {
-						file.close();
-					} catch (IOException e) {
-						LaunchingPlugin.log(e);
-					}
-				}
-			}
-			fZipFileCache.clear();
-		}
-	}
-	
-	/**
-	 * The root source folder in the archive
-	 */
-	private IPath fRootPath;
-	
-	/**
-	 * Whether the root path has been detected (or set)
-	 */
-	private boolean fRootDetected = false;
-	
-	/**
-	 * The name of the archive
-	 */
-	private String fName;
-
-	/**
-	 * Constructs a new empty source location to be initialized with 
-	 * a memento.
-	 */
-	public ArchiveSourceLocation() {
-	}
-		
-	/**
-	 * Constructs a new source location that will retrieve source
-	 * elements from the zip file with the given name.
-	 * 
-	 * @param archiveName zip file
-	 * @param sourceRoot a path to the root source folder in the
-	 *  specified archive, or <code>null</code> if the root source folder
-	 *  is the root of the archive
-	 */
-	public ArchiveSourceLocation(String archiveName, String sourceRoot) {
-		super();
-		setName(archiveName);
-		setRootPath(sourceRoot);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
-	 */
-	public Object findSourceElement(String name) throws CoreException {
-		try {
-			if (getArchive() == null) {
-				return null;
-			}
-			
-			boolean possibleInnerType = false;
-			String pathStr= name.replace('.', '/');
-			int lastSlash = pathStr.lastIndexOf('/');
-			String typeName = pathStr;
-			do {
-				IPath entryPath = new Path(typeName + ".java"); //$NON-NLS-1$
-				autoDetectRoot(entryPath);
-				if (getRootPath() != null) {
-					entryPath = getRootPath().append(entryPath);
-				}				
-				ZipEntry entry = getArchive().getEntry(entryPath.toString());
-				if (entry != null) {
-					return new ZipEntryStorage(getArchive(), entry);
-				}
-				int index = typeName.lastIndexOf('$');
-				if (index > lastSlash) {
-					typeName = typeName.substring(0, index);
-					possibleInnerType = true;
-				} else {
-					possibleInnerType = false;
-				}						
-			} while (possibleInnerType);						
-			return null;
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, 
-				MessageFormat.format(LaunchingMessages.ArchiveSourceLocation_Unable_to_locate_source_element_in_archive__0__1, new String[] {getName()}), e)); 
-		}
-	}
-	
-	/**
-	 * Automatically detect the root path, if required.
-	 * 
-	 * @param path source file name, excluding root path
-	 * @throws CoreException  if unable to detect the root path for this source archive
-	 */
-	private void autoDetectRoot(IPath path) throws CoreException {
-		if (!fRootDetected) {
-			ZipFile zip = null;
-			try {
-				zip = getArchive();
-			} catch (IOException e) {
-				throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, 
-					MessageFormat.format(LaunchingMessages.ArchiveSourceLocation_Exception_occurred_while_detecting_root_source_directory_in_archive__0__1, new String[] {getName()}), e)); 
-			}
-			synchronized (zip) {
-				Enumeration entries = zip.entries();
-				String fileName = path.toString();
-				try {
-					while (entries.hasMoreElements()) {
-						ZipEntry entry = (ZipEntry)entries.nextElement();
-						String entryName = entry.getName();
-						if (entryName.endsWith(fileName)) {
-							int rootLength = entryName.length() - fileName.length();
-							if (rootLength > 0) {
-								String root = entryName.substring(0, rootLength);
-								setRootPath(root);
-							}
-							fRootDetected = true;
-							return;
-						}
-					}
-				} catch (IllegalStateException e) {
-					throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, 
-						MessageFormat.format(LaunchingMessages.ArchiveSourceLocation_Exception_occurred_while_detecting_root_source_directory_in_archive__0__2, new String[] {getName()}), e)); 
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the archive associated with this source
-	 * location.
-	 * 
-	 * @return zip file
-	 * @throws IOException if unable to create the zip
-	 * 	file associated with this location
-	 */
-	protected ZipFile getArchive() throws IOException {
-		return getZipFile(getName());
-	}
-	
-	/**
-	 * Sets the location of the root source folder within
-	 * the archive, or <code>null</code> if the root source
-	 * folder is the root of the archive
-	 * 
-	 * @param path the location of the root source folder within
-	 * the archive, or <code>null</code> if the root source
-	 * folder is the root of the archive
-	 */
-	private void setRootPath(String path) {
-		if (path == null || path.trim().length() == 0) {
-			fRootPath = null;
-		} else {
-			fRootPath = new Path(path);
-			fRootDetected = true;
-		}
-	}
-	
-	/**
-	 * Returns the location of the root source folder within
-	 * the archive, or <code>null</code> if the root source
-	 * folder is the root of the arhcive
-	 * 
-	 * @return the location of the root source folder within
-	 * the archive, or <code>null</code> if the root source
-	 * folder is the root of the arhcive
-	 */
-	public IPath getRootPath() {
-		return fRootPath;
-	}	
-	
-	/**
-	 * Returns the name of the archive associated with this 
-	 * source location
-	 * 
-	 * @return the name of the archive associated with this
-	 *  source location
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/**
-	 * Sets the name of the archive associated with this 
-	 * source location
-	 * 
-	 * @param name the name of the archive associated with this
-	 *  source location
-	 */
-	private void setName(String name) {
-		fName = name;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {		
-		return object instanceof ArchiveSourceLocation &&
-			 getName().equals(((ArchiveSourceLocation)object).getName());
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getName().hashCode();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		try {
-			Document doc = LaunchingPlugin.getDocument();
-			Element node = doc.createElement("archiveSourceLocation"); //$NON-NLS-1$
-			doc.appendChild(node);
-			node.setAttribute("archivePath", getName()); //$NON-NLS-1$
-			if (getRootPath() != null) {
-				node.setAttribute("rootPath", getRootPath().toString()); //$NON-NLS-1$
-			}
-		
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			abort(MessageFormat.format(LaunchingMessages.ArchiveSourceLocation_Unable_to_create_memento_for_archive_source_location__0__1, new String[] {getName()}), e); 
-		} catch (ParserConfigurationException e) {
-			abort(MessageFormat.format(LaunchingMessages.ArchiveSourceLocation_Unable_to_create_memento_for_archive_source_location__0__1, new String[] {getName()}), e); 
-		} catch (TransformerException e) {
-			abort(MessageFormat.format(LaunchingMessages.ArchiveSourceLocation_Unable_to_create_memento_for_archive_source_location__0__1, new String[] {getName()}), e); 
-		}
-		// execution will not reach here
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
-	 */
-	public void initializeFrom(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser =
-				DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			String path = root.getAttribute("archivePath"); //$NON-NLS-1$
-			if (isEmpty(path)) {
-				abort(LaunchingMessages.ArchiveSourceLocation_Unable_to_initialize_source_location___missing_archive_path__3, null); 
-			}
-			String rootPath = root.getAttribute("rootPath"); //$NON-NLS-1$
-			
-			setName(path);
-			setRootPath(rootPath);
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;			
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(LaunchingMessages.ArchiveSourceLocation_Exception_occurred_initializing_source_location__5, ex);		 
-	}
-
-	private boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	
-	/*
-	 * Throws an internal error exception
-	 */
-	private void abort(String message, Throwable e)	throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, e);
-		throw new CoreException(s);		
-	}	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
deleted file mode 100644
index 90ec914..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaModelStatusConstants;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.launching.JavaLaunchConfigurationUtils;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
- 
-/**
- * Locates source elements in a directory in the local
- * file system. Returns instances of <code>LocalFileStorage</code>.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see IJavaSourceLocation
- * @since 2.0
- * @deprecated In 3.0, the debug platform provides source lookup facilities that
- *  should be used in place of the Java source lookup support provided in 2.0.
- *  The new facilities provide a source lookup director that coordinates source
- *  lookup among a set of participants, searching a set of source containers.
- *  See the following packages: <code>org.eclipse.debug.core.sourcelookup</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers</code>. This class
- *  has been replaced by
- *  <code>org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer</code>.
- */
-public class DirectorySourceLocation extends PlatformObject implements IJavaSourceLocation {
-
-	/**
-	 * The directory associated with this source location
-	 */
-	private File fDirectory;
-	
-	/**
-	 * Constructs a new empty source location to be initialized from
-	 * a memento.
-	 */
-	public DirectorySourceLocation() {
-	}
-		
-	/**
-	 * Constructs a new source location that will retrieve source
-	 * elements from the given directory.
-	 * 
-	 * @param directory a directory
-	 */
-	public DirectorySourceLocation(File directory) {
-		setDirectory(directory);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
-	 */
-	public Object findSourceElement(String name) throws CoreException {
-		if (getDirectory() == null) {
-			return null;
-		}
-		
-		String pathStr= name.replace('.', '/');
-		int lastSlash = pathStr.lastIndexOf('/');
-		try {
-			IPath root = new Path(getDirectory().getCanonicalPath());
-			boolean possibleInnerType = false;
-			String typeName = pathStr;
-			do {
-				IPath filePath = root.append(new Path(typeName + ".java")); //$NON-NLS-1$
-				File file = filePath.toFile();
-				if (file.exists()) {
-					return new LocalFileStorage(file);
-				}
-				int index = typeName.lastIndexOf('$');
-				if (index > lastSlash) {
-					typeName = typeName.substring(0, index);
-					possibleInnerType = true;
-				} else {
-					possibleInnerType = false;
-				}						
-			} while (possibleInnerType);			
-		} catch (IOException e) {
-			throw new JavaModelException(e, IJavaModelStatusConstants.IO_EXCEPTION);
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the directory in which source elements will
-	 * be searched for.
-	 * 
-	 * @param directory a directory
-	 */
-	private void setDirectory(File directory) {
-		fDirectory = directory;
-	}
-	
-	/**
-	 * Returns the directory associated with this source
-	 * location.
-	 * 
-	 * @return directory
-	 */
-	public File getDirectory() {
-		return fDirectory;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {		
-		return object instanceof DirectorySourceLocation &&
-			 getDirectory().equals(((DirectorySourceLocation)object).getDirectory());
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getDirectory().hashCode();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		try {
-			Document doc = LaunchingPlugin.getDocument();
-			Element node = doc.createElement("directorySourceLocation"); //$NON-NLS-1$
-			doc.appendChild(node);
-			node.setAttribute("path", getDirectory().getAbsolutePath()); //$NON-NLS-1$
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			abort(MessageFormat.format(LaunchingMessages.DirectorySourceLocation_Unable_to_create_memento_for_directory_source_location__0__1, new String[] {getDirectory().getAbsolutePath()}), e); 
-		} catch (ParserConfigurationException e) {
-			abort(MessageFormat.format(LaunchingMessages.DirectorySourceLocation_Unable_to_create_memento_for_directory_source_location__0__1, new String[] {getDirectory().getAbsolutePath()}), e); 
-		} catch (TransformerException e) {
-			abort(MessageFormat.format(LaunchingMessages.DirectorySourceLocation_Unable_to_create_memento_for_directory_source_location__0__1, new String[] {getDirectory().getAbsolutePath()}), e); 
-		}
-		// execution will not reach here
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
-	 */
-	public void initializeFrom(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser =
-				DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			String path = root.getAttribute("path"); //$NON-NLS-1$
-			if (isEmpty(path)) {
-				abort(LaunchingMessages.DirectorySourceLocation_Unable_to_initialize_source_location___missing_directory_path_3, null); 
-			} else {
-				File dir = new File(path);
-				if (dir.exists() && dir.isDirectory()) {
-					setDirectory(dir);
-				} else {
-					abort(MessageFormat.format(LaunchingMessages.DirectorySourceLocation_Unable_to_initialize_source_location___directory_does_not_exist___0__4, new String[] {path}), null); 
-				}
-			}
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;			
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(LaunchingMessages.DirectorySourceLocation_Exception_occurred_initializing_source_location__5, ex);		 
-	}
-
-	private boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	
-	/*
-	 * Throws an internal error exception
-	 */
-	private void abort(String message, Throwable e)	throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, e);
-		throw new CoreException(s);		
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/IJavaSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/IJavaSourceLocation.java
deleted file mode 100644
index aad8fdf..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/IJavaSourceLocation.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
- 
-/**
- * A repository of source code. A source location is capable of retrieving
- * source elements.
- * <p>
- * For example, a source location could be a project, zip/archive
- * file, or a directory in the file system.
- * </p>
- * <p>
- * This interface is may be implemented by clients.
- * </p>
- * @since 2.0
- * @deprecated In 3.0, the debug platform provides source lookup facilities that
- *  should be used in place of the Java source lookup support provided in 2.0.
- *  The new facilities provide a source lookup director that coordinates source
- *  lookup among a set of participants, searching a set of source containers.
- *  See the following packages: <code>org.eclipse.debug.core.sourcelookup</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers</code>. This interface
- *  has been replaced by
- *  <code>org.eclipse.debug.core.sourcelookup.ISourceContainer</code>.
- */
-public interface IJavaSourceLocation extends IAdaptable {
-	
-	/**
-	 * Returns an object representing the source code
-	 * for a type with the specified name, or <code>null</code>
-	 * if none could be found. The name is
-	 * a fully qualified type name, and may contain the '$'
-	 * character when referring to inner types. For example,
-	 * <code>java.lang.String</code>. The source element 
-	 * returned is implementation specific - for example, a
-	 * resource, a local file, a zip file entry, etc.
-	 * 
-	 * @param name fully qualified name of the type for which
-	 * 		source is being searched for
-	 * @return source element
-	 * @exception CoreException if an exception occurs while searching
-	 *  for the specified source element
-	 */
-	public Object findSourceElement(String name) throws CoreException;
-	
-	/**
-	 * Returns a memento for this source location from which this
-	 * source location can be reconstructed.
-	 * 
-	 * @return a memento for this source location
-	 * @exception CoreException if unable to create a memento
-	 */
-	public String getMemento() throws CoreException;
-	
-	/**
-	 * Initializes this source location from the given memento.
-	 * 
-	 * @param memento a memento generated by this source location
-	 * @exception CoreException if unable to initialize this source
-	 * 	location
-	 */
-	public void initializeFrom(String memento) throws CoreException;
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
deleted file mode 100644
index 0939917..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.launching.JavaLaunchConfigurationUtils;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
- 
-/**
- * Locates source elements in all source folders of the
- * given Java project. Returns instances of <code>ICompilationUnit</code>
- * and </code>IClassFile</code>.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see IJavaSourceLocation
- * @since 2.0
- * @deprecated In 3.0, the debug platform provides source lookup facilities that
- *  should be used in place of the Java source lookup support provided in 2.0.
- *  The new facilities provide a source lookup director that coordinates source
- *  lookup among a set of participants, searching a set of source containers.
- *  See the following packages: <code>org.eclipse.debug.core.sourcelookup</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers</code>. This class
- *  has been replaced by
- *  <code>org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer</code>. 
- */
-public class JavaProjectSourceLocation extends PlatformObject implements IJavaSourceLocation {
-
-	/**
-	 * The project associated with this source location
-	 */
-	private IJavaProject fProject;
-	
-	/**
-	 * Corresponding package fragment root locations.
-	 */
-	private IJavaSourceLocation[] fRootLocations = null;
-	
-	/**
-	 * Constructs a new empty source location to be initialized
-	 * by a memento.
-	 */
-	public JavaProjectSourceLocation() {
-	}
-	
-	/**
-	 * Constructs a new source location that will retrieve source
-	 * elements from the given Java project.
-	 * 
-	 * @param project Java project
-	 */
-	public JavaProjectSourceLocation(IJavaProject project) {
-		setJavaProject(project);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
-	 */
-	public Object findSourceElement(String name) throws CoreException {
-		if (fRootLocations != null) {
-			for (int i = 0; i < fRootLocations.length; i++) {
-				Object element = fRootLocations[i].findSourceElement(name);
-				if (element != null) {
-					return element;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the Java project in which source elements will
-	 * be searched for.
-	 * 
-	 * @param project Java project
-	 */
-	private void setJavaProject(IJavaProject project) {
-		fProject = project;
-		fRootLocations = null;
-		if (fProject != null) {
-			try {
-				IPackageFragmentRoot[] roots = project.getPackageFragmentRoots();
-				ArrayList list = new ArrayList(roots.length);
-				
-				for (int i = 0; i < roots.length; i++) {
-					if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
-						list.add(new PackageFragmentRootSourceLocation(roots[i]));
-					}
-				}
-				fRootLocations = (IJavaSourceLocation[])list.toArray(new IJavaSourceLocation[list.size()]);
-			} catch (JavaModelException e) {
-				LaunchingPlugin.log(e);
-			}
-		}
-	}
-	
-	/**
-	 * Returns the Java project associated with this source
-	 * location.
-	 * 
-	 * @return Java project
-	 */
-	public IJavaProject getJavaProject() {
-		return fProject;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {		
-		return object instanceof JavaProjectSourceLocation &&
-			 getJavaProject().equals(((JavaProjectSourceLocation)object).getJavaProject());
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getJavaProject().hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		try {
-			Document doc = LaunchingPlugin.getDocument();
-			Element node = doc.createElement("javaProjectSourceLocation"); //$NON-NLS-1$
-			doc.appendChild(node);
-			node.setAttribute("name", getJavaProject().getElementName()); //$NON-NLS-1$
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			abort(MessageFormat.format(LaunchingMessages.JavaProjectSourceLocation_Unable_to_create_memento_for_Java_project_source_location__0__1, new String[] {getJavaProject().getElementName()}), e); 
-		} catch (ParserConfigurationException e) {
-			abort(MessageFormat.format(LaunchingMessages.JavaProjectSourceLocation_Unable_to_create_memento_for_Java_project_source_location__0__1, new String[] {getJavaProject().getElementName()}), e); 
-		} catch (TransformerException e) {
-			abort(MessageFormat.format(LaunchingMessages.JavaProjectSourceLocation_Unable_to_create_memento_for_Java_project_source_location__0__1, new String[] {getJavaProject().getElementName()}), e); 
-		}
-		// execution will not reach here
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
-	 */
-	public void initializeFrom(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser =
-				DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			String name = root.getAttribute("name"); //$NON-NLS-1$
-			if (isEmpty(name)) {
-				abort(LaunchingMessages.JavaProjectSourceLocation_Unable_to_initialize_source_location___missing_project_name_3, null); 
-			} else {
-				IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-				setJavaProject(JavaCore.create(proj));
-			}
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;			
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(LaunchingMessages.JavaProjectSourceLocation_Exception_occurred_initializing_source_location__4, ex); 
-	}
-
-	private boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	
-	/*
-	 * Throws an internal error exception
-	 */
-	private void abort(String message, Throwable e)	throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, e);
-		throw new CoreException(s);		
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
deleted file mode 100644
index 632b85a..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.internal.launching.JavaLaunchConfigurationUtils;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-/**
- * Locates source for a Java debug session by searching
- * a configurable set of source locations.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see org.eclipse.debug.core.model.ISourceLocator
- * @since 2.0
- * @deprecated In 3.0, the debug platform provides source lookup facilities that
- *  should be used in place of the Java source lookup support provided in 2.0.
- *  The new facilities provide a source lookup director that coordinates source
- *  lookup among a set of participants, searching a set of source containers.
- *  See the following packages: <code>org.eclipse.debug.core.sourcelookup</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers</code>. This class
- *  has been replaced by a Java source lookup director and Java source lookup
- *  participant. To migrate to the new source lookup support clients should
- *  add two new attributes to their launch configuration type extensions:<ul>
- *  <li>sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"</li>
- *  <li>sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"</li>
- *  </ul>
- *  The source locator id attribute specifies to use the Java source lookup director
- *  for launch configurations of the associated type, and the source path computer id
- *  attribute specifies the class to use when computing a default source lookup
- *  path for a launch configuration. The path computer referenced/provided (by the
- *  above id), computes a default source lookup path based on the support provided in
- *  the 2.0 release - i.e. a configuration's <code>ATTR_SOURCE_PATH_PROVIDER</code>
- *  attribute (if present), or a default source lookup path based on a configuration's
- *  runtime classpath. This class has been replaced by the Java source lookup
- *  director which is an internal class, but can be used via the
- *  <code>sourceLocatorId</code> attribute on a launch configuration type extension.  
- */
-public class JavaSourceLocator implements IPersistableSourceLocator {
-	
-	/**
-	 * Identifier for the 'Java Source Locator' extension
-	 * (value <code>"org.eclipse.jdt.launching.javaSourceLocator"</code>).
-	 */
-	public static final String ID_JAVA_SOURCE_LOCATOR = LaunchingPlugin.getUniqueIdentifier() + ".javaSourceLocator"; //$NON-NLS-1$
-
-	/**
-	 * A collection of the source locations to search
-	 */
-	private IJavaSourceLocation[] fLocations;
-
-	/**
-	 * Constructs a new empty JavaSourceLocator.
-	 */
-	public JavaSourceLocator() {
-		setSourceLocations(new IJavaSourceLocation[0]);
-	}
-	
-	/**
-	 * Constructs a new Java source locator that looks in the
-	 * specified project for source, and required projects, if
-	 * <code>includeRequired</code> is <code>true</code>.
-	 * 
-	 * @param projects the projects in which to look for source
-	 * @param includeRequired whether to look in required projects
-	 * 	as well
-	 */
-	public JavaSourceLocator(IJavaProject[] projects, boolean includeRequired) throws JavaModelException {
-		ArrayList requiredProjects = new ArrayList();
-		for (int i= 0; i < projects.length; i++) {
-			if (includeRequired) {
-				collectRequiredProjects(projects[i], requiredProjects);
-			} else {
-				if (!requiredProjects.contains(projects[i])) {
-					requiredProjects.add(projects[i]);
-				}
-			}
-		}
-		
-		// only add external entires with the same location once
-		HashMap external = new HashMap();
-		ArrayList list = new ArrayList();
-		// compute the default locations for each project, and add unique ones
-		Iterator iter = requiredProjects.iterator();
-		while (iter.hasNext()) {
-			IJavaProject p = (IJavaProject)iter.next();
-			try {
-				IPackageFragmentRoot[] roots = p.getPackageFragmentRoots();
-				for (int i = 0; i < roots.length; i++) {
-					if (roots[i].isExternal()) {
-						IPath location = roots[i].getPath();
-						if (external.get(location) == null) {
-							external.put(location, location);
-							list.add(new PackageFragmentRootSourceLocation(roots[i]));
-						}
-					} else {
-						list.add(new PackageFragmentRootSourceLocation(roots[i]));
-					}
-				}
-			} catch (CoreException e) {
-				if (e instanceof JavaModelException) {
-					throw (JavaModelException)e;
-				} 
-				throw new JavaModelException(e);
-			}
-		}
-		IJavaSourceLocation[] locations = (IJavaSourceLocation[])list.toArray(new IJavaSourceLocation[list.size()]);
-		setSourceLocations(locations);
-	}	
-	
-	/**
-	 * Constructs a new JavaSourceLocator that searches the
-	 * specified set of source locations for source elements.
-	 * 
-	 * @param locations the source locations to search for
-	 *  source, in the order they should be searched
-	 */
-	public JavaSourceLocator(IJavaSourceLocation[] locations) {
-		setSourceLocations(locations);
-	}
-	
-	/**
-	 * Constructs a new JavaSourceLocator that searches the
-	 * default set of source locations for the given Java project.
-	 * 
-	 * @param project Java project
-	 * @exception CoreException if an exception occurs reading
-	 *  the classpath of the given or any required project
-	 */
-	public JavaSourceLocator(IJavaProject project) throws CoreException {
-		setSourceLocations(getDefaultSourceLocations(project));
-	}	
-	
-	/**
-	 * Sets the locations that will be searched, in the order
-	 * to be searched.
-	 * 
-	 * @param locations the locations that will be searched, in the order
-	 *  to be searched
-	 */
-	public void setSourceLocations(IJavaSourceLocation[] locations) {
-		fLocations = locations;
-	}
-	
-	/**
-	 * Returns the locations that this source locator is currently
-	 * searching, in the order that they are searched.
-	 * 
-	 * @return the locations that this source locator is currently
-	 * searching, in the order that they are searched
-	 */
-	public IJavaSourceLocation[] getSourceLocations() {
-		return fLocations;
-	}
-	
-	/**
-	 * Returns all source elements that correspond to the type associated with
-	 * the given stack frame, or <code>null</code> if none.
-	 * 
-	 * @param stackFrame stack frame
-	 * @return all source elements that correspond to the type associated with
-	 * the given stack frame, or <code>null</code> if none
-	 * @since 2.1
-	 */
-	public Object[] getSourceElements(IStackFrame stackFrame) {
-		if (stackFrame instanceof IJavaStackFrame) {
-			IJavaStackFrame frame = (IJavaStackFrame)stackFrame;
-			String name = null;
-			try {
-				name = getFullyQualfiedName(frame);
-				if (name == null) {
-					return null;
-				}
-			} catch (CoreException e) {
-				// if the thread has since resumed, return null
-				if (e.getStatus().getCode() != IJavaThread.ERR_THREAD_NOT_SUSPENDED) {
-					LaunchingPlugin.log(e);
-				}
-				return null;
-			}
-			List list = new ArrayList();
-			IJavaSourceLocation[] locations = getSourceLocations();
-			for (int i = 0; i < locations.length; i++) {
-				try {
-					Object sourceElement = locations[i].findSourceElement(name);
-					if (sourceElement != null) {
-						list.add(sourceElement);
-					}
-				} catch (CoreException e) {
-					// log the error and try the next source location
-					LaunchingPlugin.log(e);
-				}
-			}
-			return list.toArray();
-		}
-		return null;
-	}	
-			
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(org.eclipse.debug.core.model.IStackFrame)
-	 */
-	public Object getSourceElement(IStackFrame stackFrame) {
-		if (stackFrame instanceof IJavaStackFrame) {
-			IJavaStackFrame frame = (IJavaStackFrame)stackFrame;
-			String name = null;
-			try {
-				name = getFullyQualfiedName(frame);
-				if (name == null) {
-					return null;
-				}
-			} catch (CoreException e) {
-				// if the thread has since resumed, return null
-				if (e.getStatus().getCode() != IJavaThread.ERR_THREAD_NOT_SUSPENDED) {
-					LaunchingPlugin.log(e);
-				}
-				return null;
-			}
-			IJavaSourceLocation[] locations = getSourceLocations();
-			for (int i = 0; i < locations.length; i++) {
-				try {
-					Object sourceElement = locations[i].findSourceElement(name);
-					if (sourceElement != null) {
-						return sourceElement;
-					}
-				} catch (CoreException e) {
-					// log the error and try the next source location
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-		return null;
-	}
-	
-	private String getFullyQualfiedName(IJavaStackFrame frame) throws CoreException {
-		String name = null;
-		if (frame.isObsolete()) {
-			return null;
-		}
-		String sourceName = frame.getSourceName();
-		if (sourceName == null) {
-			// no debug attributes, guess at source name
-			name = frame.getDeclaringTypeName();
-		} else {
-			// build source name from debug attributes using
-			// the source file name and the package of the declaring
-			// type
-					
-			// @see bug# 21518 - remove absolute path prefix
-			int index = sourceName.lastIndexOf('\\');
-			if (index == -1) {
-				index = sourceName.lastIndexOf('/');
-			}
-			if (index >= 0) {
-				sourceName = sourceName.substring(index + 1);
-			}
-					
-			String declName= frame.getDeclaringTypeName();
-			index = declName.lastIndexOf('.');
-			if (index >= 0) {
-				name = declName.substring(0, index + 1);
-			} else {
-				name = ""; //$NON-NLS-1$
-			}
-			index = sourceName.lastIndexOf('.');
-			if (index >= 0) {
-				name += sourceName.substring(0, index) ;
-			}					
-		}
-		return name;		
-	}
-	
-	/**
-	 * Adds all projects required by <code>proj</code> to the list
-	 * <code>res</code>
-	 * 
-	 * @param proj the project for which to compute required
-	 *  projects
-	 * @param res the list to add all required projects too
-	 */
-	protected static void collectRequiredProjects(IJavaProject proj, ArrayList res) throws JavaModelException {
-		if (!res.contains(proj)) {
-			res.add(proj);
-			
-			IJavaModel model= proj.getJavaModel();
-			
-			IClasspathEntry[] entries= proj.getRawClasspath();
-			for (int i= 0; i < entries.length; i++) {
-				IClasspathEntry curr= entries[i];
-				if (curr.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-					IJavaProject ref= model.getJavaProject(curr.getPath().segment(0));
-					if (ref.exists()) {
-						collectRequiredProjects(ref, res);
-					}
-				}
-			}
-		}
-	}	
-	
-	/**
-	 * Returns a default collection of source locations for
-	 * the given Java project. Default source locations consist
-	 * of the given project and all of its required projects .
-	 * 
-	 * @param project Java project
-	 * @return a collection of source locations for all required
-	 *  projects
-	 * @exception CoreException if an exception occurs reading
-	 *  computing the default locations
-	 */
-	public static IJavaSourceLocation[] getDefaultSourceLocations(IJavaProject project) throws CoreException {
-		// create a temporary launch config
-		ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		ILaunchConfigurationWorkingCopy config = type.newInstance(null, project.getElementName());
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getElementName());
-		JavaSourceLocator locator = new JavaSourceLocator();
-		locator.initializeDefaults(config);
-		return locator.getSourceLocations();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IPersistableSourceLocator#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		try {
-			Document doc = LaunchingPlugin.getDocument();
-			Element node = doc.createElement("javaSourceLocator"); //$NON-NLS-1$
-			doc.appendChild(node);
-			
-			IJavaSourceLocation[] locations = getSourceLocations();
-			for (int i = 0; i < locations.length; i++) {
-				Element child = doc.createElement("javaSourceLocation"); //$NON-NLS-1$
-				child.setAttribute("class", locations[i].getClass().getName()); //$NON-NLS-1$
-				child.setAttribute("memento", locations[i].getMemento()); //$NON-NLS-1$
-				node.appendChild(child);
-			}
-		
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			abort(LaunchingMessages.JavaSourceLocator_Unable_to_create_memento_for_Java_source_locator__4, e); 
-		} catch (ParserConfigurationException e) {
-			abort(LaunchingMessages.JavaSourceLocator_Unable_to_create_memento_for_Java_source_locator__4, e); 
-		} catch (TransformerException e) {
-			abort(LaunchingMessages.JavaSourceLocator_Unable_to_create_memento_for_Java_source_locator__4, e); 
-		} 
-		// execution will not reach here
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeDefaults(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {
-		IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
-		setSourceLocations(getSourceLocations(resolved));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IPersistableSourceLocator#initializeFromMemento(java.lang.String)
-	 */
-	public void initializeFromMemento(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser =
-				DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			if (!root.getNodeName().equalsIgnoreCase("javaSourceLocator")) {  //$NON-NLS-1$
-				abort(LaunchingMessages.JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__6, null); 
-			}
-	
-			List sourceLocations = new ArrayList();
-			ClassLoader classLoader = LaunchingPlugin.getDefault().getDescriptor().getPluginClassLoader(); 
-			
-			NodeList list = root.getChildNodes();
-			int length = list.getLength();
-			for (int i = 0; i < length; ++i) {
-				Node node = list.item(i);
-				short type = node.getNodeType();
-				if (type == Node.ELEMENT_NODE) {
-					Element entry = (Element) node;
-					if (entry.getNodeName().equalsIgnoreCase("javaSourceLocation")) { //$NON-NLS-1$
-						String className = entry.getAttribute("class"); //$NON-NLS-1$
-						String data = entry.getAttribute("memento"); //$NON-NLS-1$
-						if (isEmpty(className)) {
-							abort(LaunchingMessages.JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__10, null); 
-						}
-						Class clazz  = null;
-						try {
-							clazz = classLoader.loadClass(className);
-						} catch (ClassNotFoundException e) {
-							abort(MessageFormat.format(LaunchingMessages.JavaSourceLocator_Unable_to_restore_source_location___class_not_found___0__11, new String[] {className}), e); 
-						}
-						
-						IJavaSourceLocation location = null;
-						try {
-							location = (IJavaSourceLocation)clazz.newInstance();
-						} catch (IllegalAccessException e) {
-							abort(LaunchingMessages.JavaSourceLocator_Unable_to_restore_source_location__12, e); 
-						} catch (InstantiationException e) {
-							abort(LaunchingMessages.JavaSourceLocator_Unable_to_restore_source_location__12, e); 
-						}
-						location.initializeFrom(data);
-						sourceLocations.add(location);
-					} else {
-						abort(LaunchingMessages.JavaSourceLocator_Unable_to_restore_Java_source_locator___invalid_format__14, null); 
-					}
-				}
-			}
-			setSourceLocations((IJavaSourceLocation[])sourceLocations.toArray(new IJavaSourceLocation[sourceLocations.size()]));
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;			
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(LaunchingMessages.JavaSourceLocator_Exception_occurred_initializing_source_locator__15, ex); 
-	}
-	
-	/**
-	 * Returns source locations that are associted with the given runtime classpath
-	 * entries.
-	 */
-	private static IJavaSourceLocation[] getSourceLocations(IRuntimeClasspathEntry[] entries) {
-		List locations = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			IJavaSourceLocation location = null;
-			switch (entry.getType()) {
-				case IRuntimeClasspathEntry.PROJECT:
-					IProject project = (IProject)entry.getResource();
-					if (project != null && project.exists() && project.isOpen()) {
-						location = new JavaProjectSourceLocation(JavaCore.create(project));
-					}
-					break;
-				case IRuntimeClasspathEntry.ARCHIVE:
-					// check if the archive is in the workspace as a package fragment root
-					location = getArchiveSourceLocation(entry);
-					if (location == null) {
-						String path = entry.getSourceAttachmentLocation();
-						if (path == null) {
-							// if there is no source attachment, look in the archive itself
-							path = entry.getLocation();
-						}
-						if (path != null) {
-							File file = new File(path);
-							if (file.exists()) {
-								if (file.isDirectory()) {
-									location = new DirectorySourceLocation(file);
-								} else {
-									location = new ArchiveSourceLocation(path, entry.getSourceAttachmentRootLocation());
-								}
-							}
-						}
-					}
-					break;
-				case IRuntimeClasspathEntry.VARIABLE:
-					String source = entry.getSourceAttachmentLocation();
-					if (source != null) {
-						location = new ArchiveSourceLocation(source, entry.getSourceAttachmentRootLocation());
-					}
-					break;
-				case IRuntimeClasspathEntry.CONTAINER:
-					throw new IllegalArgumentException(LaunchingMessages.JavaSourceLocator_Illegal_to_have_a_container_resolved_to_a_container_1); 
-			}
-			if (location != null) {
-				locations.add(location);
-			}
-		}
-		return (IJavaSourceLocation[])locations.toArray(new IJavaSourceLocation[locations.size()]);		
-	}
-	
-	private boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	
-	/**
-	 * Throws an internal error exception
-	 */
-	private void abort(String message, Throwable e)	throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, e);
-		throw new CoreException(s);		
-	}	
-	
-	/**
-	 * Returns whether the given objects are equal, allowing
-	 * for <code>null</code>.
-	 * 
-	 * @param a
-	 * @param b
-	 * @return whether the given objects are equal, allowing
-	 *   for <code>null</code>
-	 */
-	private static boolean equalOrNull(Object a, Object b) {
-		if (a == null) {
-			return b == null;
-		}
-		if (b == null) {
-			return false;
-		}
-		return a.equals(b);
-	}
-	
-	/**
-	 * Returns whether the source attachments of the given package fragment
-	 * root and runtime classpath entry are equal.
-	 * 
-	 * @param root package fragment root
-	 * @param entry runtime classpath entry
-	 * @return whether the source attachments of the given package fragment
-	 * root and runtime classpath entry are equal
-	 * @throws JavaModelException 
-	 */
-	private static boolean isSourceAttachmentEqual(IPackageFragmentRoot root, IRuntimeClasspathEntry entry) throws JavaModelException {
-		return equalOrNull(root.getSourceAttachmentPath(), entry.getSourceAttachmentPath());
-	}
-	
-	/**
-	 * Determines if the given archive runtime classpath entry exists
-	 * in the workspace as a package fragment root. Returns the associated
-	 * package fragment root source location if possible, otherwise
-	 * <code>null</code>.
-	 *  
-	 * @param entry archive runtime classpath entry
-	 * @return IJavaSourceLocation or <code>null</code>
-	 */
-	private static IJavaSourceLocation getArchiveSourceLocation(IRuntimeClasspathEntry entry) {
-		IResource resource = entry.getResource();
-		if (resource == null) { 
-			// Check all package fragment roots for case of external archive.
-			// External jars are shared, so it does not matter which project it
-			// originates from
-			IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-			try {
-				IJavaProject[] jps = model.getJavaProjects();
-				for (int i = 0; i < jps.length; i++) {
-					IPackageFragmentRoot[] allRoots = jps[i].getPackageFragmentRoots();
-					for (int j = 0; j < allRoots.length; j++) {
-						IPackageFragmentRoot root = allRoots[j];
-						if (root.isExternal() && root.getPath().equals(new Path(entry.getLocation()))) {
-							if (isSourceAttachmentEqual(root, entry)) {
-								// use package fragment root
-								return new PackageFragmentRootSourceLocation(root);
-							}							
-						}
-					}
-				}
-			} catch (JavaModelException e) {
-				LaunchingPlugin.log(e);
-			}
-		} else {
-			// check if the archive is a package fragment root
-			IProject project = resource.getProject();
-			IJavaProject jp = JavaCore.create(project);
-			try {
-				if (jp != null && jp.exists()) {
-					IPackageFragmentRoot root = jp.getPackageFragmentRoot(resource);
-					IPackageFragmentRoot[] allRoots = jp.getPackageFragmentRoots();
-					for (int j = 0; j < allRoots.length; j++) {
-						if (allRoots[j].equals(root)) {
-							// ensure source attachment paths match
-							if (isSourceAttachmentEqual(root, entry)) {
-								// use package fragment root
-								return new PackageFragmentRootSourceLocation(root);
-							}
-						}
-					}
-
-				}
-				// check all other java projects to see if another project references
-				// the archive
-				IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-				IJavaProject[] jps = model.getJavaProjects();
-				for (int i = 0; i < jps.length; i++) {
-					IPackageFragmentRoot[] allRoots = jps[i].getPackageFragmentRoots();
-					for (int j = 0; j < allRoots.length; j++) {
-						IPackageFragmentRoot root = allRoots[j];
-						if (!root.isExternal() && root.getPath().equals(entry.getPath())) {
-							if (isSourceAttachmentEqual(root, entry)) {
-								// use package fragment root
-								return new PackageFragmentRootSourceLocation(root);
-							}							
-						}
-					}
-				}
-			} catch (JavaModelException e) {
-				LaunchingPlugin.log(e);
-			}		
-		}		
-		return null;
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/LocalFileStorage.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/LocalFileStorage.java
deleted file mode 100644
index 0a30e22..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/LocalFileStorage.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-import java.io.File;
-
-/**
- * Implementation of storage for a local file
- * (<code>java.io.File</code>).
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see DirectorySourceLocation
- * @see org.eclipse.core.resources.IStorage
- * @since 2.0
- * @deprecated In 3.0 this class is now provided by the debug platform. Clients
- *  should use the replacement class
- *  <code>org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage</code>
- */
-public class LocalFileStorage extends org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage {
-	
-	/**
-	 * Constructs and returns storage for the given file.
-	 * 
-	 * @param file a local file
-	 */
-	public LocalFileStorage(File file){
-		super(file);
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java
deleted file mode 100644
index 61f7a6f..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/PackageFragmentRootSourceLocation.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.JavaLaunchConfigurationUtils;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Locates source elements in a package fragment root. Returns
- * instances of <code>ICompilationUnit</code> and
- * </code>IClassFile</code>.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see IJavaSourceLocation
- * @since 2.1
- * @deprecated In 3.0, the debug platform provides source lookup facilities that
- *  should be used in place of the Java source lookup support provided in 2.0.
- *  The new facilities provide a source lookup director that coordinates source
- *  lookup among a set of participants, searching a set of source containers.
- *  See the following packages: <code>org.eclipse.debug.core.sourcelookup</code>
- *  and <code>org.eclipse.debug.core.sourcelookup.containers</code>. This class
- *  has been replaced by
- *  <code>org.eclipse.jdt.launching.sourcelookup.containers.PackageFragmentRootSourceContainer</code>.
- */
-public class PackageFragmentRootSourceLocation extends PlatformObject implements IJavaSourceLocation {
-	
-	/**
-	 * Associatd package framgment root 
-	 */
-	private IPackageFragmentRoot fRoot = null;
-	
-	/**
-	 * Creates an empty source location.
-	 */
-	public PackageFragmentRootSourceLocation() {
-	}	
-	
-	/**
-	 * Creates a source location on the given package fragment root.
-	 * 
-	 * @param root package fragment root
-	 */
-	public PackageFragmentRootSourceLocation(IPackageFragmentRoot root) {
-		setPackageFragmentRoot(root);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#findSourceElement(java.lang.String)
-	 */
-	public Object findSourceElement(String name) throws CoreException {
-		if (name != null && getPackageFragmentRoot() != null) {
-			IPackageFragment pkg = null;
-			int index = name.lastIndexOf('.');
-			if (index >= 0) {
-				String fragment = name.substring(0, index);
-				pkg = getPackageFragmentRoot().getPackageFragment(fragment);
-				name = name.substring(index + 1);
-			} else {
-				pkg = getPackageFragmentRoot().getPackageFragment(""); //$NON-NLS-1$
-			}
-			if (pkg.exists()) {
-				boolean possibleInnerType = false;
-				String typeName = name;
-				do {
-					ICompilationUnit cu = pkg.getCompilationUnit(typeName + ".java"); //$NON-NLS-1$
-					if (cu.exists()) {
-						return cu;
-					} 
-					IClassFile cf = pkg.getClassFile(typeName + ".class"); //$NON-NLS-1$
-					if (cf.exists()) {
-						return cf;
-					}				
-					index = typeName.lastIndexOf('$');
-					if (index >= 0) {
-						typeName = typeName.substring(0, index);
-						possibleInnerType = true;
-					} else {
-						possibleInnerType = false;
-					}						
-				} while (possibleInnerType);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		try {
-			Document doc = LaunchingPlugin.getDocument();
-			Element node = doc.createElement("javaPackageFragmentRootSourceLocation"); //$NON-NLS-1$
-			doc.appendChild(node);
-			String handle = ""; //$NON-NLS-1$
-			if (getPackageFragmentRoot() != null) {
-				handle = getPackageFragmentRoot().getHandleIdentifier();
-			}
-			node.setAttribute("handleId", handle); //$NON-NLS-1$
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			abort(MessageFormat.format(LaunchingMessages.PackageFragmentRootSourceLocation_Unable_to_create_memento_for_package_fragment_root_source_location__0__5, new String[] {getPackageFragmentRoot().getElementName()}), e); 
-		} catch (ParserConfigurationException e) {
-			abort(MessageFormat.format(LaunchingMessages.PackageFragmentRootSourceLocation_Unable_to_create_memento_for_package_fragment_root_source_location__0__5, new String[] {getPackageFragmentRoot().getElementName()}), e); 
-		} catch (TransformerException e) {
-			abort(MessageFormat.format(LaunchingMessages.PackageFragmentRootSourceLocation_Unable_to_create_memento_for_package_fragment_root_source_location__0__5, new String[] {getPackageFragmentRoot().getElementName()}), e); 
-		}
-		// execution will not reach here
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation#initializeFrom(java.lang.String)
-	 */
-	public void initializeFrom(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser =
-				DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			String handle = root.getAttribute("handleId"); //$NON-NLS-1$
-			if (handle == null) {
-				abort(LaunchingMessages.PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___missing_handle_identifier_for_package_fragment_root__6, null); 
-			} else {
-				if (handle.length() == 0) {
-					// empty package fragment
-					setPackageFragmentRoot(null);
-				} else {
-					IJavaElement element = JavaCore.create(handle);
-					if (element instanceof IPackageFragmentRoot) {
-						setPackageFragmentRoot((IPackageFragmentRoot)element);
-					} else {
-						abort(LaunchingMessages.PackageFragmentRootSourceLocation_Unable_to_initialize_source_location___package_fragment_root_does_not_exist__7, null); 
-					}
-				}
-			}
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;			
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(LaunchingMessages.PackageFragmentRootSourceLocation_Exception_occurred_initializing_source_location__8, ex); 
-	}
-
-	/**
-	 * Returns the package fragment root associated with this
-	 * source location, or <code>null</code> if none
-	 * 
-	 * @return the package fragment root associated with this
-	 *  source location, or <code>null</code> if none
-	 */
-	public IPackageFragmentRoot getPackageFragmentRoot() {
-		return fRoot;
-	}
-
-	/**
-	 * Sets the package fragment root associated with this
-	 * source location.
-	 * 
-	 * @param root package fragment root
-	 */
-	private void setPackageFragmentRoot(IPackageFragmentRoot root) {
-		fRoot = root;
-	}
-	
-	/*
-	 * Throws an internal error exception
-	 */
-	private void abort(String message, Throwable e)	throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, message, e);
-		throw new CoreException(s);		
-	}	
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {		
-		if (object instanceof PackageFragmentRootSourceLocation) {
-			 PackageFragmentRootSourceLocation root = (PackageFragmentRootSourceLocation)object;
-			 if (getPackageFragmentRoot() == null) {
-			 	return root.getPackageFragmentRoot() == null;
-			 } 
-			 return getPackageFragmentRoot().equals(root.getPackageFragmentRoot());
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		if (getPackageFragmentRoot() == null) {
-			return getClass().hashCode();
-		} 
-		return getPackageFragmentRoot().hashCode();
-	}	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ZipEntryStorage.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ZipEntryStorage.java
deleted file mode 100644
index fafaa20..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ZipEntryStorage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup;
-
-
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
- 
-/**
- * Storage implementation for zip entries.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @see ArchiveSourceLocation
- * @see org.eclipse.core.resources.IStorage
- * @since 2.0
- * @deprecated In 3.0 this class is provided by the debug platform and clients
- *  should use the replacement class
- *  <code>org.eclipse.debug.core.sourcelookup.containers.ZipEntryStorage</code>.
- */
-public class ZipEntryStorage extends org.eclipse.debug.core.sourcelookup.containers.ZipEntryStorage {
-		
-	/**
-	 * Constructs a new storage implementation for the
-	 * given zip entry in the specified zip file
-	 * 
-	 * @param archive zip file
-	 * @param entry zip entry
-	 */
-	public ZipEntryStorage(ZipFile archive, ZipEntry entry) {
-		super(archive, entry);
-	}
-
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java
deleted file mode 100644
index 28971d9..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathContainerSourceContainer.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup.containers;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * A source container for a classpath container.
- * <p>
- * This class may be instantiated; this class is not intended to be
- * subclassed. 
- * </p>
- * 
- * @since 3.0
- */
-public class ClasspathContainerSourceContainer extends CompositeSourceContainer {
-	
-	/**
-	 * Associated classpath container path.
-	 */
-	private IPath fContainerPath;
-	/**
-	 * Unique identifier for Java project source container type
-	 * (value <code>org.eclipse.jdt.launching.sourceContainer.classpathContainer</code>).
-	 */
-	public static final String TYPE_ID = LaunchingPlugin.getUniqueIdentifier() + ".sourceContainer.classpathContainer";   //$NON-NLS-1$
-		
-	/**
-	 * Constructs a new source container for the given classpath container.
-	 * 
-	 * @param containerPath classpath container path
-	 */
-	public ClasspathContainerSourceContainer(IPath containerPath) {
-		fContainerPath = containerPath;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
-	 */
-	public String getName() {
-		IClasspathContainer container = null;
-		try {
-			container = getClasspathContainer();
-		} catch (CoreException e) {
-		}
-		if (container == null) {
-			return getPath().lastSegment();
-		} 
-		return container.getDescription();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
-	 */
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
-	 */
-	protected ISourceContainer[] createSourceContainers() throws CoreException {
-		IRuntimeClasspathEntry entry = JavaRuntime.newRuntimeContainerClasspathEntry(getPath(), IRuntimeClasspathEntry.USER_CLASSES);
-		IRuntimeClasspathEntry[] entries = JavaRuntime.resolveSourceLookupPath(new IRuntimeClasspathEntry[]{entry}, getDirector().getLaunchConfiguration());
-		return JavaRuntime.getSourceContainers(entries);
-	}
-	
-	/**
-	 * Returns the classpath container's path
-	 * 
-	 * @return classpath container's path
-	 */
-	public IPath getPath() {
-		return fContainerPath;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof ClasspathContainerSourceContainer) {
-			return getPath().equals(((ClasspathContainerSourceContainer)obj).getPath());
-		}
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getPath().hashCode();
-	}
-	
-	/**
-	 * Returns the associated container or <code>null</code> if unavailable.
-	 * 
-	 * @return classpath container or <code>null</code>
-	 * @throws CoreException if unable to retrieve container
-	 */
-	public IClasspathContainer getClasspathContainer() throws CoreException {
-		ISourceLookupDirector director = getDirector();
-		if (director != null) {
-			ILaunchConfiguration configuration = director.getLaunchConfiguration();
-			if (configuration != null) {
-				IJavaProject project = JavaRuntime.getJavaProject(configuration);
-				if (project != null) {
-					return JavaCore.getClasspathContainer(getPath(), project);
-				}
-			}
-		}
-		return null;
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java
deleted file mode 100644
index c522e29..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/ClasspathVariableSourceContainer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup.containers;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * A classpath variable source container contains a source container
- * that is the resolved value of the associated variable.
- * <p>
- * This class may be instantiated; this class is not intended to be
- * subclassed. 
- * </p>
- * @since 3.0
- */
-public class ClasspathVariableSourceContainer extends CompositeSourceContainer {
-	
-	private IPath fVariable;
-	/**
-	 * Unique identifier for Java project source container type
-	 * (value <code>org.eclipse.jdt.launching.sourceContainer.classpathVariable</code>).
-	 */
-	public static final String TYPE_ID = LaunchingPlugin.getUniqueIdentifier() + ".sourceContainer.classpathVariable";   //$NON-NLS-1$
-	
-	/**
-	 * Constructs a new source container on the given variable and suffix.
-	 * 
-	 * @param variablePath path representing a Java classpath variable.
-	 *  The first segment is the variable name, and the following segments
-	 *  (if any) are appended to the variable.
-	 */
-	public ClasspathVariableSourceContainer(IPath variablePath) {
-		fVariable = variablePath;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
-	 */
-	protected ISourceContainer[] createSourceContainers() throws CoreException {
-		IPath path = JavaCore.getClasspathVariable(fVariable.segment(0));
-		if (path == null) {
-			return new ISourceContainer[0];
-		}
-		if (fVariable.segmentCount() > 1) {
-			path = path.append(fVariable.removeFirstSegments(1));			
-		}
-		IRuntimeClasspathEntry entry = JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-		return JavaRuntime.getSourceContainers(new IRuntimeClasspathEntry[]{entry});
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
-	 */
-	public String getName() {
-		return fVariable.toOSString();
-	}
-	
-	/**
-	 * Returns the variable this container references as a path. The
-	 * first segment is the variable name, and the following segments
-	 * are appended to the variable's value.
-	 * 
-	 * @return path representing the variable and suffix
-	 */
-	public IPath getPath() {
-		return fVariable;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
-	 */
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java
deleted file mode 100644
index bb7ccce..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaProjectSourceContainer.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup.containers;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-
-/**
- * Java project source container. Searches for source in a project's
- * source folders.
- * <p>
- * This class may be instantiated; this class is not intended to be
- * subclassed. 
- * </p>
- * 
- * @since 3.0
- */
-public class JavaProjectSourceContainer extends CompositeSourceContainer {
-		
-	// Java project
-	private IJavaProject fProject;
-	// Source folders
-	private ISourceContainer[] fSourceFolders;
-	// Generic project container
-	private ISourceContainer[] fOthers;
-	
-	/**
-	 * Unique identifier for Java project source container type
-	 * (value <code>org.eclipse.jdt.launching.sourceContainer.javaProject</code>).
-	 */
-	public static final String TYPE_ID = LaunchingPlugin.getUniqueIdentifier() + ".sourceContainer.javaProject";   //$NON-NLS-1$
-	
-	/**
-	 * Constructs a source container on the given Java project.
-	 * 
-	 * @param project project to look for source in
-	 */
-	public JavaProjectSourceContainer(IJavaProject project) {
-		fProject = project;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
-	 */
-	public String getName() {
-		return fProject.getElementName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
-	 */
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-	
-	/**
-	 * Returns the Java project associated with this source container.
-	 * 
-	 * @return Java project
-	 */
-	public IJavaProject getJavaProject() {
-		return fProject;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
-	 */
-	protected ISourceContainer[] createSourceContainers() throws CoreException {
-		List containers = new ArrayList();
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		if (fProject.getProject().isOpen()) {
-			IClasspathEntry[] entries = fProject.getRawClasspath();
-			for (int i = 0; i < entries.length; i++) {
-				IClasspathEntry entry = entries[i];
-				switch (entry.getEntryKind()) {
-					case IClasspathEntry.CPE_SOURCE:
-						IPath path = entry.getPath();
-						IResource resource = root.findMember(path);
-						if (resource instanceof IContainer) {
-							containers.add(new FolderSourceContainer((IContainer)resource, false));
-						}
-						break;
-				}
-			}
-		}
-		// cache the Java source folders to search for ".java" files in
-		fSourceFolders = (ISourceContainer[]) containers.toArray(new ISourceContainer[containers.size()]);
-		ISourceContainer theProject = new ProjectSourceContainer(fProject.getProject(), false);
-		fOthers = new ISourceContainer[] {theProject};
-		containers.add(theProject);
-		return (ISourceContainer[]) containers.toArray(new ISourceContainer[containers.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof JavaProjectSourceContainer) {
-			return getJavaProject().equals(((JavaProjectSourceContainer)obj).getJavaProject());
-		}
-		return super.equals(obj);
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getJavaProject().hashCode();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
-	 */
-	public Object[] findSourceElements(String name) throws CoreException {
-		// force container initialzation
-		getSourceContainers();
-		
-		if (name.endsWith(".java")) { //$NON-NLS-1$
-			// only look in source folders
-			Object[] objects = findSourceElements(name, fSourceFolders);
-			List filtered = null;
-			for (int i = 0; i < objects.length; i++) {
-				Object object = objects[i];
-				if (object instanceof IResource) {
-					if (!getJavaProject().isOnClasspath((IResource)object)) {
-						if (filtered == null) {
-							filtered = new ArrayList(objects.length);
-							for (int j = 0; j < objects.length; j++) {
-								filtered.add(objects[j]);
-							}
-						}
-						filtered.remove(object);
-					}
-				}
-			}
-			if (filtered == null) {
-				return objects;
-			}
-			return filtered.toArray();			
-		} 
-		// look elsewhere if non a ".java" file
-		return findSourceElements(name, fOthers);
-	}
-	public void dispose() {
-		fSourceFolders = null;
-		fOthers = null;
-		super.dispose();
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java
deleted file mode 100644
index 24de808..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourceLookupParticipant.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jdt.launching.sourcelookup.containers;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.containers.ArchiveSourceContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.debug.core.IJavaThread;
-
-import com.sun.jdi.VMDisconnectedException;
-
-/**
- * A source lookup participant that searches for Java source code.
- * <p>
- * This class may be instantiated; this class is not intended to be
- * subclassed.
- * </p>
- * @since 3.0
- */
-public class JavaSourceLookupParticipant extends AbstractSourceLookupParticipant {
-	
-	/**
-	 * Map of delegate source containers for internal jars.
-	 * Internal jars are translated to package fragment roots
-	 * if possible.
-	 */
-	private Map fDelegateContainers;
-	
-	/**
-	 * Returns the source name associated with the given object, or <code>null</code>
-	 * if none.
-	 * 
-	 * @param object a Java stack frame
-	 * @return the source name associated with the given object, or <code>null</code>
-	 * if none
-	 * @exception CoreException if unable to retrieve the source name
-	 */
-	public String getSourceName(Object object) throws CoreException {
-		if (object instanceof IAdaptable) {
-			IJavaStackFrame frame = (IJavaStackFrame) ((IAdaptable)object).getAdapter(IJavaStackFrame.class);
-			try {
-				if (frame != null) {
-					if (frame.isObsolete()) {
-						return null;
-					}
-					String sourceName = frame.getSourcePath();
-					// TODO: this may break fix to bug 21518
-					if (sourceName == null) {
-						// no debug attributes, guess at source name
-						sourceName = frame.getDeclaringTypeName();
-						int index = sourceName.lastIndexOf('.');
-						if (index < 0) {
-							index = 0;
-						}
-						sourceName = sourceName.replace('.', File.separatorChar);
-						index = sourceName.indexOf('$');
-						if (index >= 0) {
-							sourceName = sourceName.substring(0, index);
-						}
-						if (sourceName.length() == 0) {
-							// likely a proxy class (see bug 40815)
-							sourceName = null;
-						} else {
-							sourceName = sourceName + ".java"; //$NON-NLS-1$
-						}
-					}
-					return sourceName;	
-				}
-			} catch (DebugException e) {
-				int code = e.getStatus().getCode();
-                if (code == IJavaThread.ERR_THREAD_NOT_SUSPENDED || code == IJavaStackFrame.ERR_INVALID_STACK_FRAME ||
-						e.getStatus().getException() instanceof VMDisconnectedException) {
-					return null;
-				}
-				throw e;
-			}
-		}
-		if (object instanceof String) {
-			// assume it's a file name
-			return (String)object;
-		}
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupParticipant#dispose()
-	 */
-	public void dispose() {
-		Iterator iterator = fDelegateContainers.values().iterator();
-		while (iterator.hasNext()) {
-			ISourceContainer container = (ISourceContainer) iterator.next();
-			container.dispose();
-		}
-		fDelegateContainers = null;
-		super.dispose();
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.AbstractSourceLookupParticipant#getDelegateContainer(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
-	protected ISourceContainer getDelegateContainer(ISourceContainer container) {
-		ISourceContainer delegate = (ISourceContainer) fDelegateContainers.get(container);
-		if (delegate == null) {
-			return container;
-		} 
-		return delegate; 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupParticipant#init(org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector)
-	 */
-	public void init(ISourceLookupDirector director) {
-		super.init(director);
-		fDelegateContainers = new HashMap();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupParticipant#sourceContainersChanged(org.eclipse.debug.internal.core.sourcelookup.ISourceLookupDirector)
-	 */
-	public void sourceContainersChanged(ISourceLookupDirector director) {
-		// use package fragment roots in place of local archives, where they exist
-		fDelegateContainers.clear();
-		ISourceContainer[] containers = director.getSourceContainers();
-		for (int i = 0; i < containers.length; i++) {
-			ISourceContainer container = containers[i];
-			if (container.getType().getId().equals(ArchiveSourceContainer.TYPE_ID)) {
-				IFile file = ((ArchiveSourceContainer)container).getFile();
-				IProject project = file.getProject();
-				IJavaProject javaProject = JavaCore.create(project);
-				if (javaProject.exists()) {
-					try {
-						IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
-						for (int j = 0; j < roots.length; j++) {
-							IPackageFragmentRoot root = roots[j];
-							if (file.equals(root.getUnderlyingResource())) {
-								// the root was specified
-								fDelegateContainers.put(container, new PackageFragmentRootSourceContainer(root));
-							} else {
-								IPath path = root.getSourceAttachmentPath();
-								if (path != null) {
-									if (file.getFullPath().equals(path)) {
-										// a source attachment to a root was specified
-										fDelegateContainers.put(container, new PackageFragmentRootSourceContainer(root));
-									}
-								}
-							}
-						}
-					} catch (JavaModelException e) {
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java
deleted file mode 100644
index 8a39109..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/JavaSourcePathComputer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup.containers;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Computes a default source lookup path for Java applications.
- * The source path provider associated with a launch configuration is consulted
- * to compute a source lookup path. The source path provider is determined
- * by the <code>ATTR_SOURCE_PATH_PROVIDER</code> launch configration attribute,
- * which defaults to the <code>StandardSourcePathProvider</code> when unspecified.
- * The source path provider computes a collection of <code>IRuntimeClasspathEntry</code>'s
- * which are translated to source containers (<code>ISourceContainer</code>).
- * <p>
- * Clients may subclass this class. 
- * </p>
- * @since 3.0
- * 
- */
-public class JavaSourcePathComputer implements ISourcePathComputerDelegate {
-	
-	/**
-	 * Unique identifier for the local Java source path computer
-	 * (value <code>org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer</code>).
-	 */
-	public static final String ID = "org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"; //$NON-NLS-1$
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputer#getId()
-	 * 
-     * No longer used.
-	 */
-	public String getId() {
-		return ID;
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-		IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);
-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);
-		return JavaRuntime.getSourceContainers(resolved);
-	}
-	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java
deleted file mode 100644
index b34bbf4..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/PackageFragmentRootSourceContainer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.launching.sourcelookup.containers;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-
-/**
- * Package fragment root source container. Represents an archive
- * or folder in the Java model containing classfiles, with a possible
- * source attachment.
- * <p>
- * This class may be instantiated; this class is not intended to be
- * subclassed. 
- * </p>
- * 
- * @since 3.0
- */
-public class PackageFragmentRootSourceContainer extends AbstractSourceContainer {
-	
-	private IPackageFragmentRoot fRoot;
-	/**
-	 * Unique identifier for Java project source container type
-	 * (value <code>org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot</code>).
-	 */
-	public static final String TYPE_ID = LaunchingPlugin.getUniqueIdentifier() + ".sourceContainer.packageFragmentRoot";   //$NON-NLS-1$
-	
-	/**
-	 * Constructs a new package fragment root source container on the
-	 * given root. The root must be of kind <code>K_BINARY</code>.
-	 * 
-	 * @param root package fragment root
-	 */
-	public PackageFragmentRootSourceContainer(IPackageFragmentRoot root) {
-		fRoot = root;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
-	 */
-	public Object[] findSourceElements(String name) throws CoreException {
-		// look for a class file
-		int index = name.lastIndexOf('.');
-		String typeName = name;
-		if (index >= 0) {
-			// remove file type suffix
-			typeName = typeName.substring(0, index);
-		}
-		typeName = typeName.replace('/', '.');
-		typeName = typeName.replace('\\', '.');
-		index = typeName.lastIndexOf('.');
-		String packageName = ""; //$NON-NLS-1$
-		if (index >= 0) {
-			packageName = typeName.substring(0, index);
-			typeName = typeName.substring(index + 1);
-		}
-		IPackageFragment fragment = fRoot.getPackageFragment(packageName);
-		if (fragment.exists()) {
-			switch (fragment.getKind()) {
-				case IPackageFragmentRoot.K_BINARY:
-					IClassFile file = fragment.getClassFile(typeName + ".class"); //$NON-NLS-1$
-					if (file.exists()) {
-						return new Object[]{file};
-					}
-					break;
-				case IPackageFragmentRoot.K_SOURCE:
-					ICompilationUnit unit = fragment.getCompilationUnit(typeName + ".java"); //$NON-NLS-1$
-					if (unit.exists()) {
-						return new Object[]{unit};
-					}
-					break;
-			}
-
-		}
-		return EMPTY;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
-	 */
-	public String getName() {
-		return fRoot.getElementName();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
-	 */
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		return obj instanceof PackageFragmentRootSourceContainer &&
-		 ((PackageFragmentRootSourceContainer)obj).getPackageFragmentRoot().equals(getPackageFragmentRoot());
-	}
-	
-	/**
-	 * Returns the package fragment root this container searches for source.
-	 * 
-	 * @return the package fragment root this container searches for source
-	 */
-	public IPackageFragmentRoot getPackageFragmentRoot() {
-		return fRoot;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return fRoot.hashCode();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getPath()
-	 */
-	public IPath getPath() {
-		return getPackageFragmentRoot().getPath();
-	}
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/package.html b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/package.html
deleted file mode 100644
index 760a821..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/containers/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides source lookup support for the Java debugger. 
-<h2>
-Package Specification</h2>
-Provides source lookup support for the Java debugger, based on the source lookup 
-director architecture defined in <code>org.eclipse.debug.core.sourcelookup</code>. 
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/package.html b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/package.html
deleted file mode 100644
index 678de11..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/package.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Application programming interfaces and classes for source lookup. 
-<h2>
-Package Specification</h2>
-<p>Provides support for source lookup. </p>
-<p>These classes and interfaces have been <b>deprecated</b> in Eclipse 3.0. Source 
-  lookup facilities are now provided by the debug platform - see <code>org.eclipse.debug.core.sourcelookup</code>. 
-  Source lookup support specific to the Java debugger is now provided in <code>org.eclipse.jdt.launching.sourcelookup.containers</code>.</p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/lib/.cvsignore b/org.eclipse.jdt.launching/lib/.cvsignore
deleted file mode 100644
index f04979f..0000000
--- a/org.eclipse.jdt.launching/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-launchingsupport.jar
diff --git a/org.eclipse.jdt.launching/plugin.properties b/org.eclipse.jdt.launching/plugin.properties
deleted file mode 100644
index dfc7054..0000000
--- a/org.eclipse.jdt.launching/plugin.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-localJavaApplication = Java Application
-pluginName = Java Development Tools Launching Support
-remoteJavaApplication = Remote Java Application
-vmConnectors = VM Connectors
-vmInstallTypes = VM Install Types
-runtimeClasspathEntryResolvers = Runtime Classpath Entry Resolvers
-runtimeClasspathEntries = Runtime Classpath Entries
-classpathProviders = Runtime Classpath Providers
-javaSourceLocatorName = Basic Java Source Locator
-
-providerName=Eclipse.org
-appletLabel= Java Applet
-
-javaSourceLookupDirector.name= Java Source Locator
-
-javaProjectSourceContainerType.name= Java Project
-javaProjectSourceContainerType.description = Source folders in a Java Project
-packageFragmentRootSourceContainerType.name= Package Fragment Root
-packageFragmentRootSourceContainerType.description= Java source folder or source attached to an archive 
-classpathVariableSourceContainerType.name= Java Classpath Variable
-classpathVariableSourceContainerType.description= Workspace folder, local directory, or archive referenced by a variable path
-classpathContainerSourceContainerType.name= Java Library
-classpathContainerSourceContainerType.description= A collection of binary archives with attached source
diff --git a/org.eclipse.jdt.launching/plugin.xml b/org.eclipse.jdt.launching/plugin.xml
deleted file mode 100644
index c689388..0000000
--- a/org.eclipse.jdt.launching/plugin.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-<!-- Extension point definitions -->
-   <extension-point id="classpathProviders" name="%classpathProviders" schema="schema/classpathProviders.exsd"/>
-   <extension-point id="runtimeClasspathEntryResolvers" name="%runtimeClasspathEntryResolvers" schema="schema/runtimeClasspathEntryResolvers.exsd"/>
-   <extension-point id="runtimeClasspathEntries" name="%runtimeClasspathEntries" schema="schema/runtimeClasspathEntries.exsd"/>
-   <extension-point id="vmConnectors" name="%vmConnectors" schema="schema/vmConnectors.exsd"/>
-   <extension-point id="vmInstallTypes" name="%vmInstallTypes" schema="schema/vmInstallTypes.exsd"/>
-
-<!-- Extensions -->
-   <extension
-         point="org.eclipse.jdt.launching.vmInstallTypes">
-      <vmInstallType
-            class="org.eclipse.jdt.internal.launching.StandardVMType"
-            id="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType">
-      </vmInstallType>
-      <vmInstallType
-            class="org.eclipse.jdt.internal.launching.Standard11xVMType"
-            id="org.eclipse.jdt.launching.Standard11xVMType">
-      </vmInstallType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%localJavaApplication"
-            delegate="org.eclipse.jdt.launching.JavaLaunchDelegate"
-            modes="run, debug"
-            id="org.eclipse.jdt.launching.localJavaApplication"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-      </launchConfigurationType>
-      <launchConfigurationType
-            name="%remoteJavaApplication"
-            delegate="org.eclipse.jdt.internal.launching.JavaRemoteApplicationLaunchConfigurationDelegate"
-            modes="debug"
-            id="org.eclipse.jdt.launching.remoteJavaApplication"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">            
-      </launchConfigurationType>
-      <launchConfigurationType
-            name="%appletLabel"
-            delegate="org.eclipse.jdt.internal.launching.JavaAppletLaunchConfigurationDelegate"
-            modes="run, debug"
-            id="org.eclipse.jdt.launching.javaApplet"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">            
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.core.sourceLocators">
-      <sourceLocator
-            name="%javaSourceLocatorName"
-            class="org.eclipse.jdt.launching.sourcelookup.JavaSourceLocator"
-            id="org.eclipse.jdt.launching.javaSourceLocator">
-      </sourceLocator>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.launching.vmConnectors">
-      <vmConnector
-            class="org.eclipse.jdt.internal.launching.SocketAttachConnector"
-            id="org.eclipse.jdt.launching.socketAttachConnector">
-      </vmConnector>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.core.classpathVariableInitializer">
-      <classpathVariableInitializer
-            variable="JRE_LIB"
-            class="org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer">
-      </classpathVariableInitializer>
-      <classpathVariableInitializer
-            variable="JRE_SRC"
-            class="org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer">
-      </classpathVariableInitializer>
-      <classpathVariableInitializer
-            variable="JRE_SRCROOT"
-            class="org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer">
-      </classpathVariableInitializer>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.core.classpathContainerInitializer">
-      <classpathContainerInitializer
-            class="org.eclipse.jdt.internal.launching.JREContainerInitializer"
-            id="org.eclipse.jdt.launching.JRE_CONTAINER">
-      </classpathContainerInitializer>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.launching.runtimeClasspathEntryResolvers">
-      <runtimeClasspathEntryResolver
-            container="org.eclipse.jdt.launching.JRE_CONTAINER"
-            variable="JRE_LIB"
-            class="org.eclipse.jdt.internal.launching.JRERuntimeClasspathEntryResolver"
-            id="org.eclipse.jdt.launching.JRE_RESOLVER">
-      </runtimeClasspathEntryResolver>      
-      <runtimeClasspathEntryResolver
-      		runtimeClasspathEntryId="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry"
-            class="org.eclipse.jdt.internal.launching.VariableClasspathResolver"
-            id="org.eclipse.jdt.launching.variableClasspathResolver">
-      </runtimeClasspathEntryResolver>
-   </extension>
-   <extension
-         point="org.eclipse.jdt.launching.runtimeClasspathEntries">
-      <runtimeClasspathEntry
-            id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"
-            class="org.eclipse.jdt.internal.launching.DefaultProjectClasspathEntry">
-      </runtimeClasspathEntry>
-      <runtimeClasspathEntry
-            id="org.eclipse.jdt.launching.classpathentry.variableClasspathEntry"
-            class="org.eclipse.jdt.internal.launching.VariableClasspathEntry">
-      </runtimeClasspathEntry>
-   </extension>   
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationComparators">
-      <launchConfigurationComparator
-            attribute="org.eclipse.jdt.launching.CLASSPATH"
-            class="org.eclipse.jdt.internal.launching.RuntimeClasspathEntryListComparator"
-            id="org.eclipse.jdt.launching.classpathComparator">
-      </launchConfigurationComparator>
-      <launchConfigurationComparator
-            attribute="org.eclipse.jdt.launching.SOURCE_PATH"
-            class="org.eclipse.jdt.internal.launching.RuntimeClasspathEntryListComparator"
-            id="org.eclipse.jdt.launching.sourcepathComparator">
-      </launchConfigurationComparator>
-   </extension>
-   
-   <!-- Source Lookup -->
-   <extension point="org.eclipse.debug.core.sourceContainerTypes">
-   		<sourceContainerType
-   			id="org.eclipse.jdt.launching.sourceContainer.javaProject"
-   			name="%javaProjectSourceContainerType.name"
-   			description="%javaProjectSourceContainerType.description"
-   			class="org.eclipse.jdt.internal.launching.JavaProjectSourceContainerTypeDelegate">
-   		</sourceContainerType> 
-   		<sourceContainerType
-   			id="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"
-   			name="%packageFragmentRootSourceContainerType.name"
-   			description="%packageFragmentRootSourceContainerType.description"
-   			class="org.eclipse.jdt.internal.launching.PackageFragmentRootSourceContainerTypeDelegate">
-   		</sourceContainerType>    		
-   		<sourceContainerType
-   			id="org.eclipse.jdt.launching.sourceContainer.classpathVariable"
-   			name="%classpathVariableSourceContainerType.name"
-   			description="%classpathVariableSourceContainerType.description"
-   			class="org.eclipse.jdt.internal.launching.ClasspathVariableSourceContainerTypeDelegate">
-   		</sourceContainerType>   		
-   		<sourceContainerType
-   			id="org.eclipse.jdt.launching.sourceContainer.classpathContainer"
-   			name="%classpathContainerSourceContainerType.name"
-   			description="%classpathContainerSourceContainerType.description"
-   			class="org.eclipse.jdt.internal.launching.ClasspathContainerSourceContainerTypeDelegate">
-   		</sourceContainerType>    		
-   </extension>
-   <extension point="org.eclipse.debug.core.sourcePathComputers">
-   		<sourcePathComputer
-   			id="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"
-   			class="org.eclipse.jdt.launching.sourcelookup.containers.JavaSourcePathComputer">
-   		</sourcePathComputer>
-   </extension>
-   <extension point="org.eclipse.debug.core.sourceLocators">
-   		<sourceLocator
-   			id="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-   			class="org.eclipse.jdt.internal.launching.JavaSourceLookupDirector"
-   			name="%javaSourceLookupDirector.name">
-   		</sourceLocator>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <modifier class="org.eclipse.jdt.internal.launching.JREPreferenceModifyListener"/>
-   </extension>
-</plugin>
diff --git a/org.eclipse.jdt.launching/r3_0_changes.html b/org.eclipse.jdt.launching/r3_0_changes.html
deleted file mode 100644
index 8ba085d..0000000
--- a/org.eclipse.jdt.launching/r3_0_changes.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
-<title>3.0 JDT Launching Change Notes</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>3.0 JDT Launching Change Notes</h1>
-<p>This document describes important changes in the 3.0 JDT launching support, relative 
-  to the 2.1 release.</p>
-<h2>API Changes</h2>
-<h3>VMRunnerConfiguration contains environment</h3>
-<p>Two methods have been added to the <code>VMRunnerConfiguration</code> type
-  to support the setting and retrieving of environment variables.
-<p>Implementors of <code>IVMRunner</code> should call <code>VMRunnerConfiguration.getEnvironment()</code> 
-  and pass that environment into the executed VM. Clients who use <code>DebugPlugin#exec(String[] 
-  cmdLine, File workingDirectory)</code> can do this by calling <code>DebugPlugin#exec(String[] 
-  cmdLine, File workingDirectory, String[] envp)</code> instead. Simply passing 
-  in the result from <code>getEnvironment()</code> is sufficient.</p>
-<h3>VMRunnerConfiguration and Bootstrap Classes</h3>
-<p>In prior releases, the <code>VMRunnerConfiguration</code> had one attribute 
-  to describe a boot path. The attribute is a collection of <code>Strings</code> 
-  to be specified in the -<code>Xbootclasspath</code> argument. Three new attributes 
-  have been added to the VM specific attributes map to support VMs that allow 
-  for prepending and appending to the boot path. The newly added attributes are 
-  defined in <code>IJavaLanuchConfigurationConstants</code>:</p>
-<ul>
-  <li><code>ATTR_BOOTPAH_PREPEND</code> - an array of strings describing paths 
-    in the local file system to be prepended to the boot path (the <code>-Xbootclasspath/p</code> 
-    argument)</li>
-  <li><code>ATTR_BOOTPATH</code> - an array of strings describing paths in the 
-    local file system to be placed on the boot path (the <code>-Xbootclasspath</code> 
-    argument)</li>
-  <li><code>ATTR_BOOTPATH_APPEND</code> - an array of strings describing paths 
-    in the local file system to be appended to the boot path (the <code>-Xbootclasspath/a</code> 
-    argument)</li>
-</ul>
-<p>The old attribute,<code> getBootClassPath()</code> still exists, and contains 
-  a complete path equivalent to that of the three new attributes. However, <code>VMRunners</code> 
-  that support the new boot path options should take advantage of the new attributes, 
-  found in the VM specific attributes map (i.e. <code>VMRunnerConfiguration.getVMSpecificAttributesMap()</code>). 
-  The attributes are computed dynamically at launch time based on the classpath 
-  attribute associated with a launch configiuration. The boothpath attributes 
-  themselves are not stored in launch configurations.</p>
-<h3>Default VM Arguments</h3>
-<p>To allow a specific set of VM arguments to be used every time a specific VM 
-  is launched (without having to specify the arguments on all associated launch 
-  configurations), a new &quot;VM arguments&quot; attribute has been added to 
-  <code>IVMInstall</code>, along with getter and setter methods. Although clients 
-  may implement this interface, the additional API is intended to be non-breaking, 
-  since clients who implement the interface should be subclassing <code>AbstractVMInstall</code>, 
-  where the new feature is implemented. Existing VM runners need to honor the 
-  new attributes when launching a VM. A convenience method (<code>combineVmArgs</code>) 
-  has been added to <code>AbstractVMRunner</code> to combine VM arguments specified 
-  on a runner configuration and a VM install.</p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/schema/classpathProviders.exsd b/org.eclipse.jdt.launching/schema/classpathProviders.exsd
deleted file mode 100644
index b603d8e..0000000
--- a/org.eclipse.jdt.launching/schema/classpathProviders.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jdt.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jdt.launching" id="classpathProviders" name="Java Runtime Classpath Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to dynamically compute and resolve classpaths and source lookup paths for Java launch configurations. A Java launch configuration is can be associated with a custom classpath provider via the launch configuration attriubte ATTR_CLASSPATH_PROVIDER and a custom source path provider via the attribute ATTR_SOURCE_PATH_PROVIDER. When specified, the launch configuration attributes correspond to the id of a classpath provider extension.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="classpathProvider" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="classpathProvider">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier that can be used to reference this classpath provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this classpath provider. The class must implement &lt;code&gt;IRuntimeClasspathProvider&lt;/code&gt;
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.launching.AbstractVMInstallType"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.1
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a classpath provider: 
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jdt.launching.classpathProviders&quot;&gt;
-  &lt;classpathProvider
-   class=&quot;com.example.ProviderImplementation&quot;
-   id=&quot;com.example.ProviderId&quot;&gt;
-  &lt;/classpathProvider&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         A default implementation is provided for all launch configurations that do not specify a custom classpath provider.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.jdt.launching/schema/runtimeClasspathEntries.exsd b/org.eclipse.jdt.launching/schema/runtimeClasspathEntries.exsd
deleted file mode 100644
index d0baebf..0000000
--- a/org.eclipse.jdt.launching/schema/runtimeClasspathEntries.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.jdt.launching">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.jdt.launching" id="runtimeClasspathEntries" name="Java Runtime Classpath Entries"/>

-      </appInfo>

-      <documentation>

-         This in an internal extension point that allows the Java debugger to extend the set of runtime classpath entries used for launching Java applications. Clients are not intended to use this extension point.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="runtimeClasspathEntry" minOccurs="0" maxOccurs="unbounded"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a fully qualified identifier of the target extension point

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  an optional identifier of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  an optional name of the extension instance

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="runtimeClasspathEntry">

-      <complexType>

-         <attribute name="id" type="string" use="required">

-            <annotation>

-               <documentation>

-                  a unique identifier that can be used to reference this type of runtime classpath entry.

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  the class that implements this runtime classpath entry.  The class must implement &lt;code&gt;IRuntimeClasspathEntry2&lt;/code&gt;.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.launching.internal.IRuntimeClasspathEntry2"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         3.0

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         The following is an example of a resolver:

-

-&lt;p&gt;

-&lt;pre&gt;

- &lt;extension point=&quot;org.eclipse.jdt.launching.runtimeClasspathEntries&quot;&gt;

-  &lt;runtimeClasspathEntry

-   id=&quot;com.example.EnvVarEntry&quot;

-   class=&quot;com.example.EnvVarClasspathEntry&quot;&gt;

-  &lt;/runtimeClasspathEntry&gt;

- &lt;/extension&gt;

-&lt;/pre&gt;

-&lt;/p&gt;

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         An implementations is provided for Java projects, contributed with an identifier of &lt;code&gt;org.eclipse.jdt.launching.classpathentry.project&lt;/code&gt;. A Java project classpath entry includes all references on its buildpath.

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;

-All rights reserved. This program and the accompanying materials are made 

-available under the terms of the Eclipse Public License v1.0 which 

-accompanies this distribution, and is available at 

-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/org.eclipse.jdt.launching/schema/runtimeClasspathEntryResolvers.exsd b/org.eclipse.jdt.launching/schema/runtimeClasspathEntryResolvers.exsd
deleted file mode 100644
index 0db26d6..0000000
--- a/org.eclipse.jdt.launching/schema/runtimeClasspathEntryResolvers.exsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jdt.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jdt.launching" id="runtimeClasspathEntryResolvers" name="Java Runtime Classpath Entry Resolvers"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to dynamically resolve entries used on the runtime classpath and source
-lookup path, for corresponding classpath variables and classpath containers.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="runtimeClasspathEntryResolver" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="runtimeClasspathEntryResolver">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier that can be used to reference this resolver.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this resolver.  The class must implement &lt;code&gt;IRuntimeClasspathEntryResolver&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="variable" type="string">
-            <annotation>
-               <documentation>
-                  the name of the classpath variable this resolver is registered for. At least one of variable or container must be specified, and at most one resolver can be registered for a variable or container.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="container" type="string">
-            <annotation>
-               <documentation>
-                  the identifier of the classpath container this resolver is registered for.  At least one of variable or container must be specified, and at most one resolver can be registered for a variable or container.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtimeClasspathEntryId" type="string">
-            <annotation>
-               <documentation>
-                  the identifier of the runtime classpath entry this resolver is associated with
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a resolver:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jdt.launching.runtimeClasspathEntryResolvers&quot;&gt;
-  &lt;runtimeClasspathEntryResolver
-   class=&quot;com.example.ResolverImplementation&quot;
-   id=&quot;com.example.ResolverId&quot;
-   variable=&quot;CLASSPATH_VARIABLE&quot;&gt;
-  &lt;/runtimeClasspathEntryResolver&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         Implementations are provided for the standard JRE_LIB classpath variable and JRE_CONTAINER classpath container.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.jdt.launching/schema/vmConnectors.exsd b/org.eclipse.jdt.launching/schema/vmConnectors.exsd
deleted file mode 100644
index 623b3dd..0000000
--- a/org.eclipse.jdt.launching/schema/vmConnectors.exsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jdt.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jdt.launching" id="vmConnectors" name="Java VM Connectors"/>
-      </appInfo>
-      <documentation>
-         This extension point represents different kinds of connections to remote VMs.  Each extension must implement
-&lt;code&gt;org.eclipse.jdt.launching.IVMConnector&lt;/code&gt;.  An &lt;code&gt;IVMConnector&lt;/code&gt; is responsible for establishing a connection with a remote VM.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="vmConnector" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="vmConnector">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier that can be used to reference this IVMConnector.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this connector.  The class must implement &lt;code&gt;IVMConnector&lt;/code&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.launching.IVMConnector"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an IVMConnector:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jdt.launching.vmConnectors&quot;&gt;
-  &lt;vmConnector
-   class=&quot;com.example.ConnectorImplementation&quot;
-   id=&quot;com.example.ConnectorId&quot;&gt;
-  &lt;/vmConnector&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         An implementation of a standard socket attach connector is provided.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.jdt.launching/schema/vmInstallTypes.exsd b/org.eclipse.jdt.launching/schema/vmInstallTypes.exsd
deleted file mode 100644
index fcc62d2..0000000
--- a/org.eclipse.jdt.launching/schema/vmInstallTypes.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jdt.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jdt.launching" id="vmInstallTypes" name="Java VM Install Types"/>
-      </appInfo>
-      <documentation>
-         This extension point represents different kinds of Java runtime environments and development kits.
-Each extension must implement &lt;code&gt;org.eclipse.jdt.launching.IVMInstallType&lt;/code&gt;. 
-An &lt;code&gt;IVMInstallType&lt;/code&gt; is responsible for creating and managing a set of instances of its corresponding &lt;code&gt;IVMInstall&lt;/code&gt; class.
-Through creating different &lt;code&gt;IVMInstall&lt;/code&gt; objects, an &lt;code&gt;IVMInstallType&lt;/code&gt; allows for specific behaviour for various Java VMs.
-A UI for managing &lt;code&gt;IVMInstall&lt;/code&gt;s is provided by the Java Debug UI plug-in.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="vmInstallType" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="vmInstallType">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier that can be used to reference this IVMInstallType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this VM install type.  The class must implement IVMInstallType.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jdt.launching.AbstractVMInstallType"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an IVMInstallType for the J9 VM:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jdt.launching.vmInstallTypes&quot;&gt;
-  &lt;vmInstallType
-   class=&quot;org.eclipse.jdt.internal.launching.j9.J9VMInstallType&quot;
-   id=&quot;org.eclipse.jdt.internal.launching.j9.J9Type&quot;&gt;
-  &lt;/vmInstallType&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         Abstract implementations of IVMInstall and IVMInstallType are provided.  The Java Development Tools Launching Support plug-in defines a VM
-install type for the standard 1.1.* and 1.2/1.3/1.4 level &lt;b&gt;JRE&lt;/b&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml b/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml
deleted file mode 100644
index 0f2849c..0000000
--- a/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Launching Support JAR" default="build" basedir="..">
-
-	<target name="build" description="Cleans, builds and refreshes" depends="clean, lib/launchingsupport.jar"/>
-
-	<target name="init" depends="properties">
-		<property name="bootclasspath" value=""/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-	
-	<target name="lib/launchingsupport.jar" description= "Creates the launchingsupport.jar" depends="init">
-		<property name="destdir" value="${temp.folder}/lib/launchingsupport.jar.bin"/>
-		<delete dir="${destdir}"/>
-		<mkdir dir="${destdir}"/>
-		<!-- compile the source code -->
-		<javac target="1.2" source="1.3" destdir="${destdir}" failonerror="false" verbose="false" debug="on" includeJavaRuntime= "yes" includeAntRuntime="no"
-			 bootclasspath="${bootclasspath}" classpath="">
-			<src path="support/"/>
-		</javac>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar destfile="${build.result.folder}/lib/launchingsupport.jar" basedir="${destdir}"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" description="Deletes previous build remnants" depends="init">
-		<delete file="${build.result.folder}/lib/launchingsupport.jar"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-</project>
diff --git a/org.eclipse.jdt.launching/scripts/exportplugin.xml b/org.eclipse.jdt.launching/scripts/exportplugin.xml
deleted file mode 100644
index fbcf6f1..0000000
--- a/org.eclipse.jdt.launching/scripts/exportplugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- build script to create a plugin from org.eclipse.jdt.launching -->
-<project name="Export jdt.launching" default="export" basedir="..">
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="plugin"  value="org.eclipse.jdt.launching_3.0.0" />
-		<property name="dest"  value="${destdir}/${plugin}" />
-	</target>
-
-	<target name="build" depends="init">
-    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>
-	</target>
-
-	<target name="export" depends="build">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		
-		<!-- Create the launching jar -->
-		<jar 
-			jarfile="${dest}/launching.jar"
-			basedir="bin"
-			excludes="org/eclipse/jdt/internal/launching/support/**"
-		/>
-		
-		<!-- Copy the launching support jar -->
-		<copy file="lib/launchingsupport.jar" todir="${dest}/lib"/> 
-				
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy file="java.policy.applet" todir="${dest}"/>
-		<zip zipfile="${dest}/launchingsrc.zip">
-		    <fileset dir="launching" />
-  		</zip>
-	</target>
-</project>
diff --git a/org.eclipse.jdt.launching/support/org/eclipse/jdt/internal/launching/support/LibraryDetector.java b/org.eclipse.jdt.launching/support/org/eclipse/jdt/internal/launching/support/LibraryDetector.java
deleted file mode 100644
index 60870d6..0000000
--- a/org.eclipse.jdt.launching/support/org/eclipse/jdt/internal/launching/support/LibraryDetector.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jdt.internal.launching.support;
-
-
-/**
- * Used to discover the boot path, extension directories, and endorsed
- * directories for a Java VM.
- */
-public class LibraryDetector {
-
-	/**
-	 * Prints system properties to standard out.
-	 * <ul>
-	 * <li>java.version</li>
-	 * <li>sun.boot.class.path</li>
-	 * <li>java.ext.dirs</li>
-	 * <li>java.endorsed.dirs</li>
-	 * </ul>
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		System.out.print(System.getProperty("java.version")); //$NON-NLS-1$
-		System.out.print("|"); //$NON-NLS-1$
-		System.out.print(System.getProperty("sun.boot.class.path")); //$NON-NLS-1$
-		System.out.print("|"); //$NON-NLS-1$
-		System.out.print(System.getProperty("java.ext.dirs")); //$NON-NLS-1$
-		System.out.print("|"); //$NON-NLS-1$
-		System.out.print(System.getProperty("java.endorsed.dirs")); //$NON-NLS-1$
-	}
-}