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

Sprout from R2_0_1 2002-09-17 16:39:38 UTC Darin Wright <darin> 'build notes'
Cherrypick from R2_0_1 2002-09-27 12:47:13 UTC Darin Wright <darin> 'bug 21622 - 202 branch':
    org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
Delete:
    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/about.html
    org.eclipse.jdt.debug.tests/build.properties
    org.eclipse.jdt.debug.tests/plugin.properties
    org.eclipse.jdt.debug.tests/plugin.xml
    org.eclipse.jdt.debug.tests/scripts/exportplugin.xml
    org.eclipse.jdt.debug.tests/scripts/exportplugins.xml
    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/EmptyClasspathProvider.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/Main.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.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/TestPluginLauncher.java
    org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java
    org.eclipse.jdt.debug.tests/test.xml
    org.eclipse.jdt.debug.tests/testjars/A.jar
    org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm
    org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
    org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
    org.eclipse.jdt.debug.tests/testprograms/CompileError.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/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/InstanceVariablesTests.java
    org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.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/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/WorkingDirectoryTest.java
    org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.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/Watchpoint.java
    org.eclipse.jdt.debug.tests/testresources/TestSource.jar
    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/EvalTestSuite.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/BootpathTests.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/ConditionalBreakpointsTests.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/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/HitCountBreakpointsTests.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/LaunchConfigurationTests.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/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/ProcessTests.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/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/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/WatchpointTests.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/ArrayAssignementTests.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/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/NestedTypeFieldValue_109.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.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_241.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.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_343.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.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_444.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.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_518.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.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/TestsNestedTypes.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_108_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java
    org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.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.ui/.classpath
    org.eclipse.jdt.debug.ui/.cvsignore
    org.eclipse.jdt.debug.ui/.options
    org.eclipse.jdt.debug.ui/.project
    org.eclipse.jdt.debug.ui/about.html
    org.eclipse.jdt.debug.ui/build.properties
    org.eclipse.jdt.debug.ui/doc/hglegal.htm
    org.eclipse.jdt.debug.ui/doc/ngibmcpy.gif
    org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui.html
    org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui_vmInstallTypePage.html
    org.eclipse.jdt.debug.ui/icons/full/clcl16/clear_co.gif
    org.eclipse.jdt.debug.ui/icons/full/clcl16/exc_catch.gif
    org.eclipse.jdt.debug.ui/icons/full/clcl16/final_co.gif
    org.eclipse.jdt.debug.ui/icons/full/clcl16/runtoline_co.gif
    org.eclipse.jdt.debug.ui/icons/full/clcl16/sethitcount_co.gif
    org.eclipse.jdt.debug.ui/icons/full/clcl16/static_co.gif
    org.eclipse.jdt.debug.ui/icons/full/clcl16/stepfilter_co.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_exc.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/disp_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/insp_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/java_attach.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/run_exc.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/run_java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/run_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/ctool16/term_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/cview16/variable_tab.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/clear_co.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/runtoline_co.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.gif
    org.eclipse.jdt.debug.ui/icons/full/dlcl16/stepfilter_co.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/run_java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/clear_co.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.gif
    org.eclipse.jdt.debug.ui/icons/full/elcl16/stepfilter_co.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/debug_java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/run_java_app.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj.gif
    org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.gif
    org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.gif
    org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.gif
    org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.gif
    org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.gif
    org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.gif
    org.eclipse.jdt.debug.ui/plugin.properties
    org.eclipse.jdt.debug.ui/plugin.xml
    org.eclipse.jdt.debug.ui/scripts/exportplugin.xml
    org.eclipse.jdt.debug.ui/snippetsupport.jar
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/IJavaDebugUIConstants.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ConditionalBreakpointErrorDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DropToFrameActionFilter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ErrorDialogWithToggle.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExceptionHandler.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/Filter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterViewerSorter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIPreferencesConstants.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIStatusConstants.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJavaDebugHelpContextIds.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIAdapterFactory.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIImageDescriptor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugAppearancePreferencePage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaEvaluationEngineManager.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaModelListener.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameAdapterFactory.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWordFinder.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodActionFilter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodAdapterFactory.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/PixelConverter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SWTUtil.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractBreakpointRulerAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractManageBreakpointActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AccessWatchpointToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalFolderAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddJarAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddVariableAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifier.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointSuspendPolicyToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DropToFrameAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EntryToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionBreakpointFilterEditor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionCaughtToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionUncaughtToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExitToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferencePage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferenceStore.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageMethodBreakpointActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageWatchpointActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ModificationWatchpointToggleAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveDownAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveUpAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectFilter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnConsoleTypeAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnDeclaringTypeAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnReceivingTypeAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnVariableAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineActionDelegate.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RuntimeClasspathAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowFinalFieldsAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStaticFieldsAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StackFrameAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ThreadFilterViewer.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleDelegateAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleFilterAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleStepFilterAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/ClearDisplayAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsCompletionProcessor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsViewerConfiguration.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/IDataDisplay.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaCommandTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AddVMDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ComboFieldEditor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IAddVMDialogRequestor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IEntriesChangedListener.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JREContainerWizardPage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaApplicationShortcut.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaLaunchConfigurationTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaProjectPropertyPage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ListContentProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodFinder.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProcessPropertyPage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceAttachmentBlock.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/StandardVMCommandTab.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/UnresolvedJREStatusHandler.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMContentProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLabelProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLibraryBlock.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMPreferencePage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMStandin.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryStatusHandler.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipContentProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipLabelProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipTreeNode.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ISnippetStateChangedListener.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetViewerConfiguration.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/RunSnippetAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain1.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorActionContributor.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetFileDocumentProvider.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.properties
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenHierarchyOnSelectionAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenOnSelectionAction.java
    org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java
    org.eclipse.jdt.launching.macosx/.classpath
    org.eclipse.jdt.launching.macosx/.cvsignore
    org.eclipse.jdt.launching.macosx/.project
    org.eclipse.jdt.launching.macosx/about.html
    org.eclipse.jdt.launching.macosx/build.properties
    org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java
    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.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/launching/macosx/start_carbon.sh
    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/.project
    org.eclipse.jdt.launching/about.html
    org.eclipse.jdt.launching/build.properties
    org.eclipse.jdt.launching/doc/hglegal.htm
    org.eclipse.jdt.launching/doc/ngibmcpy.gif
    org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching.html
    org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathEntryResolvers.html
    org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathProviders.html
    org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmConnectors.html
    org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmInstallTypes.html
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.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/JRERuntimeClasspathEntryResolver.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/JavaLocalApplicationLaunchConfigurationDelegate.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.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/ListenerList.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/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/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/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/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/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/ZipEntryStorage.java
    org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/package.html
    org.eclipse.jdt.launching/plugin.properties
    org.eclipse.jdt.launching/plugin.xml
    org.eclipse.jdt.launching/scripts/exportplugin.xml
diff --git a/org.eclipse.jdt.debug.tests/.classpath b/org.eclipse.jdt.debug.tests/.classpath
deleted file mode 100644
index 0119c05..0000000
--- a/org.eclipse.jdt.debug.tests/.classpath
+++ /dev/null
@@ -1,21 +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="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.launching"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="testprograms"/>
-    <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 335753f..0000000
--- a/org.eclipse.jdt.debug.tests/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.jdt.debug.tests</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.resources</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.debug.core</project>

-		<project>org.eclipse.debug.ui</project>

-		<project>org.eclipse.jdt.core</project>

-		<project>org.eclipse.jdt.debug</project>

-		<project>org.eclipse.jdt.debug.ui</project>

-		<project>org.eclipse.jdt.junit.eclipse</project>

-		<project>org.eclipse.jdt.launching</project>

-		<project>org.eclipse.jdt.ui</project>

-		<project>org.eclipse.swt</project>

-		<project>org.eclipse.ui</project>

-		<project>org.junit</project>

-	</projects>

-	<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.tests/about.html b/org.eclipse.jdt.debug.tests/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.debug.tests/about.html
+++ /dev/null
@@ -1,30 +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>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org 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
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</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 0179dfd..0000000
--- a/org.eclipse.jdt.debug.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               test.xml,\
-               about.html,\
-               testresources/,\
-               testjars/,\
-               testprograms/,\
-               *.jar
-source.javadebugtests.jar = test plugin/,\
-                         tests/
diff --git a/org.eclipse.jdt.debug.tests/plugin.properties b/org.eclipse.jdt.debug.tests/plugin.properties
deleted file mode 100644
index 8d388a7..0000000
--- a/org.eclipse.jdt.debug.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
-# Contributors:
-#    IBM Corporation - Initial implementation
-######################################################################
-
-pluginName=Java Debug Test Plugin
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/plugin.xml b/org.eclipse.jdt.debug.tests/plugin.xml
deleted file mode 100644
index ef806e4..0000000
--- a/org.eclipse.jdt.debug.tests/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<plugin
-   id="org.eclipse.jdt.debug.tests"
-   name="%pluginName"
-   version="2.0.0"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.debug.testplugin.JavaTestPlugin">
-   
-   <requires>
-	  <import plugin="org.junit"/>   
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.apache.xerces"/>
-      <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"/>
-   </requires>
-
-<runtime>
-  <library name="javadebugtests.jar" >
-     <export name = "*"/>
-  </library> 
-</runtime>
-
-<extension id="app" point="org.eclipse.core.runtime.applications">
-  <application> 
-     <run class="org.eclipse.jdt.debug.testplugin.TestWorkbench">
-		<parameter name="productInfo" value="product.ini"/>
-     </run>
-  </application>
-</extension>
-
-<extension point="org.eclipse.jdt.launching.classpathProviders">
-  <classpathProvider
-    id = "org.eclipse.jdt.debug.tests.EmptyClasspathProvider"
-    class ="org.eclipse.jdt.debug.testplugin.EmptyClasspathProvider">
-  </classpathProvider>
-</extension>
-
-</plugin>
diff --git a/org.eclipse.jdt.debug.tests/scripts/exportplugin.xml b/org.eclipse.jdt.debug.tests/scripts/exportplugin.xml
deleted file mode 100644
index e049940..0000000
--- a/org.eclipse.jdt.debug.tests/scripts/exportplugin.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!-- Export a jar of .class files for the org.eclipse.jdt.debug.test Eclipse plugin
-     along with other important plugin files to the "plugin-export" subdirectory
-     of the target Eclipse installation -->
-<project name="org.eclipse.jdt.debug.tests" default="export" basedir="..">
-
-	<!-- Set the timestamp and important properties -->
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="dest"  value="${destdir}/org.eclipse.jdt.debug.tests" />
-	</target>
-
-	<!-- Create the jar of .class files, and copy other important files to export dir -->
-	<target name="export" depends="init">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		
-		<!-- Create the java debug tests jar -->
-		<jar 
-			jarfile="${dest}/javadebugtests.jar"
-			basedir="bin"
-			includes="org/**"
-		/>
-				
-		<!-- Create the source zip -->
-		<zip zipfile="${dest}/javadebugtestssrc.zip">
-			<fileset dir="test plugin"/>
-			<fileset dir="tests"/>
-		</zip>
-		
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file=".classpath" todir="${dest}"/>
-		<copy file="test.xml" todir="${dest}"/>
-		<copy todir="${dest}/testprograms">
-			<fileset dir="testprograms" />
-		</copy>		
-		<copy todir="${dest}/testjars">
-			<fileset dir="testjars" />
-		</copy>
-		<copy todir="${dest}/testresources">
-			<fileset dir="testresources" />
-		</copy>				
-	</target>
-	
-</project>
diff --git a/org.eclipse.jdt.debug.tests/scripts/exportplugins.xml b/org.eclipse.jdt.debug.tests/scripts/exportplugins.xml
deleted file mode 100644
index 9a10875..0000000
--- a/org.eclipse.jdt.debug.tests/scripts/exportplugins.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project name="exportplugins" default="export" basedir=".">
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target name="export" depends="init">
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.debug.core" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.debug.ui" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.debug" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.debug.ui" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.launching" target="export"/>
-		<ant antfile="scripts/exportplugin.xml" dir="../../org.eclipse.jdt.launching.j9" target="export"/>
-	</target>
-</project>
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 e6f3a73..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementEventWaiter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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();
-	}
-
-}
\ No newline at end of file
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 7a3dc38..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventDetailWaiter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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 bf8cb0c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugElementKindEventWaiter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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 7fc9c46..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/DebugEventWaiter.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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>IDebugModelManager</code> as
- * a <code>IDebugModelEventListener</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;
-	}
-	/**
-	 * Answers the event name associated with the given flag.
-	 */
-	public String getEventName(int flag) {
-		switch (flag) {
-			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(event);
-		//printReceived(event);
-		for (int i = 0; i < events.length; i++) {
-			if (accept(events[i])) {
-				fEvent= events[i];
-				fEventSet = events;
-				notifyAll();
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Prints a message indicating which event was received.
-	 */
-	protected void printReceived(DebugEvent event) {
-		System.out.println(this +" got " + event);
-	}
-
-	/**
-	 * 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/EmptyClasspathProvider.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
deleted file mode 100644
index b598e2c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/EmptyClasspathProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
- 
-import org.eclipse.core.runtime.CoreException;
-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) throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-}
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 f0f477c..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaProjectHelper.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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");	
-
-	/**
-	 * 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;	
-	}
-	
-	/**
-	 * 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 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
-		}
-	}	
-	
-	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 c009798..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/JavaTestPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-public class JavaTestPlugin extends AbstractUIPlugin {
-	
-	private static JavaTestPlugin fgDefault;
-	
-	public JavaTestPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		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= fgDefault.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			URL installURL= new URL(getDescriptor().getInstallURL(), path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java
deleted file mode 100644
index 03cc460..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/Main.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-// copied from startup.jar. planned to be removed soon
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileFilter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-/**
- * Startup class for Eclipse. Creates a class loader using
- * supplied URL of platform installation, loads and calls
- * the Eclipse Boot Loader.  The startup arguments are as follows:
- * <dl>
- * <dd>
- *    -application &lt;id&gt;: the identifier of the application to run
- * </dd>
- * <dd>
- *    -boot &lt;location&gt;: the location, expressed as a URL, of the platform's boot.jar
- * </dd>
- * <dd>
- *    -consolelog : enables log to the console. Handy when combined with -debug
- * </dd>
- * <dd>
- *    -data &lt;location&gt;: sets the workspace location and the default location for projects
- * </dd>
- * <dd>
- *    -debug [options file]: turns on debug mode for the platform and optionally specifies a location
- * for the .options file. This file indicates what debug points are available for a
- * plug-in and whether or not they are enabled. If a location is not specified, the platform searches
- * for the .options file under the install directory
- * </dd>
- * <dd>
- *    -dev [entries]: turns on dev mode and optionally specifies comma-separated class path entries
- * which are added to the class path of each plug-in
- * </dd>
- * <dd>
- *    -keyring &lt;location&gt;: the location of the authorization database on disk. This argument
- * has to be used together with the -password argument
- * </dd>
- * <dd>
- *    -password &lt;passwd&gt;: the password for the authorization database
- * </dd>
- * <dd>
- *    -plugins &lt;location&gt;: The arg is a URL pointing to a file which specs the plugin 
- * path for the platform.  The file is in property file format where the keys are user-defined 
- * names and the values are comma separated lists of either explicit paths to plugin.xml 
- * files or directories containing plugins. (e.g., .../eclipse/plugins).
- * </dd>
- * <dd>
- *    -ws &lt;window system&gt;: sets the window system value
- * </dd>
- * </dl>
- */
-public class Main {
-	/**
-	 * Indicates whether this instance is running in debug mode.
-	 */
-	protected boolean debug = false;
-	
-	/**
-	 * The location of the launcher to run.
-	 */
-	protected String bootLocation = null;
-	
-	/**
-	 * The identifier of the application to run.
-	 */
-	protected String application;
-	
-	/**
-	 * The path for finding find plugins.
-	 */
-	protected URL pluginPathLocation;
-	
-	/**
-	 * The boot path location.
-	 */
-	protected String location;
-	
-	/**
-	 * Indicates whether items for UNinstallation should be looked for.
-	 */
-	protected boolean uninstall = false;
-	
-	/**
-	 * The item to be uninstalled.
-	 */
-	protected String uninstallCookie;
-	
-	/**
-	 * The class path entries.
-	 */
-	protected String devClassPath = null;
-	
-	/**
-	 * Indicates whether this instance is running in development mode.
-	 */
-	protected boolean inDevelopmentMode = false;
-
-	// static token describing how to take down the splash screen
-	private static String endSplash = null;
-	
-	// constants
-	private static final String APPLICATION = "-application";
-	private static final String BOOT = "-boot";
-	private static final String DEBUG = "-debug";
-	private static final String DEV = "-dev";
-	private static final String ENDSPLASH = "-endsplash";
-	private static final String UNINSTALL = "-uninstall";
-	private static final String PI_BOOT = "org.eclipse.core.boot";
-	private static final String BOOTLOADER = "org.eclipse.core.boot.BootLoader";
-	private static final String UPDATELOADER = "org.eclipse.core.internal.boot.LaunchInfo";
-
-	// The project containing the boot loader code.  This is used to construct
-	// the correct class path for running in VAJ and VAME.
-	private static final String PROJECT_NAME = "Eclipse Core Boot";
-
-	private static boolean inVAJ;
-	static {
-		try {
-			Class.forName("com.ibm.uvm.lang.ProjectClassLoader");
-			inVAJ = true;
-		} catch (Exception e) {
-			inVAJ = false;
-		}
-	}
-	private static boolean inVAME;
-	static {
-		try {
-			Class.forName("com.ibm.eclipse.core.VAME");
-			inVAME = true;
-		} catch (Exception e) {
-			inVAME = false;
-		}
-	}
-
-/**
- * Executes the launch.
- * 
- * @return the result of performing the launch
- * @param args command-line arguments
- * @exception Exception thrown if a problem occurs during the launch
- */
-protected Object basicRun(String[] args) throws Exception {
-	Class clazz = getBootLoader(bootLocation);
-	Method method = clazz.getDeclaredMethod("run", new Class[] { String.class, URL.class, String.class, String[].class });
-	try {
-		return method.invoke(clazz, new Object[] { application, pluginPathLocation, location, args });
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-
-/**
- * Returns the result of converting a list of comma-separated tokens into an array
- * 
- * @return the array of string tokens
- * @param prop the initial comma-separated string
- */
-private String[] getArrayFromList(String prop) {
-	if (prop == null || prop.trim().equals(""))
-		return new String[0];
-	Vector list = new Vector();
-	StringTokenizer tokens = new StringTokenizer(prop, ",");
-	while (tokens.hasMoreTokens()) {
-		String token = tokens.nextToken().trim();
-		if (!token.equals(""))
-			list.addElement(token);
-	}
-	return list.isEmpty() ? new String[0] : (String[]) list.toArray(new String[0]);
-}
-/**
- * Creates and returns a platform <code>BootLoader</code> which can be used to start
- * up and run the platform.  The given base, if not <code>null</code>,
- * is the location of the boot loader code.  If the value is <code>null</code>
- * then the boot loader is located relative to this class.
- * 
- * @return the new boot loader
- * @param base the location of the boot loader
- */
-public Class getBootLoader(String base) throws Exception {
-	URLClassLoader loader = new URLClassLoader(getBootPath(base), null);
-	return loader.loadClass(BOOTLOADER);
-}
-/**
- * Returns the <code>URL</code>-based class path describing where the boot classes
- * are located when running in development mode.
- * 
- * @return the url-based class path
- * @param base the base location
- * @exception MalformedURLException if a problem occurs computing the class path
- */
-protected URL[] getDevPath(URL base) throws MalformedURLException {
-	URL url;
-	String devBase = base.toExternalForm();
-	if (!inDevelopmentMode) {
-		url = new URL(devBase + "boot.jar");
-		return new URL[] {url};
-	}
-	String[] locations = getArrayFromList(devClassPath);
-	ArrayList result = new ArrayList(locations.length);
-	for (int i = 0; i < locations.length; i++) {
-		String spec = devBase + locations[i];
-		char lastChar = spec.charAt(spec.length() - 1);
-		if ((spec.endsWith(".jar") || (lastChar == '/' || lastChar == '\\')))
-			url = new URL (spec);
-		else
-			url = new URL(spec + "/");
-		//make sure URL exists before adding to path
-		if (new java.io.File(url.getFile()).exists())
-			result.add(url);
-	}
-	url = new URL(devBase + "boot.jar");
-	if (new java.io.File(url.getFile()).exists())
-		result.add(url);
-	return (URL[])result.toArray(new URL[result.size()]);
-}
-
-/**
- * Returns the <code>URL</code>-based class path describing where the boot classes are located.
- * 
- * @return the url-based class path
- * @param base the base location
- * @exception MalformedURLException if a problem occurs computing the class path
- */
-protected URL[] getBootPath(String base) throws MalformedURLException {
-	URL url = null;
-	// if the given location is not null, assume it is correct and use it. 
-	if (base != null) {
-		url = new URL(base);
-		if (debug)
-			System.out.println("Boot URL: " + url.toExternalForm());
-		return new URL[] {url};	
-	}
-	// Create a URL based on the location of this class' code.
-	// strip off jar file and/or last directory to get 
-	// to the directory containing projects.
-	URL[] result = null;
-	url = getClass().getProtectionDomain().getCodeSource().getLocation();
-	String path = url.getFile();
-	if (path.endsWith(".jar"))
-		path = path.substring(0, path.lastIndexOf("/"));
-	else 
-		if (path.endsWith("/"))
-			path = path.substring(0, path.length() - 1);
-	if (inVAJ || inVAME) {
-		int ix = path.lastIndexOf("/");
-		path = path.substring(0, ix + 1);
-		path = path + PROJECT_NAME + "/";
-		url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-		result = new URL[] {url};
-	} else {
-		path = searchForPlugins(path);
-		path = searchForBoot(path);
-		// add on any dev path elements
-		url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-		result = getDevPath(url);
-	}
-	if (debug) {
-		System.out.println("Boot URL:");
-		for (int i = 0; i < result.length; i++)
-			System.out.println("    " + result[i].toExternalForm());	
-	}
-	return result;
-}
-
-/**
- * Searches for a plugins root starting at a given location.  If one is
- * found then this location is returned; otherwise an empty string is
- * returned.
- * 
- * @return the location where plugins were found, or an empty string
- * @param start the location to begin searching at
- */
-protected String searchForPlugins(String start) {
-	File path = new File(start);
-	while (path != null) {
-		File test = new File(path, "plugins");
-		if (test.exists())
-			return test.toString();
-		path = path.getParentFile();
-		path = (path == null || path.length() == 1)  ? null : path;
-	}
-	return "";
-}
-/**
- * Searches for a boot directory starting at a given location.  If one
- * is found then this location is returned; otherwise an empty string
- * is returned.
- * 
- * @return the location where plugins were found, or an empty string
- * @param start the location to begin searching at
- */
-protected String searchForBoot(String start) {
-	FileFilter filter = new FileFilter() {
-		public boolean accept(File candidate) {
-			return candidate.getName().startsWith(PI_BOOT);
-		}
-	};
-	File[] boots = new File(start).listFiles(filter);
-	String result = null;
-	String maxVersion = null;
-	for (int i = 0; i < boots.length; i++) {
-		String name = boots[i].getName();
-		int index = name.lastIndexOf('_');
-		if (index == -1) {
-			result = boots[i].getAbsolutePath();
-			i = boots.length;
-		} else {
-			if (index > 0) {
-				String version = name.substring(index + 1);
-				if (maxVersion == null) {
-					result = boots[i].getAbsolutePath();
-					maxVersion = version;
-				} else
-					if (maxVersion.compareTo(version) == -1) {
-						result = boots[i].getAbsolutePath();
-						maxVersion = version;
-					}						
-			}
-		}
-	}
-	if (result == null)
-		throw new RuntimeException("Could not find bootstrap code. Check location of boot plug-in or specify -boot.");
-	return result.replace(File.separatorChar, '/') + "/";
-}
-/**
- * Returns the update loader for the given boot path.
- * 
- * @return the update loader
- * @param base the boot path base
- * @exception Exception thrown is a problem occurs determining this loader
- */
-public Class getUpdateLoader(String base) throws Exception {
-	URLClassLoader loader = new URLClassLoader(getBootPath(base), null);
-	return loader.loadClass(UPDATELOADER);
-}
-/**
- * Runs the platform with the given arguments.  The arguments must identify
- * an application to run (e.g., <code>-application com.example.application</code>).
- * After running the application <code>System.exit(N)</code> is executed.
- * The value of N is derived from the value returned from running the application.
- * If the application's return value is an <code>Integer</code>, N is this value.
- * In all other cases, N = 0.
- * <p>
- * Clients wishing to run the platform without a following <code>System.exit</code>
- * call should use <code>run()</code>.
- *
- * @see #run
- * 
- * @param args the command line arguments
- */
-public static void main(String[] args) {
-	Object result = null;
-	try {
-		result = new Main().run(args);
-	} catch (Throwable e) {
-		// try and take down the splash screen.
-		endSplash();
-		System.out.println("Exception launching the Eclipse Platform:");
-		e.printStackTrace();
-	}
-	int exitCode = result instanceof Integer ? ((Integer) result).intValue() : 0;
-	System.exit(exitCode);
-}
-/**
- * Tears down the currently-displayed splash screen.
- */
-public static void endSplash() {
-	if (endSplash == null)
-		return;
-	try {
-		Runtime.getRuntime().exec(endSplash);
-	} catch (Exception e) {
-	}
-}
-
-/**
- * Runs this launcher with the arguments specified in the given string.
- * 
- * @param argString the arguments string
- * @exception Exception thrown if a problem occurs during launching
- */
-public static void main(String argString) throws Exception {
-	Vector list = new Vector(5);
-	for (StringTokenizer tokens = new StringTokenizer(argString, " "); tokens.hasMoreElements();)
-		list.addElement((String) tokens.nextElement());
-	main((String[]) list.toArray(new String[list.size()]));
-}
-
-/**
- * Processes the command line arguments
- * 
- * @return the arguments to pass through to the launched application
- * @param args the command line arguments
- */
-protected String[] processCommandLine(String[] args) throws Exception {
-	int[] configArgs = new int[100];
-	configArgs[0] = -1; // need to initialize the first element to something that could not be an index.
-	int configArgIndex = 0;
-	for (int i = 0; i < args.length; i++) {
-		boolean found = false;
-		// check for args without parameters (i.e., a flag arg)
-		// check if debug should be enabled for the entire platform
-		if (args[i].equalsIgnoreCase(DEBUG)) {
-			debug = true;
-			// passed thru this arg (i.e., do not set found = true
-			continue;
-		}
-		
-		// check if development mode should be enabled for the entire platform
-		// If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), 
-		// simply enable development mode.  Otherwise, assume that that the following arg is
-		// actually some additional development time class path entries.  This will be processed below.
-		if (args[i].equalsIgnoreCase(DEV) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) {
-			inDevelopmentMode = true;
-			// do not mark the arg as found so it will be passed through
-			continue;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i;
-			continue;
-		}
-		// check for args with parameters. If we are at the last argument or if the next one
-		// has a '-' as the first character, then we can't have an arg with a parm so continue.
-		if (i == args.length - 1 || args[i + 1].startsWith("-")) 
-			continue;
-		String arg = args[++i];
-
-		// look for the laucher to run
-		if (args[i - 1].equalsIgnoreCase(BOOT)) {
-			bootLocation = arg;
-			found = true;
-		}
-
-		// look for the development mode and class path entries.  
-		if (args[i - 1].equalsIgnoreCase(DEV)) {
-			inDevelopmentMode = true;
-			devClassPath = arg;
-			continue;
-		}
-
-		// look for the application to run
-		if (args[i - 1].equalsIgnoreCase(APPLICATION)) {
-			application = arg;
-			found = true;
-		}
-
-		// look for token to use to end the splash screen
-		if (args[i - 1].equalsIgnoreCase(ENDSPLASH)) {
-			endSplash = arg;
-			continue;
-		}
-
-		// look for items to uninstall
-		if (args[i - 1].equalsIgnoreCase(UNINSTALL)) {
-			uninstall = true;
-			uninstallCookie = arg;
-			found = true;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i - 1;
-			configArgs[configArgIndex++] = i;
-		}
-	}
-	// remove all the arguments consumed by this argument parsing
-	if (configArgIndex == 0)
-		return args;
-	String[] passThruArgs = new String[args.length - configArgIndex];
-	configArgIndex = 0;
-	int j = 0;
-	for (int i = 0; i < args.length; i++) {
-		if (i == configArgs[configArgIndex])
-			configArgIndex++;
-		else
-			passThruArgs[j++] = args[i];
-	}
-	return passThruArgs;
-}
-/**
- * Runs the application to be launched.
- * 
- * @return the return value from the launched application
- * @param args the arguments to pass to the application
- * @exception thrown if a problem occurs during launching
- */
-public Object run(String[] args) throws Exception {
-	String[] passThruArgs = processCommandLine(args);
-	if (uninstall)
-		return updateRun(UNINSTALL, uninstallCookie, passThruArgs);
-	else
-		return basicRun(passThruArgs);
-}
-/**
- * Performs an update run.
- * 
- * @return the return value from the update loader
- * @param flag flag to give to the update loader
- * @param value value to give to the update loader
- * @param args arguments to give to the update loader.
- * @exception Exception thrown if a problem occurs during execution
- */
-protected Object updateRun(String flag, String value, String[] args) throws Exception {
-	Class clazz = getUpdateLoader(bootLocation);
-	Method method = clazz.getDeclaredMethod("run", new Class[] { String.class, String.class, String.class, String[].class });
-	try {
-		return method.invoke(clazz, new Object[] { flag, value, location, args });
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-}
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java
deleted file mode 100644
index 3a257d2..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/NewMain.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-/** 
- * Application is responsible for calling core launch api
- */
-
-public class NewMain extends Main {
-	private static final String DEFAULT_APPLICATION= "org.eclipse.ui.workbench";
-	
-	
-	public NewMain(String application, String location, URL pluginPathLocation, String bootLocation, boolean debug) throws IOException {
-		this.application= application;
-		this.location= location;
-		this.pluginPathLocation= pluginPathLocation;
-		this.bootLocation= bootLocation;
-	}
-	
-	public static void main(String[] args) {
-		try {
-			String location= getLocationFromProperties("platform");
-			new NewMain(DEFAULT_APPLICATION, location, null, null, true).run(args);
-		} catch (Throwable e) {
-			System.out.println("Exception launching the Eclipse Platform UI:");
-			e.printStackTrace();
-		}
-		System.exit(0);
-	}
-	
-
-	/**
-	 * Run this launcher with the arguments specified in the given string.
-	 * This is a short cut method for people running the launcher from
-	 * a scrapbook (i.e., swip-and-doit facility).
-	 */
-	public static void main(String argString) throws Exception {
-		Vector list= new Vector(5);
-		for (StringTokenizer tokens= new StringTokenizer(argString, " "); tokens.hasMoreElements();)
-			list.addElement((String) tokens.nextElement());
-		main((String[]) list.toArray(new String[list.size()]));
-	}
-	
-	public static String getLocationFromProperties(String key) {
-		Properties properties= new Properties();
-		try {
-			FileInputStream fis= new FileInputStream(getSettingsFile());
-			properties.load(fis);
-			return properties.getProperty(key);
-		} catch (IOException e) {
-		}
-		return null;
-	}	
-	
-	private static File getSettingsFile() {
-		String home= System.getProperty("user.home");
-		if (home == null) {
-			System.out.println("Home dir not defined");
-			return null;
-		}
-		return new File(home, "eclipse-workspaces.properties");	
-	}	
-}
\ No newline at end of file
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 a125f74..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/SpecificDebugElementEventWaiter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} else {
-			return false;
-		}
-	}
-
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java
deleted file mode 100644
index 50d7d68..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestPluginLauncher.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.net.URL;
-
-/**
- * Helper class to launch a test
- */
-public class TestPluginLauncher {
-	
-	public static final String APP_NAME= "org.eclipse.jdt.debug.tests.app";
-	
-	public static void run(String location, Class testCase, String[] args) {
-		run(APP_NAME, location, testCase, args);
-	}
-	
-	public static void run(String application, String location, Class testCase, String[] args) {
-		try {
-			String bootLocation= getBootLocation();
-			int nArgs= args.length;
-			String[] newArgs= new String[4 + nArgs];
-			newArgs[0]= testCase.getName();
-			for (int i= 0; i < nArgs; i++) {
-				newArgs[1 + i]= args[i];
-			}
-			newArgs[1 + nArgs]= "-dev";
-			newArgs[1 + nArgs + 1]= "bin";
-			newArgs[1 + nArgs + 2]= "-debug";
-			NewMain newMain= new NewMain(application, location, null, bootLocation, false);
-			newMain.run(newArgs);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public static String getLocationFromProperties(String key) {
-		return NewMain.getLocationFromProperties(key);
-	}
-	
-	public static String getLocationFromProperties() {
-		return NewMain.getLocationFromProperties("tests");
-	}
-	
-	public static String getBootLocation() {
-		URL url= TestPluginLauncher.class.getResource("TestPluginLauncher.class");
-		String s= url.toString();
-		int index= s.indexOf("/org.eclipse.jdt.debug.tests");
-		if (index == -1)
-			throw new IllegalArgumentException();
-		s= s.substring(0, index);
-		s= s + "/org.eclipse.core.boot/boot.jar";
-		return s;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java b/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java
deleted file mode 100644
index 5ae314b..0000000
--- a/org.eclipse.jdt.debug.tests/test plugin/org/eclipse/jdt/debug/testplugin/TestWorkbench.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.jdt.debug.testplugin;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.internal.Workbench;
-
-public class TestWorkbench extends Workbench {
-
-	/**
-	 * Run an event loop for the workbench.
-	 */
-	protected void runEventLoop() {
-		// Dispatch all events.
-		Display display = Display.getCurrent();
-		while (true) {
-			try {
-				if (!display.readAndDispatch())
-					break;
-			} catch (Throwable e) {
-				break;
-			}
-		}
-		IPath location= JavaTestPlugin.getDefault().getWorkspace().getRoot().getLocation();
-		System.out.println("Workspace-location: " + location.toString());
-				
-		
-		String[] args= getCommandLineArgs();
-		if (args.length > 2) {
-			try {
-				Test test= getTest(args[2]);
-				TestRunner.run(test);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		} else {
-			System.out.println("TestWorkbench: Argument must be class name");
-		}
-				
-		close();
-				
-	}
-	
-	public Test getTest(String className) throws Exception {
-		Class testClass= getClass().getClassLoader().loadClass(className);
-
-		Method suiteMethod= null;
-		try {
-			suiteMethod= testClass.getMethod(TestRunner.SUITE_METHODNAME, new Class[0]);
-	 	} catch (Exception e) {
-	 		// try to extract a test suite automatically	
-			return new TestSuite(testClass);
-		}
-		try {
-			return (Test) suiteMethod.invoke(null, new Class[0]); // static method
-		} catch (InvocationTargetException e) {
-			System.out.println("Failed to invoke suite():" + e.getTargetException().toString());
-		} catch (IllegalAccessException e) {
-			System.out.println("Failed to invoke suite():" + e.toString());
-		}
-		return null; 
-
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.tests/test.xml b/org.eclipse.jdt.debug.tests/test.xml
deleted file mode 100644
index 24ecf1b..0000000
--- a/org.eclipse.jdt.debug.tests/test.xml
+++ /dev/null
@@ -1,51 +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 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 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>
-
-</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/testplans/Debug Test Plan 2.0.htm b/org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm
deleted file mode 100644
index 8ae2294..0000000
--- a/org.eclipse.jdt.debug.tests/testplans/Debug Test Plan 2.0.htm
+++ /dev/null
@@ -1,972 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List href="./Debug%20Test%20Plan%202.0_files/filelist.xml">

-<title>Debug Test Plan</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Author>Dwright</o:Author>

-  <o:Template>Normal</o:Template>

-  <o:LastAuthor>Dwright</o:LastAuthor>

-  <o:Revision>5</o:Revision>

-  <o:TotalTime>8</o:TotalTime>

-  <o:Created>2002-06-02T23:48:00Z</o:Created>

-  <o:LastSaved>2002-06-02T23:56:00Z</o:LastSaved>

-  <o:Pages>3</o:Pages>

-  <o:Words>542</o:Words>

-  <o:Characters>3095</o:Characters>

-  <o:Company>Object Technology International</o:Company>

-  <o:Lines>25</o:Lines>

-  <o:Paragraphs>6</o:Paragraphs>

-  <o:CharactersWithSpaces>3800</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]-->

-<style>

-<!--

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

- /* List Definitions */

-@list l0

-	{mso-list-id:228659936;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-1316170924 -726361272 -1248023756 2108705260 1145722112 1657806012 -1586299904 542178834 -1748712632 1091063270;}

-@list l0:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l1

-	{mso-list-id:308173531;

-	mso-list-type:hybrid;

-	mso-list-template-ids:2060218726 -841305424 -1959476236 2947934 -259121348 -1280253820 -303380956 -268826074 -1521839772 898945252;}

-@list l1:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l2

-	{mso-list-id:354161772;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1553357098 195446546 -661373922 -1240453266 -333671788 -1348988594 1500779028 -873200818 870580272 1904113856;}

-@list l2:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l3

-	{mso-list-id:402680193;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-2122823714 1635152138 -90003044 993399286 1227363908 -1995941908 -1926622552 596146650 629071842 -1986749358;}

-@list l3:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l4

-	{mso-list-id:548685869;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1558743908 -159457064 976809258 751715478 -1584903882 -388094338 266210146 470566120 -201926624 -229759450;}

-@list l4:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l5

-	{mso-list-id:732050242;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1819465034 -46509972 -772614290 606873998 -1471119476 -1754786104 1012273652 244462330 4108232 1063687738;}

-@list l5:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l6

-	{mso-list-id:926696578;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-504352970 -2088215428 1624663696 675558382 -1064935048 -1145565904 684256716 1027522340 1776835744 -244406254;}

-@list l6:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l7

-	{mso-list-id:1277255895;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-1041881232 1740522554 -1179631362 -950774052 -1658823352 368886886 703990130 -1040175210 -156755178 2144234958;}

-@list l7:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l7:level2

-	{mso-level-number-format:bullet;

-	mso-level-text:o;

-	mso-level-tab-stop:1.0in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:"Courier New";

-	mso-bidi-font-family:"Times New Roman";}

-@list l8

-	{mso-list-id:1297756616;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-105480334 -1454842910 383389470 1802041812 -709620050 -1688580750 -1682028544 -2119902570 655414548 57444902;}

-@list l8:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l9

-	{mso-list-id:1696686681;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1837368118 -1668529946 1175091472 -726900266 -788501314 716572452 1569231992 1297110560 2042646458 -431037346;}

-@list l9:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l10

-	{mso-list-id:1957834481;

-	mso-list-type:hybrid;

-	mso-list-template-ids:717788732 152189758 885009062 1899793822 -1984283884 -503179984 1497545442 -317410578 -849162318 1823475886;}

-@list l10:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l10:level2

-	{mso-level-number-format:bullet;

-	mso-level-text:o;

-	mso-level-tab-stop:1.0in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:"Courier New";

-	mso-bidi-font-family:"Times New Roman";}

-@list l11

-	{mso-list-id:1959213535;

-	mso-list-type:hybrid;

-	mso-list-template-ids:-724371470 -1141718406 1398717366 -1149571100 -1296281456 -213096834 1836583102 -1185509228 -4038170 134529380;}

-@list l11:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-@list l12

-	{mso-list-id:1961298044;

-	mso-list-type:hybrid;

-	mso-list-template-ids:1457928864 1440107084 -1753425896 -1722105342 2133986266 -376150224 696292266 1211000006 -1920697944 -1955302124;}

-@list l12:level1

-	{mso-level-number-format:bullet;

-	mso-level-text:\F0B7;

-	mso-level-tab-stop:.5in;

-	mso-level-number-position:left;

-	text-indent:-.25in;

-	mso-ansi-font-size:10.0pt;

-	font-family:Symbol;}

-ol

-	{margin-bottom:0in;}

-ul

-	{margin-bottom:0in;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<h1>Debug Test Plan</h1>

-

-<p>This documented was last updated June 2, 2002, for test pass 2.</p>

-

-<h2>Virtual Machines&amp; Platforms</h2>

-

-<h3>VMs</h3>

-

-<p>Test with JREs as well as with full JDKs</p>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Sun</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l2 level1 lfo1;tab-stops:list .5in'>1.3.1_01 or higher</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l2 level1 lfo1;tab-stops:list .5in'>1.4.1 B10 or higher</li>

-</ul>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>IBM</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l12 level1 lfo2;tab-stops:list .5in'>1.3.0 (build 1.3.0, J2RE

-     1.3.0 IBM build cn130-20010925)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l12 level1 lfo2;tab-stops:list .5in'>1.3.1 (build 1.3.1, J2RE

-     1.3.1 IBM Windows 32 build cn131-20020403)</li>

-</ul>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>J9</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l1 level1 lfo3;tab-stops:list .5in'>20020206 or higher</li>

-</ul>

-

-<h3>Platforms</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Windows 2000/NT</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Windows XP</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Linux</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l3 level1 lfo4;tab-stops:list .5in'>Double byte (Japanese)</li>

-</ul>

-

-<h2>Function</h2>

-

-<h3>Breakpoints {Darin W}</h3>

-

-<p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>(Breakpoint

-tests are a good candidate for automation)<o:p></o:p></p>

-

-<table border=1 cellspacing=0 cellpadding=0 style='border-collapse:collapse;

- border:none;mso-border-alt:solid windowtext .5pt;mso-padding-alt:0in 5.4pt 0in 5.4pt'>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Enable</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Disable</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Hit

-  count</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Condition</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Suspend

-  VM</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Suspend

-  thread</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Caught</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Uncaught</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Entry</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Exit</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Access</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Modification</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Thread

-  filter</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border:solid windowtext .5pt;

-  border-left:none;mso-border-left-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Scope</p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Line

-  Breakpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Exception

-  Breakpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Watchpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

- </tr>

- <tr>

-  <td width=39 valign=top style='width:29.5pt;border:solid windowtext .5pt;

-  border-top:none;mso-border-top-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>Method

-  Breakpoint</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.5pt;border-top:none;border-left:none;

-  border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X</p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto'>X<o:p></o:p></p>

-  </td>

-  <td width=39 valign=top style='width:29.55pt;border-top:none;border-left:

-  none;border-bottom:solid windowtext .5pt;border-right:solid windowtext .5pt;

-  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;

-  padding:0in 5.4pt 0in 5.4pt'>

-  <p class=MsoNormal><u1:p></u1:p><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-  </td>

- </tr>

-</table>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l8 level1 lfo5;tab-stops:list .5in'><u1:p></u1:p>Suspend on

-     uncaught exceptions</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l8 level1 lfo5;tab-stops:list .5in'>Suspend on compilation errors</li>

-</ul>

-

-<h3>HotSwap {Darin S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l5 level1 lfo6;tab-stops:list .5in'>J9 and Sun</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l5 level1 lfo6;tab-stops:list .5in'>Negative cases (i.e. handle

-     failures)</li>

-</ul>

-

-<h3>Launch Configurations {Jared B/Luc B}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Local &amp; Remote Java

-     Applications</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Creation of default launch

-     configurations in dialog the dialog (via new button, based on workbench

-     selection)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Creation of default launch

-     configurations using “Debug/Run As…” actions</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using non-default class path

-     &amp; source lookup path</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using non-default working

-     directory</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Sharing default and

-     non-default launch configurations, on different OSÂ’s (i.e. Linux to

-     Windows)</li>

- <ul type=circle>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l7 level2 lfo7;tab-stops:list 1.0in'>Sharing of classpaths</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l7 level2 lfo7;tab-stops:list 1.0in'>Sharing of JREs via

-      new “container” support</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l7 level2 lfo7;tab-stops:list 1.0in'>Sharing/using non-standard

-      variables on the classpath</li>

- </ul>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Launching java programs not

-     contained in the workspace (i.e. just use as a tool to launch external

-     Java programs)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using new “Container” support

-     to reference JREs (instead of JRE_LIB).</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Using JREs with &gt; 1 jar</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Starting a workspace after

-     deleting/renaming all installed JREs (can we handle it gracefully?)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Hot keys for re-launch</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Perspective switching</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Favorites</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Handling of launch

-     configurations with missing plug-in. I.e. create a runtime workbench

-     configuration, and then run the workbench without PDE.</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l7 level1 lfo7;tab-stops:list .5in'>Saving &amp; building before

-     launching, based on preferences</li>

-</ul>

-

-<h3>Source Lookup {Jared B/Luc B}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l0 level1 lfo8;tab-stops:list .5in'>Debugging with non-workspace

-     source</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l0 level1 lfo8;tab-stops:list .5in'>Prompting for source (should

-     update associated launch configuration)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l0 level1 lfo8;tab-stops:list .5in'>Binaries without source

-     (attaching during debug session should make source attach for rest of

-     session and future sessions)</li>

-</ul>

-

-<h3>Evaluation {Darin S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l10 level1 lfo9;tab-stops:list .5in'>Debugger</li>

- <ul type=circle>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Local</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Remote</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Display view</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Variables view –

-      using “this” context as selected variable</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Expression view</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Java editor</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Error handling – i.e.

-      expressions with errors</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>In compilation units

-      (i.e .with source)</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Binaries w/wo source</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Inner types/anonymous

-      types</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Array elements</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Code assist</li>

- </ul>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l10 level1 lfo9;tab-stops:list .5in'>Scrapbook</li>

- <ul type=circle>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>JREs</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Working directory</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Use code from pre-req

-      projects</li>

-  <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:

-      auto;mso-list:l10 level2 lfo9;tab-stops:list 1.0in'>Imports</li>

- </ul>

-</ul>

-

-<h3>Console {Joe S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Appearing automatically

-     based on preferences</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Reading Input</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Coloring and fonts</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Navigating from stack traces

-     and Java doc errors to associated types</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Flooding with output</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l4 level1 lfo10;tab-stops:list .5in'>Wrap &amp; non-wrap modes</li>

-</ul>

-

-<h3>Stepping {Joe S}</h3>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Variables

-     appearing/disappearing</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Changing variables (red)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Rapid stepping</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Rapid stepping &amp;

-     showing ‘toString()’</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Hot keys</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Step filters [Could add

-     tests to test suite]</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Primitive display options

-     (preferences in java-&gt; debug -&gt; appearance)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Filter options (preferences

-     java -&gt; debug -&gt; appearance)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Suspending a running

-     program</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Stepping in non-top stack

-     frame</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l11 level1 lfo11;tab-stops:list .5in'>Stepping “thru” breakpoints

-     – i.e. should hit breakpoints when stepping over code with breakpoints</li>

-</ul>

-

-<h2>Presentation</h2>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>All action labels in all

-     menus</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>All tool tips in toolbars</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>F1 help in all views</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>Debug Action groups (turn

-     on/off)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>Debug keyboard navigation</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l9 level1 lfo12;tab-stops:list .5in'>Remembering user settings:

-     prefs, action states etc.</li>

-</ul>

-

-<h2>Memory Leak</h2>

-

-<p>Use &quot;optimize it&quot; to ensure that we free allocated memory for the

-following tasks:</p>

-

-<ul type=disc>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Start/kill debug session</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Open/close snippet editor

-     (and start an evaluation)</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Open close preference pages,

-     views and dialogs</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Open/close perspective</li>

- <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;

-     mso-list:l6 level1 lfo13;tab-stops:list .5in'>Evaluations in debugger</li>

-</ul>

-

-</div>

-

-</body>

-

-</html>

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 38fe47f..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ArgumentsTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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);
-	}	
-}
\ No newline at end of file
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 4779f34..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/Breakpoints.java
+++ /dev/null
@@ -1,161 +0,0 @@
-import java.util.*;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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/CompileError.java b/org.eclipse.jdt.debug.tests/testprograms/CompileError.java
deleted file mode 100644
index 0c7b80d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/CompileError.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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/DropTests.java b/org.eclipse.jdt.debug.tests/testprograms/DropTests.java
deleted file mode 100644
index dc50b00..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/DropTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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");
- 	}
- 
- }
\ No newline at end of file
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 1c98cda..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalArrayTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 b9fd274..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalNestedTypeTests.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 ...");
-					g = g;
-				}
-			}
-			
-			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 ...");
-					g = g;
-				}
-			};
-			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 ...");
-				g = g;
-			}
-			
-		}
-		
-		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 ...");
-					g = g;
-				}
-			}
-			
-			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 ...");
-					g = g;
-				}
-			};
-			
-			BB i_bb= new BB();
-			i_bb.bb();
-			BC i_bc= new BC();
-			i_bc.bc();
-			i_bd.run();
-
-			System.out.println("Tests ...");
-			a = a;
-		}
-	}
-	
-	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 ...");
-					a = a;
-				}
-	
-			}
-			
-			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 ...");
-						a = a;
-					}
-				}
-				
-				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 ...");
-						a = a;
-					}
-				};
-				
-				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 ...");
-					a = a;
-				}
-			}
-			
-			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 ...");
-						a = a;
-					}
-				}
-				
-				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 ...");
-						a = a;
-					}
-				};
-				
-				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 d4c15b2..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalSimpleTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 f0965c3..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeHierarchyTests.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 147ec3f..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvalTypeTests.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 4a5d638..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/EvaluationTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-import java.util.Date;
-import java.util.Vector;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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/GotNewName.java b/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
deleted file mode 100644
index cd7318d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/GotNewName.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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++;
-		}
-	}
-
-}
\ No newline at end of file
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 a8bdb4d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/HitCountException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-import java.util.Vector;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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 ec9ffb8..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/HitCountLooper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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) {
-			}
-		}
-	}
-}
\ No newline at end of file
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 e858a98..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/IBreakpoints.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public interface IBreakpoints {
-	 public abstract void instanceMethod();
- }
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 0290e0e..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/InstanceVariablesTests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-import java.util.Date;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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";
-}
\ No newline at end of file
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 81971fd..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/LocalVariablesTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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()
-
-	}
-}
\ No newline at end of file
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 16e180a..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MethodEntryRunner.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import java.lang.reflect.Method;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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();
-		}
-	}
-	
-}
\ No newline at end of file
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 d96d73d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MethodLoop.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 e942cdc..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-import java.util.Vector;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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 6531af0..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedList.java
+++ /dev/null
@@ -1,53 +0,0 @@
-import java.util.ArrayList;
-import java.util.List;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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 51272fb..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/MultiThreadedLoop.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 b50ef92..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/NativeDropTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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/StaticVariablesTests.java b/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
deleted file mode 100644
index 1fea76d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StaticVariablesTests.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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();
-	}
-}
\ No newline at end of file
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 c084729..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 3ef9a5d..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 fd66528..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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 c3fd0dd..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/TestIO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-import java.io.*;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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 766c4fe..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/ThrowsNPE.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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/WorkingDirectoryTest.java b/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
deleted file mode 100644
index b9f831c..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/WorkingDirectoryTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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/tests/targets/CallLoop.java b/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
deleted file mode 100644
index 75830e0..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/CallLoop.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class CallLoop {
-	public static void main(String[] args) {
-		(new Looper()).loop();
-	}
-}
\ No newline at end of file
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 8d82ede..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncher.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class HelloLauncher {
-	public static void main(String args[]) {
-		for (int i = 0; i < 10; i++) {
-			System.out.println("Hello Launcher");
-		}
-	}
-
-}
\ No newline at end of file
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 609b0ad..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArg.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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");
-			}
-		}
-	}
-
-}
\ No newline at end of file
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 b9404b9..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HelloLauncherWithArgs.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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");
-			}
-		}			
-	}
-
-}
\ No newline at end of file
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 2e8118e..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/HitCountLooper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial 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(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) {
-			}
-		}
-	}
-}
\ No newline at end of file
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 90c8859..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/InfiniteLoop.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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) {
-			}
-		}
-	}
-}
\ No newline at end of file
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 ea58341..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Looper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-public class Looper {
-	public void loop() {
-		int i = 0;
-		while (true) {
-			System.out.println("Loop " + i);
-			i++;
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-}
\ No newline at end of file
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 3f6114b..0000000
--- a/org.eclipse.jdt.debug.tests/testprograms/org/eclipse/debug/tests/targets/Watchpoint.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.debug.tests.targets;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-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/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 dbc0364..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ /dev/null
@@ -1,585 +0,0 @@
-package org.eclipse.jdt.debug.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import junit.framework.TestCase;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugEvent;
-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.jdt.core.IJavaProject;
-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.IJavaTargetPatternBreakpoint;
-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.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;
-
-
- 
-/**
- * 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);
-	}
-	
-	/**
-	 * 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() {
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("DebugTests");
-		return JavaCore.create(project);
-	}
-	
-	/**
-	 * 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);
-		
-		config.launch(getLaunchManager().DEBUG_MODE, null);
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		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 {
-		ILaunchConfiguration config = getLaunchConfiguration(mainTypeName);
-		assertNotNull("Could not locate launch configuration for " + mainTypeName, config);
-		return launchToBreakpoint(config);
-	}
-
-	/**
-	 * 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 Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		config.launch(getLaunchManager().DEBUG_MODE, null);
-
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		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, int timeout) throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration(mainTypeName);
-		assertNotNull("Could not locate launch configuration for " + mainTypeName, config);
-		return launchAndTerminate(config, 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);
-		
-		config.launch(getLaunchManager().DEBUG_MODE, null);
-
-		Object terminatee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		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);
-		
-		config.launch(getLaunchManager().DEBUG_MODE, null);
-
-		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 thread;		
-	}
-	
-	/**
-	 * Resumes the given thread, and waits for another breakpoint-caused suspend event.
-	 * Returns the thread in which the suspend event occurrs.
-	 * 
-	 * @param thread thread to resume
-	 * @return thread in which the first suspend event occurrs
-	 */
-	protected IJavaThread resume(IJavaThread thread) throws Exception {
-		DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
-		waiter.setTimeout(DEFAULT_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 occurrs.
-	 * 
-	 * @param thread thread to resume
-	 * @return thread in which the first suspend event occurrs
-	 */
-	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;
-	}
-	
-	/**
-	 * 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(getJavaProject().getProject(), 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) throws Exception {
-		IJavaLineBreakpoint bp = JDIDebugModel.createLineBreakpoint(getJavaProject().getProject(), typeName, lineNumber, -1, -1, 0, true, null);
-		bp.setCondition(condition);
-		bp.setConditionEnabled(true);
-		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 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 CoreException {
-		return JDIDebugModel.createExceptionBreakpoint(getJavaProject().getProject(),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 CoreException {
-		IJavaWatchpoint wp = JDIDebugModel.createWatchpoint(getJavaProject().getProject(), 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) {
-				ILaunch launch = thread.getLaunch();
-				try {
-					thread.getDebugTarget().terminate();
-				} catch (CoreException e) {
-				} finally {
-					getLaunchManager().removeLaunch(launch);
-				}
-		}
-	}
-	
-	/**
-	 * Terminates the given debug target and removes its launch
-	 */
-	protected void terminateAndRemove(IJavaDebugTarget debugTarget) {
-		if (debugTarget != null) {
-			ILaunch launch = debugTarget.getLaunch();
-			try {
-				debugTarget.getDebugTarget().terminate();
-			} catch (CoreException e) {
-			} finally {
-				getLaunchManager().removeLaunch(launch);
-			}
-		}
-	}
-	
-	/**
-	 * Deletes all existing breakpoints
-	 */
-	protected void removeAllBreakpoints() {
-		IBreakpoint[] bps = getBreakpointManager().getBreakpoints();
-		for (int i = 0; i < bps.length; i++) {
-			try {
-				bps[i].delete();
-			} 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 DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		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 DebugElementKindEventWaiter(DebugEvent.SUSPEND, IJavaThread.class);
-		waiter.setTimeout(DEFAULT_TIMEOUT);
-		
-		frame.stepInto();
-		
-		Object suspendee= waiter.waitForEvent();
-		setEventSet(waiter.getEventSet());
-		assertNotNull("Program did not suspend.", suspendee);
-		return (IJavaThread) suspendee;		
-	}
-
-}
-
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 4313ad8..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.eclipse.jdt.debug.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.Enumeration;
-
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.debug.testplugin.TestPluginLauncher;
-import org.eclipse.jdt.debug.tests.core.BootpathTests;
-import org.eclipse.jdt.debug.tests.core.ClasspathProviderTests;
-import org.eclipse.jdt.debug.tests.core.ConditionalBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.DeferredBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.EventSetTests;
-import org.eclipse.jdt.debug.tests.core.ExceptionBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.HitCountBreakpointsTests;
-import org.eclipse.jdt.debug.tests.core.InstanceVariableTests;
-import org.eclipse.jdt.debug.tests.core.LaunchConfigurationTests;
-import org.eclipse.jdt.debug.tests.core.LocalVariableTests;
-import org.eclipse.jdt.debug.tests.core.MethodBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.PatternBreakpointTests;
-import org.eclipse.jdt.debug.tests.core.ProcessTests;
-import org.eclipse.jdt.debug.tests.core.RuntimeClasspathEntryTests;
-import org.eclipse.jdt.debug.tests.core.SourceLocationTests;
-import org.eclipse.jdt.debug.tests.core.StaticVariableTests;
-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.WatchpointTests;
-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.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.swt.widgets.Display;
-
-/**
- * Test all areas of the UI.
- */
-public class AutomatedSuite 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 AutomatedSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public AutomatedSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.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));
-
-		// This test suite is commented out because it references preferences
-		// in a UI plugin.  This causes the UI plugin to get loaded as soon
-		// as this class is created, resulting in random timing-related
-		// failures in other tests.  
-		//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));
-		
-		// Evaluation tests
-		addTest(new TestSuite(ProjectCreationDecorator.class));		
-		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));
-		
-		// This test suite is commented out because it references preferences
-		// in a UI plugin.  This causes the UI plugin to get loaded as soon
-		// as this class is created, resulting in random timing-related
-		// failures in other tests.  This can be uncommented when bug
-		// 15737 is fixed.		
-		//addTest(new TestSuite(MiscBreakpointsTests.class));
-	}
-	
-	public static void main(String[] args) {
-		TestPluginLauncher.run(TestPluginLauncher.getLocationFromProperties(), AutomatedSuite.class, args);
-	}		
-
-	/**
-	 * 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 e1ead2c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/EvalTestSuite.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-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.testplugin.TestPluginLauncher;
-import org.eclipse.jdt.debug.tests.eval.ArrayAllocationTests;
-import org.eclipse.jdt.debug.tests.eval.ArrayAssignementTests;
-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.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.NestedTypeFieldValue_109;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_134;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_144;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_168;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_192;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_203;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_241;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_268;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_293;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_304;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_343;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_370;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_395;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_406;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_444;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_470;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_495;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_506;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_518;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_54;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_555;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_58;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_581;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_605;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_615;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_653;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_679;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_703;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_713;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_728;
-import org.eclipse.jdt.debug.tests.eval.NestedTypeFieldValue_83;
-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_108_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_135_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_21_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_21_2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_21_3;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_21_4;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_21_5;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_21_6;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_57_1;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_57_2;
-import org.eclipse.jdt.debug.tests.eval.TypeHierarchy_57_3;
-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(ArrayAssignementTests.class));
-		addTest(new TestSuite(ArrayValueTests.class));
-
-		addTest(new TestSuite(NestedTypeFieldValue_54.class));
-		addTest(new TestSuite(NestedTypeFieldValue_58.class));
-		addTest(new TestSuite(NestedTypeFieldValue_83.class));
-		addTest(new TestSuite(NestedTypeFieldValue_109.class));
-		addTest(new TestSuite(NestedTypeFieldValue_134.class));
-		addTest(new TestSuite(NestedTypeFieldValue_144.class));
-		addTest(new TestSuite(NestedTypeFieldValue_168.class));
-		addTest(new TestSuite(NestedTypeFieldValue_192.class));
-		addTest(new TestSuite(NestedTypeFieldValue_203.class));
-		addTest(new TestSuite(NestedTypeFieldValue_241.class));
-		addTest(new TestSuite(NestedTypeFieldValue_268.class));
-		addTest(new TestSuite(NestedTypeFieldValue_293.class));
-		addTest(new TestSuite(NestedTypeFieldValue_304.class));
-		addTest(new TestSuite(NestedTypeFieldValue_343.class));
-		addTest(new TestSuite(NestedTypeFieldValue_370.class));
-		addTest(new TestSuite(NestedTypeFieldValue_395.class));
-		addTest(new TestSuite(NestedTypeFieldValue_406.class));
-		addTest(new TestSuite(NestedTypeFieldValue_444.class));
-		addTest(new TestSuite(NestedTypeFieldValue_470.class));
-		addTest(new TestSuite(NestedTypeFieldValue_495.class));
-		addTest(new TestSuite(NestedTypeFieldValue_506.class));
-		addTest(new TestSuite(NestedTypeFieldValue_518.class));
-		addTest(new TestSuite(NestedTypeFieldValue_555.class));
-		addTest(new TestSuite(NestedTypeFieldValue_581.class));
-		addTest(new TestSuite(NestedTypeFieldValue_605.class));
-		addTest(new TestSuite(NestedTypeFieldValue_615.class));
-		addTest(new TestSuite(NestedTypeFieldValue_653.class));
-		addTest(new TestSuite(NestedTypeFieldValue_679.class));
-		addTest(new TestSuite(NestedTypeFieldValue_703.class));
-		addTest(new TestSuite(NestedTypeFieldValue_713.class));
-		addTest(new TestSuite(NestedTypeFieldValue_728.class));
-
-		addTest(new TestSuite(TypeHierarchy_21_1.class));
-		addTest(new TestSuite(TypeHierarchy_21_2.class));
-		addTest(new TestSuite(TypeHierarchy_21_3.class));
-		addTest(new TestSuite(TypeHierarchy_21_4.class));
-		addTest(new TestSuite(TypeHierarchy_21_5.class));
-		addTest(new TestSuite(TypeHierarchy_21_6.class));
-		addTest(new TestSuite(TypeHierarchy_57_1.class));
-		addTest(new TestSuite(TypeHierarchy_57_2.class));
-		addTest(new TestSuite(TypeHierarchy_57_3.class));
-		addTest(new TestSuite(TypeHierarchy_108_1.class));
-		addTest(new TestSuite(TypeHierarchy_135_1.class));
-		
-		addTest(new TestSuite(TestsNumberLiteral.class));
-
-	}
-	
-	public static void main(String[] args) {
-		TestPluginLauncher.run(TestPluginLauncher.getLocationFromProperties(), EvalTestSuite.class, args);
-	}		
-
-	/**
-	 * 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/ProjectCreationDecorator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
deleted file mode 100644
index e4c765a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jdt.debug.tests;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-
-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.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
-import org.eclipse.jdt.debug.testplugin.JavaTestPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * 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("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");
-	}
-	
-	/**
-	 * Creates a shared lanuch 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());
-		config.doSave();
-	}
-}
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 42810ec..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/BootpathTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests bootpath settings
- */
-public class BootpathTests extends AbstractDebugTest {
-	
-	public BootpathTests(String name) {
-		super(name);
-	}
-
-	public void testDefaultBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		
-		JavaLocalApplicationLaunchConfigurationDelegate delegate = new JavaLocalApplicationLaunchConfigurationDelegate();
-		String[] path = delegate.getBootpath(config);
-		assertNull("Default bootpath should be null", path);
-		
-	}
-	
-	public void testEmptyBootpath() throws Exception {
-		ILaunchConfiguration config = getLaunchConfiguration("Breakpoints");
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-		
-		JavaLocalApplicationLaunchConfigurationDelegate delegate = new JavaLocalApplicationLaunchConfigurationDelegate();
-		String[] path = delegate.getBootpath(wc);
-		assertNotNull("Empty bootpath should be empty array", path);
-		assertEquals("bootpath should be empty", 0, path.length);
-		
-	}
-		
-}
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 c6a215b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ClasspathProviderTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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.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);
-	}
-	
-	
-}
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 cdaa47e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConditionalBreakpointsTests.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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");
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("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");
-		
-		IJavaThread thread= null;
-		try {
-			thread= launchToLineBreakpoint(typeName, bp);
-
-			IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();
-			IVariable var = frame.findVariable("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();
-		}		
-	}
-}
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 a70eddc..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/DeferredBreakpointTests.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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();
-				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 testDisabledBreakpoint() throws Exception {
-		String typeName = "Breakpoints";
-		ILineBreakpoint bp = createLineBreakpoint(52, typeName);
-		bp.setEnabled(false);
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget= launchAndTerminate(typeName, 3000);
-		} 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();
-		}				
-	}
-}
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 7d79838..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/EventSetTests.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 72bb7a4..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ExceptionBreakpointTests.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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.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, 3000);
-			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, 3000);
-			ex.delete();
-		} finally {
-			terminateAndRemove(debugTarget);
-			removeAllBreakpoints();
-		}		
-	}
-	
-	public void testInclusiveScopedException() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setFilters(new String[] {"ThrowsNPE"}, 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);
-			ex.delete();
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testExclusiveScopedException() throws Exception {
-		String typeName = "ThrowsNPE";
-		IJavaExceptionBreakpoint ex = createExceptionBreakpoint("java.lang.NullPointerException", true, false);		
-		ex.setFilters(new String[] {"ThrowsNPE"}, false);
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget = launchAndTerminate(typeName, 3000);
-			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();
-			assertTrue("Should have been suspended at linenumber", frame.getLineNumber() == 35);
-			
-			ex.delete();
-		} 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 b90f2c9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/HitCountBreakpointsTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 = frame.findVariable("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 = frame.findVariable("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 = frame.findVariable("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/InstanceVariableTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
deleted file mode 100644
index c8277f1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/InstanceVariableTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/	
-
-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.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 = frame.findVariable("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 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 = frame.findVariable("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();
-		}		
-	}	
-}
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 785cfe1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LaunchConfigurationTests.java
+++ /dev/null
@@ -1,409 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-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.jdt.debug.tests.AbstractDebugTest;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Tests for launch configurations
- */
-public class LaunchConfigurationTests extends AbstractDebugTest {
-	
-	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());
-	}
-	
-	
-	/**
-	 * 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());
-		 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");
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // 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");
-		 ILaunchConfiguration newHandle = wc.doSave();
-		 assertTrue("Config should no longer exist", !handle.exists());
-		 
-		 // 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());		 
-		 
-		
-	}	
-		
-		
-}
-
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 b52378e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/LocalVariableTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-			stepOver(frame);
-			
-			vars = frame.getLocalVariables();
-			assertEquals("Should be one visible local", 1, vars.length);			
-			assertEquals("Visible var should be 'i1'", "i1", vars[0].getName());
-			
-			stepOver(frame);
-			stepOver(frame);
-			
-			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 = frame.findVariable("i1");
-			assertNotNull("Could not find variable 'i1'", i1);
-			assertEquals("'i1' value should be '0'", target.newValue(0), i1.getValue());
-			
-			IVariable i2 = frame.findVariable("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/MethodBreakpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
deleted file mode 100644
index ab96184..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MethodBreakpointTests.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IVariable;
-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;
-
-/**
- * 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 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, 3000);
-		} 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 = frame.findVariable("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 = frame.findVariable("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();
-		}		
-	}
-}
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 3b2b0e9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MiscBreakpointsTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 thread = null;
-		try {
-			thread= launchAndSuspend(typeName);
-			
-			assertTrue("suspendee was not an IJavaThread", thread instanceof IJavaThread);
-			IJavaThread javaThread = (IJavaThread) thread;
-			int stackLine = javaThread.getTopStackFrame().getLineNumber();
-			assertTrue("line number should be '26', but was " + stackLine, stackLine == 26);
-		
-		} finally {
-			terminateAndRemove(thread);
-			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_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);
-		
-		IJavaThread thread = null;
-		try {
-			thread= launchAndSuspend(typeName);
-			
-			assertTrue("suspendee was not an IJavaThread", thread instanceof IJavaThread);
-			IJavaThread javaThread = (IJavaThread) thread;
-			int stackLine = javaThread.getTopStackFrame().getLineNumber();
-			assertTrue("line number should be '3', but was " + stackLine, stackLine == 3);
-		
-		} finally {
-			terminateAndRemove(thread);
-			removeAllBreakpoints();
-		}		
-	}
-
-	public void testDontSuspendOnCompilationErrors() throws Exception {
-		String typeName = "CompileError";
-		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);
-		
-		IJavaDebugTarget debugTarget = null;
-		try {
-			debugTarget= launchAndTerminate(typeName, 3000);
-		} 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, 3000);
-		} 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 96559ed..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/PatternBreakpointTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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.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();
-				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/ProcessTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
deleted file mode 100644
index 7344513..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ProcessTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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/RuntimeClasspathEntryTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
deleted file mode 100644
index ca2e01d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/RuntimeClasspathEntryTests.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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());
-		}
-		assertEquals("there is one system lib", 1, libs.length);
-		
-	}	
-	
-	/**
-	 * Tests that a project can be lanuched 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();
-//		}
-//	}	
-	
-}
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 bf20272..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SourceLocationTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import java.io.File;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.debug.tests.AbstractDebugTest;
-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;
-
-/**
- * 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]);
-	}
-}
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 85c5391..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StaticVariableTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 = frame.findVariable("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 e57c66f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 = stepInto(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 = stepInto(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 = stepInto(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();
-		}				
-	}	
-
-	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/SuspendVMBreakpointsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
deleted file mode 100644
index 5fac810..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/SuspendVMBreakpointsTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 f74fe22..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/TargetPatternBreakpointTests.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-
-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();
-				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();
-			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 boolean breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {
-		return true;
-	}
-
-	/**
-	 * @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 boolean installingBreakpoint(
-		IJavaDebugTarget target,
-		IJavaBreakpoint breakpoint,
-		IJavaType type) {
-		return true;
-	}
-
-	/**
-	 * @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 84dbeac..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ThreadFilterBreakpointsTests.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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/WatchpointTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
deleted file mode 100644
index 8f1c2fd..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/WatchpointTests.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.eclipse.jdt.debug.tests.core;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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, 3000);
-		} 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 = frame.findVariable("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();
-		}		
-	}	
-}
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 3f9e01d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAllocationTests.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java
deleted file mode 100644
index bde5de2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayAssignementTests.java
+++ /dev/null
@@ -1,707 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 ArrayAssignementTests extends Tests {
-
-	public ArrayAssignementTests(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 8bc40b1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayInitializationTests.java
+++ /dev/null
@@ -1,517 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 db5d335..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ArrayValueTests.java
+++ /dev/null
@@ -1,627 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 198ff8b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 334b585..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/BooleanOperatorsTests.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 58fc31a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 89adf11..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ByteOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 f71b73f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 00086a8..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/CharOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 ac3788c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,2107 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 a43438a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/DoubleOperatorsTests.java
+++ /dev/null
@@ -1,1991 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 60d8bea..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 df1ece6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,2107 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 17ed861..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/FloatOperatorsTests.java
+++ /dev/null
@@ -1,1991 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 cbc3402..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 0f1a2eb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/IntOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 a089241..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarAssignmentTests.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 7d9a680..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LocalVarValueTests.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 00b3384..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 7c36dba..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/LongOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java
deleted file mode 100644
index 89ef0bf..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_109.java
+++ /dev/null
@@ -1,917 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_109 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_109(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java
deleted file mode 100644
index 348b940..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_134.java
+++ /dev/null
@@ -1,917 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_134 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_134(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java
deleted file mode 100644
index 40f53d6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_144.java
+++ /dev/null
@@ -1,1106 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_144 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_144(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java
deleted file mode 100644
index 68ee580..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_168.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_168 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_168(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java
deleted file mode 100644
index ffdbbda..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_192.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_192 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_192(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 3c805a5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_203.java
+++ /dev/null
@@ -1,980 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_203 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_203(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java
deleted file mode 100644
index d4fbbae..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_241.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_241 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_241(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java
deleted file mode 100644
index a1dbf26..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_268.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_268 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_268(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java
deleted file mode 100644
index a7582f5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_293.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_293 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_293(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 b05760b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_304.java
+++ /dev/null
@@ -1,1211 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_304 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_304(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java
deleted file mode 100644
index 3ecade9..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_343.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_343 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_343(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java
deleted file mode 100644
index 1430636..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_370.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_370 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_370(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java
deleted file mode 100644
index 7b7320a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_395.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_395 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_395(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalNestedTypeTests", 206, 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 d6eb20b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_406.java
+++ /dev/null
@@ -1,854 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_406 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_406(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java
deleted file mode 100644
index 21994db..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_444.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_444 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_444(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java
deleted file mode 100644
index 1a784ed..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_470.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_470 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_470(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java
deleted file mode 100644
index 1c4be8b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_495.java
+++ /dev/null
@@ -1,812 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_495 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_495(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 220a5de..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_506.java
+++ /dev/null
@@ -1,854 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_506 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_506(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java
deleted file mode 100644
index 3c09bf6..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_518.java
+++ /dev/null
@@ -1,1106 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_518 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_518(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java
deleted file mode 100644
index 496c449..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_54.java
+++ /dev/null
@@ -1,1064 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_54 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_54(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java
deleted file mode 100644
index ad02330..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_555.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_555 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_555(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java
deleted file mode 100644
index 74c3e64..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_58.java
+++ /dev/null
@@ -1,875 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_58 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_58(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java
deleted file mode 100644
index 6ad5579..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_581.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_581 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_581(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java
deleted file mode 100644
index 8a96c83..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_605.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_605 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_605(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java
deleted file mode 100644
index fe7884b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_615.java
+++ /dev/null
@@ -1,686 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_615 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_615(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java
deleted file mode 100644
index de06e89..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_653.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_653 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_653(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java
deleted file mode 100644
index 1819132..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_679.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_679 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_679(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java
deleted file mode 100644
index 13b3c0a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_703.java
+++ /dev/null
@@ -1,665 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_703 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_703(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java
deleted file mode 100644
index f5f44d2..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_713.java
+++ /dev/null
@@ -1,686 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_713 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_713(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java
deleted file mode 100644
index f4c8a19..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_728.java
+++ /dev/null
@@ -1,1043 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_728 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_728(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java
deleted file mode 100644
index 3b1477a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NestedTypeFieldValue_83.java
+++ /dev/null
@@ -1,1169 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 NestedTypeFieldValue_83 extends Tests {
-	/**
-	 * Constructor for NestedTypeFieldValue.
-	 * @param name
-	 */
-	public NestedTypeFieldValue_83(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 e28c673..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/NumericTypesCastTests.java
+++ /dev/null
@@ -1,1075 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 : ", ( byte) 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 : ", ( byte) yByteValue, byteValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( char) 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 : ", ( char) yCharValue, charValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( short) 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 : ", ( short) yByteValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( short) 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 : ", ( short) yShortValue, shortValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( int) 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 : ", ( int) yByteValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( int) 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 : ", ( int) yCharValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( int) 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 : ", ( int) yShortValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( int) 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 : ", ( int) yIntValue, intValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( long) 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 : ", ( long) yByteValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( long) 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 : ", ( long) yCharValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( long) 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 : ", ( long) yShortValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( long) 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 : ", ( long) yIntValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( long) 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 : ", ( long) yLongValue, longValue);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( float) 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 : ", ( float) yByteValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( float) 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 : ", ( float) yCharValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( float) 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 : ", ( float) yShortValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( float) 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 : ", ( float) yIntValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( float) 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 : ", ( float) yLongValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( float) 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 : ", ( float) yFloatValue, floatValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yByteValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yCharValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yShortValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yIntValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yLongValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yFloatValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 : ", ( double) 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 : ", ( double) yDoubleValue, doubleValue, 0);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 f1c3971..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedFieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 3338a58..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 aab4d25..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/QualifiedStaticFieldValueTests2.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 6dd9909..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortAssignmentOperatorsTests.java
+++ /dev/null
@@ -1,3889 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 78f2397..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/ShortOperatorsTests.java
+++ /dev/null
@@ -1,2656 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 2394f84..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 08a4b24..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StaticFieldValueTests2.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 1c0075a..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusAssignmentOpTests.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 106ba2b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/StringPlusOpTests.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 7755993..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/Tests.java
+++ /dev/null
@@ -1,509 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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.core.dom.Message;
-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 = (long)-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 = (long)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 = (long)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;
-			}
-			
-			public boolean evaluationTimedOut(IJavaThread thread) {
-				return true;
-			}
-		};
-		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= "";
-				Message[] messages= result.getErrors();
-				for (int i= 0, limit= messages.length; i < limit; i++) {
-					message += messages[i].getMessage() + ", ";
-				}
-			} 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();
-			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 ae698a7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsArrays.java
+++ /dev/null
@@ -1,424 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java
deleted file mode 100644
index 720612d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes.java
+++ /dev/null
@@ -1,1253 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 TestsNestedTypes extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNestedTypes(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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 d117a6e..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes1.java
+++ /dev/null
@@ -1,560 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 fc96d73..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNestedTypes2.java
+++ /dev/null
@@ -1,434 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 6b9deb1..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsNumberLiteral.java
+++ /dev/null
@@ -1,813 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TestsNumberLiteral extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TestsNumberLiteral(String name) {
-		super(name);
-	}
-
-	public void init() throws Exception {
-		initializeFrame("EvalSimpleTests", 15, 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 f659213..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators1.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 62e24cb..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsOperators2.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 abd168f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy1.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 84bcab7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TestsTypeHierarchy2.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java
deleted file mode 100644
index 9375fb4..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_108_1.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_108_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_108_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java
deleted file mode 100644
index 40c29f7..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_135_1.java
+++ /dev/null
@@ -1,904 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_135_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_135_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java
deleted file mode 100644
index 457a9ca..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java
deleted file mode 100644
index a45fe93..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java
deleted file mode 100644
index 351ba71..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java
deleted file mode 100644
index 12e804c..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_4.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_4 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java
deleted file mode 100644
index ad9a98d..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_5.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_5 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java
deleted file mode 100644
index e0c2770..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_21_6.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_21_6 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_21_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java
deleted file mode 100644
index 00708ef..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_1.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_57_1 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_57_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java
deleted file mode 100644
index 55c2db5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_2.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_57_2 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_57_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} finally {;
-		end();
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java
deleted file mode 100644
index 76ddaf0..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/TypeHierarchy_57_3.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-
-public class TypeHierarchy_57_3 extends Tests {
-	/**
-	 * Constructor for TypeHierarchy.
-	 * @param name
-	 */
-	public TypeHierarchy_57_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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 15e1dc5..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/XfixOperatorsTests.java
+++ /dev/null
@@ -1,977 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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);
-		} catch (Throwable e) {
-		e.printStackTrace(); throw e;
-		} 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 4c9793f..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/NestedTypeTestGenerator.java
+++ /dev/null
@@ -1,800 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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, 54, 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, 58, 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, 83, 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, 109, 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, 134, 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, 144, 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, 168, 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, 192, 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, 203, 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, 241, 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, 268, 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, 293, 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, 304, 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, 343, 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, 370, 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, 395, 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, 406, 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, 444, 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, 470, 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, 495, 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, 506, 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, 518, 2);
-	}
-
-	public static void gen_EB_eb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 555, 4);
-	}
-
-	public static void gen_EC_ec() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 581, 4);
-	}
-
-	public static void gen_ED_ed() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 605, 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, 615, 3);
-	}
-	
-	public static void gen_FB_fb() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 653, 4);
-	}
-
-	public static void gen_FC_fc() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 679, 4);
-	}
-
-	public static void gen_FD_fd() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTest('b', 2, code);
-		createTestsStaticFields(code);
-		
-		createJavaFile(code, 703, 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, 713, 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, 728, 2);
-	}
-	
-	public static void gen_main() throws Exception {
-		StringBuffer code= new StringBuffer();
-		
-		createTestsStaticFields(code);
-
-		createJavaFile(code, 734, 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("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 1abf9dd..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/OtherTestsGenerator.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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);
-	}
-
-	public static void genTestsTypeHierarchy2() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		TypeHierarchyTestsGenerator.createTest_TestC(code, TypeHierarchyTestsGenerator.CC);
-		
-		createJavaFile(code, "TestsTypeHierarchy2", "EvalTypeHierarchyTests",   119, 2, 1);
-	}
-
-	/**
-	 * 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", 5, 1, 1);
-	}
-
-	/**
-	 * Method createTestNumberLiteral.
-	 */
-	private static void createTestNumberLiteral1(String literal, int type, StringBuffer code) {
-		String tName= typeName[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= typeName[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 {
-		
-		StringBuffer code= new StringBuffer();
-		
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n\n");
-		code.append("/**********************************************************************\n");
-		code.append("Copyright (c) 2000, 2002 IBM Corp. 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 Common Public License v0.5\n");
-		code.append("which accompanies this distribution, and is available at\n");
-		code.append("http://www.eclipse.org/legal/cpl-v05.html\n\n");
-		code.append("Contributors:\n");
-		code.append("    IBM Corporation - Initial implementation\n");
-		code.append("*********************************************************************/\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 " + 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 6036f4b..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TestGenerator.java
+++ /dev/null
@@ -1,1395 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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[] typeName = 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[] variable = new String[] {"xVar", "yVar", "xArray", "yArray"};
-	
-	static final String[] field = new String[] {"xField", "yField", "xStaticField", "yStaticField"};
-
-	static final String[] prefixList = new String[] {"foo.", "EvalTypeTests.", ""};
-
-	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, 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, code);
-	}
-	
-	public static void genTestsStringPlusOpAllTypes() throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StringPlusOpTests";
-		
-		code.append("\t// " + typeName[T_String] + " " + opSymbol[Op_plus] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_String] + ", " + typeName[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, 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, 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, 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, code);
-
-	}
-
-	public static void genTestsBooleanAllAssignmentOpsBoolean() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "BooleanAssignmentOperatorsTests";
-		
-		code.append("\t// " + typeName[T_boolean] + " " + opSymbol[Op_orAss] + " " + typeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_orAss, T_boolean, code);
-		
-		code.append("\t// " + typeName[T_boolean] + " " + opSymbol[Op_andAss] + " " + typeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_andAss, T_boolean, code);
-		
-		code.append("\t// " + typeName[T_boolean] + " " + opSymbol[Op_xorAss] + " " + typeName[T_boolean] + "\n" +
-					"\n");
-		genTestTypeAssignmentOpType(T_boolean, Op_xorAss, T_boolean, code);
-		
-		createJavaFile(className, "EvalSimpleTests", 37, 1, code);
-	}
-	
-	public static void genTestsStringPlusAssignmentOpAllTypes() throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		String className = "StringPlusAssignmentOpTests";
-		
-		code.append("\t// " + typeName[T_String] + " " + opSymbol[Op_plusAss] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_String] + ", " + typeName[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, 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, 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, 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, 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, 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, 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, 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, code);
-
-		className = "StaticFieldValueTests2";
-		
-		createJavaFile(className, "EvalTypeTests", 67, 2, 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, code);
-	}
-		
-	public static void genTestsArrayAssignment() throws Exception {
-		StringBuffer code = new StringBuffer();
-		
-		String className = "ArrayAssignementTests";
-		
-		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, 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, 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, code);
-	}
-	//----------------------------
-	
-	public static void genTestsNumericTypeArithmeticOpNumericTypes(int type, int op, StringBuffer code) {
-		
-		code.append("\t// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[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// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[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// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[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// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[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// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[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// " + typeName[type] + " " + opSymbol[op] + " {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[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// (" + typeName[type] + ") {" + typeName[T_byte] + ", " + typeName[T_char] + ", " + typeName[T_short] + ", " + typeName[T_int] + ", " + typeName[T_long] + ", " + typeName[T_float] + ", " + typeName[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] + "} " + typeName[type] + "\n" +
-					"\t// " + typeName[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// " + typeName[type] + " " + opSymbol[op] + " " + typeName[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 = typeName[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] + " " + typeName[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" + variable[0], type1, Op_equal, variable[0] + t1UName + "Value", true, code);
-		genCodeSetTmp("tmp" + variable[0], type1, op, immediate[0] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 0, 0, true, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + variable[0], type1, op, immediate[1] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 0, 1, false, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + variable[1], type1, Op_equal, variable[1] + t1UName + "Value", true, code);
-		genCodeSetTmp("tmp" + variable[1], type1, op, immediate[0] + t2UName + "Value", false, code);
-		genCodeAssignmentOp(type1, op, type2, 1, 0, false, code);
-		code.append("\n");
-		genCodeSetTmp("tmp" + variable[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 = typeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = typeName[type2];
-		String t2UName = typeUpperName[type2];
-		String resName = typeName[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String resName = typeName[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 = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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 = typeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = typeName[type2];
-		String t2UName = typeUpperName[type2];
-		String oName = opName[op];
-		String vName = variable[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 = typeName[type1];
-		String t1UName = typeUpperName[type1];
-		String t2Name = typeName[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, "( " + t1Name + ") " + iName + t2UName + "Value", first, code);
-		} else {
-			genCodeReturnValueCheckPrimitiveType("(" + t1Name + ") " + t2Name, t1Name, t1UName, "( " + t1Name + ") " + iName + t2UName + "Value", first, code);
-		}
-	}
-	
-	public static void genCodePrefixOp(int type, int op, int var, boolean first, StringBuffer code) {
-		String tName = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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 = typeName[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 = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[var];
-
-		genCodeEval(vName + tUName + " + \".length\"", first, code);
-		genCodeReturnTypeCheck(tName + " array length", typeName[T_int], first,code);
-		genCodeReturnValueCheckPrimitiveType(tName + " array length", typeName[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 = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String charUName = typeUpperName[T_char];
-		String vName = variable[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 = typeName[type];
-		String tUName = typeUpperName[type];
-		String vName = variable[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)? typeName[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} catch (Throwable e) {\n\t\te.printStackTrace(); throw e;\n\t\t} finally {;\n\t\tend();\n\t\t}\n");
-	}
-
-	//------------------------------
-
-	public static void createJavaFile(String className, String testClass, int breakPointLine, int frameNumber, StringBuffer tests) throws Exception {
-		
-		StringBuffer code = new StringBuffer();
-		
-		code.append("package org.eclipse.jdt.debug.tests.eval;\n" +
-					"import junit.framework.Test;\n" +
-					"import junit.framework.TestSuite;\n" +
-					"import org.eclipse.core.resources.ResourcesPlugin;\n" +
-					"import org.eclipse.debug.core.model.IValue;\n" +
-					"import org.eclipse.jdt.core.JavaCore;\n" +
-					"import org.eclipse.jdt.debug.core.IJavaDebugTarget;\n" +
-					"import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;\n" +
-					"import org.eclipse.jdt.internal.debug.core.model.JDIObjectValue;\n" +
-					"\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 1201b32..0000000
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/eval/generator/TypeHierarchyTestsGenerator.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package org.eclipse.jdt.debug.tests.eval.generator;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-*********************************************************************/
-
-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 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()" };
-		
-	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};
-
-	static int[] instanceLevel= new int[] {
-		0, 1, 2, 0, 1, 2, 1, 2, 1, 2,
-		2, 2, 0, 1, 2};
-		
-	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, 135, 1, 1);
-	}
-	
-	public static void gen_aa_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AA);
-		
-		createJavaFile(code, 21, 2, 1);
-	}
-
-	public static void gen_ab_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AB);
-		
-		createJavaFile(code, 21, 2, 2);
-	}
-
-	public static void gen_ac_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, AC);
-		
-		createJavaFile(code, 21, 2, 3);
-	}
-
-	public static void gen_bb_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, BB);
-		
-		createJavaFile(code, 21, 2, 4);
-	}
-
-	public static void gen_bc_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, BC);
-		
-		createJavaFile(code, 21, 2, 5);
-	}
-
-	public static void gen_cc_testA() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestA(code, CC);
-		
-		createJavaFile(code, 21, 2, 6);
-	}
-
-	public static void gen_bb_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, BB);
-		
-		createJavaFile(code, 57, 2, 1);
-	}
-
-	public static void gen_bc_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, BC);
-		
-		createJavaFile(code, 57, 2, 2);
-	}
-
-	public static void gen_cc_testB() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestB(code, CC);
-		
-		createJavaFile(code, 57, 2, 3);
-	}
-
-	public static void gen_cc_testC() throws Exception {
-		StringBuffer code= new StringBuffer();
-
-		createTest_TestC(code, CC);
-		
-		createJavaFile(code, 108, 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);
-	}
-
-	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);
-	}
-
-	//-------------
-
-	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("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 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.ui/.classpath b/org.eclipse.jdt.debug.ui/.classpath
deleted file mode 100644
index c72c1d1..0000000
--- a/org.eclipse.jdt.debug.ui/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="ui"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.compare"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.launching"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.eclipse.search"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.eclipse.jdt.debug.ui/.cvsignore b/org.eclipse.jdt.debug.ui/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/org.eclipse.jdt.debug.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/.options b/org.eclipse.jdt.debug.ui/.options
deleted file mode 100644
index 10e4c0e..0000000
--- a/org.eclipse.jdt.debug.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
- org.eclipse.jdt.debug.ui/debug=true
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/.project b/org.eclipse.jdt.debug.ui/.project
deleted file mode 100644
index 4dbec86..0000000
--- a/org.eclipse.jdt.debug.ui/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.jdt.debug.ui</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.compare</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.resources</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.debug.core</project>

-		<project>org.eclipse.debug.ui</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.search</project>

-		<project>org.eclipse.swt</project>

-		<project>org.eclipse.ui</project>

-	</projects>

-	<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.ui/about.html b/org.eclipse.jdt.debug.ui/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.debug.ui/about.html
+++ /dev/null
@@ -1,30 +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>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org 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
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/build.properties b/org.eclipse.jdt.debug.ui/build.properties
deleted file mode 100644
index 113c956..0000000
--- a/org.eclipse.jdt.debug.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = icons/,\

-               plugin.xml,\

-               plugin.properties,\

-               *.jar,\

-			   .options,\

-			   about.html

-

-src.includes=about.html

-

-source.jdiui.jar = ui/

diff --git a/org.eclipse.jdt.debug.ui/doc/hglegal.htm b/org.eclipse.jdt.debug.ui/doc/hglegal.htm
deleted file mode 100644
index d9e453f..0000000
--- a/org.eclipse.jdt.debug.ui/doc/hglegal.htm
+++ /dev/null
@@ -1,13 +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">

-   <title>Legal Notices</title>

-</head>

-<body>

-

-<h3>

-<a NAME="Notices"></a>Notices</h3>

-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.

-</body>

-</html>

diff --git a/org.eclipse.jdt.debug.ui/doc/ngibmcpy.gif b/org.eclipse.jdt.debug.ui/doc/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/org.eclipse.jdt.debug.ui/doc/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui.html b/org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui.html
deleted file mode 100644
index 4ceb1eb..0000000
--- a/org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui.html
+++ /dev/null
@@ -1,32 +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">
-<title>README Java Debug User Interface Extension Points</title>
-</head>
-
-<body link="#0000FF" vlink="#800080">
-
-<h1 align="center">Java Debug User-Interface</h1>
-
-<p>The Java debug UI plug-in, <b>org.eclipse.jdt.debug.ui</b>, implements a
-Java debug user-interface, allowing the user to launch and manipulate Java virtual
-machines, threads, stack frames, and variables. It provides Java specific actions to
-support Java breakpoints, expession evaluation, etc. <br>
-</p>
-
-<hr>
-
-<h1>Extension Points</h1>
-
-<p>The following extension points are used to support and extend the Java debug UI.: 
-
-<ul>
-  <li><a href="org_eclipse_jdt_debug_ui_vmInstallTypePage.html">org.eclipse.jdt.debug.ui.vmInstallTypePage</a></li>
-</ul>
-
-<p><a href="hglegal.htm"><img src="ngibmcpy.gif" alt="Copyright IBM Corp. 2000, 2001. All Rights Reserved."
-border="0" width="195" height="12"></a></p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui_vmInstallTypePage.html b/org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui_vmInstallTypePage.html
deleted file mode 100644
index 2c27331..0000000
--- a/org.eclipse.jdt.debug.ui/doc/org_eclipse_jdt_debug_ui_vmInstallTypePage.html
+++ /dev/null
@@ -1,64 +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">
-<title>README VM Install Type Page</title>
-</head>
-
-<body link="#0000FF" vlink="#800080">
-
-<h1 align="center">VM Install Type UI Page</h1>
-
-<p><b><i>Identifier: </i></b>org.eclipse.jdt.debug.ui.vmInstallTypePage</p>
-
-<p><b><i>Description: </i></b>This extension point provides a
-mechanism for contributing UI that will appear in the JRE tab of
-the launch configuration dialog.  The UI is shown only when a VM
-of the specified install type is selected in the JRE tab.</p>
-
-<p><b><i>Configuration Markup:</i></b> </p>
-
-<pre>
-<tt>&nbsp;&nbsp; &lt;!ELEMENT vmInstallTypePage</tt>&gt;
-<tt>&nbsp;&nbsp; &lt;!ATTLIST vmInstallTypePage</tt> 
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CDATA #REQUIRED</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; vmInstallTypeID&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CDATA #REQUIRED</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CDATA #REQUIRED</tt>
-</pre>
-
-<ul>
-<li><code>id</code> specifies a unique identifier for this vm install type UI page.</li>
-<li><code>vmInstallTypeID</code> specifies VM install type that this UI page is 
- applicable to (corresponds to the id of a VM install type).</li>
-<li><code>class</code> specifies a fully qualified name of a Java class
- that implements <code>ILaunchConfigurationTab</code>.</li>
-</ul>
-
-<p><b><i>Examples:</i></b> </p>
-
-<p>The following is an example of a VM install type page extension point: </p>
-
-<pre>
-&lt;extension point="org.eclipse.jdt.debug.ui.vmInstallTypePage"&gt;
-  &lt;vmInstallTypePage 
-     id="com.example.ExampleVMInstallTypePage"
-     vmInstallTypeID="com.example.ExampleVMInstallTypeIdentifier"
-     class="com.example.ExampleVMInstallTypePage"
-  &lt;/vmInstallTypePage&gt;
-&lt;/extension&gt;
-</pre>
-<p>In the above example, the contributed page will be shown in the JRE tab of the launch
-configuration dialog whenever the currently selected JRE has a VM Install type identifier
-of <code>com.example.ExampleVMInstallTypeIdentifier</code>.
-</p>
-
-<p><b><i>API Information: </i></b>Value of the attribute <b>class</b> must be a fully
-qualified name of a Java class that implements the interface <b>
-org.eclipse.debug.ui.ILaunchConfigurationTab</b>.
-</p>
-
-<p><a href="hglegal.htm"><img src="ngibmcpy.gif" alt="Copyright IBM Corp. 2000, 2001. All Rights Reserved."
-border="0" width="195" height="12"></a></p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/clear_co.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/clear_co.gif
deleted file mode 100644
index 2558326..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/clear_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/exc_catch.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/exc_catch.gif
deleted file mode 100644
index e6cb8b1..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/exc_catch.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/final_co.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/final_co.gif
deleted file mode 100644
index 9528145..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/final_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/runtoline_co.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/runtoline_co.gif
deleted file mode 100644
index a5a56e3..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/runtoline_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/sethitcount_co.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/sethitcount_co.gif
deleted file mode 100644
index 6f65a07..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/sethitcount_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/static_co.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/static_co.gif
deleted file mode 100644
index f4d0e29..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/static_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/clcl16/stepfilter_co.gif b/org.eclipse.jdt.debug.ui/icons/full/clcl16/stepfilter_co.gif
deleted file mode 100644
index 7bea8b8..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/clcl16/stepfilter_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_exc.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_exc.gif
deleted file mode 100644
index 3052a80..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_exc.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_java_app.gif
deleted file mode 100644
index 8bc6915..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/debug_java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/disp_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/disp_sbook.gif
deleted file mode 100644
index f9fb6b0..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/disp_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/insp_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/insp_sbook.gif
deleted file mode 100644
index 2b645a8..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/insp_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/java_app.gif
deleted file mode 100644
index 04add8a..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/java_attach.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/java_attach.gif
deleted file mode 100644
index 03085f3..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/java_attach.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_exc.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_exc.gif
deleted file mode 100644
index 8174dad..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_exc.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_java_app.gif
deleted file mode 100644
index 778f9cb..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_sbook.gif
deleted file mode 100644
index 95d53e4..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/run_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ctool16/term_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/ctool16/term_sbook.gif
deleted file mode 100644
index d47876f..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ctool16/term_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/cview16/variable_tab.gif b/org.eclipse.jdt.debug.ui/icons/full/cview16/variable_tab.gif
deleted file mode 100644
index 8670a38..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/cview16/variable_tab.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/clear_co.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/clear_co.gif
deleted file mode 100644
index d873c49..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/clear_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.gif
deleted file mode 100644
index cec357c..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/exc_catch.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.gif
deleted file mode 100644
index d75db8a..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/final_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/runtoline_co.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/runtoline_co.gif
deleted file mode 100644
index 786a245..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/runtoline_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.gif
deleted file mode 100644
index a388185..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/sethitcount_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.gif
deleted file mode 100644
index a98320d..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/static_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/stepfilter_co.gif b/org.eclipse.jdt.debug.ui/icons/full/dlcl16/stepfilter_co.gif
deleted file mode 100644
index 2eeec86..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dlcl16/stepfilter_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_java_app.gif
deleted file mode 100644
index 04e38d4..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/debug_java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.gif
deleted file mode 100644
index d2d6592..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/disp_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.gif
deleted file mode 100644
index 27b96a7..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/insp_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.gif
deleted file mode 100644
index 9549dd8..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.gif
deleted file mode 100644
index 12ca5d2..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/java_attach.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_java_app.gif
deleted file mode 100644
index 8b8b591..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.gif
deleted file mode 100644
index a38e4ad..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/run_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.gif
deleted file mode 100644
index bf15460..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/dtool16/term_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/clear_co.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/clear_co.gif
deleted file mode 100644
index 6faf8d6..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/clear_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.gif
deleted file mode 100644
index 3a63aae..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/exc_catch.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.gif
deleted file mode 100644
index fdf0285..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/final_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.gif
deleted file mode 100644
index 2ec7178..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/runtoline_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.gif
deleted file mode 100644
index fcc14f7..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/sethitcount_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.gif
deleted file mode 100644
index 5dcfd34..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/static_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/elcl16/stepfilter_co.gif b/org.eclipse.jdt.debug.ui/icons/full/elcl16/stepfilter_co.gif
deleted file mode 100644
index 0500895..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/elcl16/stepfilter_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_java_app.gif
deleted file mode 100644
index 2dbceee..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/debug_java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.gif
deleted file mode 100644
index 3bcafea..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.gif
deleted file mode 100644
index bcd5f22..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/insp_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.gif
deleted file mode 100644
index 4003dfa..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.gif
deleted file mode 100644
index 0e47bd0..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/java_attach.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_java_app.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_java_app.gif
deleted file mode 100644
index 1d1e2bb..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_java_app.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.gif
deleted file mode 100644
index 924a2cc..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/run_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.gif b/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.gif
deleted file mode 100644
index 37f8d22..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/etool16/term_sbook.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.gif
deleted file mode 100644
index afcf4b8..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/brkpi_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.gif
deleted file mode 100644
index 1da9a26..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexception_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.gif
deleted file mode 100644
index 13da640..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jexceptiond_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.gif
deleted file mode 100644
index 701bbb5..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jrtexception_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.gif
deleted file mode 100644
index a162c17..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.gif
deleted file mode 100644
index 549c6b7..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/jsbook_run_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj.gif
deleted file mode 100644
index 793b189..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj_disabled.gif
deleted file mode 100644
index d9c0c91..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/read_obj_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.gif
deleted file mode 100644
index 0b1184d..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif
deleted file mode 100644
index 8eba2e1..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/readwrite_obj_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj.gif
deleted file mode 100644
index b5fa352..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj_disabled.gif
deleted file mode 100644
index c4f8b8b..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/obj16/write_obj_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.gif
deleted file mode 100644
index 725b4fa..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.gif
deleted file mode 100644
index 6f709d1..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/caught_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.gif
deleted file mode 100644
index 7c3e9f0..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif
deleted file mode 100644
index ea88a6a..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/conditional_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.gif
deleted file mode 100644
index 7227afd..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.gif
deleted file mode 100644
index 7dd73bd..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/entry_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.gif
deleted file mode 100644
index 8612eaf..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/error_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.gif
deleted file mode 100644
index 76ee4bc..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.gif
deleted file mode 100644
index c3f4563..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/exit_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.gif
deleted file mode 100644
index 7f4a31e..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif
deleted file mode 100644
index 9325bc1..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/installed_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.gif
deleted file mode 100644
index 1a86046..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.gif
deleted file mode 100644
index bfce68c..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/scoped_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.gif
deleted file mode 100644
index 7880cf7..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.gif
deleted file mode 100644
index b40c449..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/uncaught_ovr_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.gif b/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.gif
deleted file mode 100644
index 3af228c..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/ovr16/warning_co.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.gif b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.gif
deleted file mode 100644
index 8d425d5..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_app_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.gif b/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.gif
deleted file mode 100644
index 544efda..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/java_attach_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.gif b/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.gif
deleted file mode 100644
index c1bb507..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/library_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.gif b/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.gif
deleted file mode 100644
index ac4e38a..0000000
--- a/org.eclipse.jdt.debug.ui/icons/full/wizban/newsbook_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/plugin.properties b/org.eclipse.jdt.debug.ui/plugin.properties
deleted file mode 100644
index fd06027..0000000
--- a/org.eclipse.jdt.debug.ui/plugin.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial implementation

-######################################################################

-

-pluginName=JDI Debug UI

-

-accessAction.label=&Access

-

-AddBreakpoint.label=Add/Remove &Breakpoint

-

-breakpointPropertiesAction.label=P&roperties...

-

-caughtAction.label=&Caught

-

-debugAction.label=&Debug...

-debugAction.tooltip=Debug

-

-debugSourcePageName=Debugger Source Lookup

-

-Display.label=Displa&y@Ctrl+D

-Display.tooltip=Display Result of Evaluating Selected Text

-

-displayViewName=Display

-

-dropFrameAction.label=&Drop to Frame

-dropFrameAction.tooltip=Drop Current Stack Frame

-

-EnableBreakpoint.label=T&oggle Breakpoint

-

-entryAction.label=Entr&y

-

-exceptionAction.label=Add Java Exception Breakpoint

-exceptionAction.accel.label=Add Java E&xception Breakpoint

-exceptionAction.tooltip=Add Java Exception Breakpoint

-

-execArgPageName=Execution Arguments

-

-exitAction.label=E&xit

-

-hitCount.label=&Hit Count

-

-Inspect.label=Insp&ect@Ctrl+Q

-Inspect.tooltip=Inspect Result of Evaluating Selected Text

-

-installJREPageName=Installed JREs

-

-snippetEditorPageName=Scrapbook Runtime

-

-JavaBreakpointProperties.label=Breakpoint P&roperties...

-

-javaDebugPrefName=Debug

-

-JavaSnippetEditor.label= Scrapbook

-

-javaStepFilterPrefName=Step Filtering

-javaDebugAppearancePrefName=Appearance

-

-JDTDebugActionSet.label=Java Debug

-

-LauncherPropertyPage.name=Launcher

-

-ManageBreakpointAction.label=Add/Remove Brea&kpoint@Ctrl+Shift+B

-

-manageMethodBreakpointAction.label=Add/Remove &Method Breakpoint

-

-manageWatchpointAction.label=Add/Remove &Watchpoint

-

-modificationAction.label=&Modification

-

-openDeclType.label=&Declaring Type

-openDeclType.tooltip=Open on Declaring Type

-

-openDeclVarType.label=&Open Declared Type

-openDeclVarType.tooltip=Open Variable's Type

-

-openOnAction.label=O&pen On

-

-openOnConsoleTypeAction.label=&Open On Type

-openOnConsoleTypeAction.tooltip=Open On Type

-

-openRecType.label=&Receiving Type

-openRecType.tooltip=Open on Receiving Type

-

-processInfoPageName=Process Info

-

-runAction.label=&Run...

-runAction.tooltip=Run

-

-RunMenu.label=&Run

-

-RunSnippet.label=Run Sni&ppet@Ctrl+U

-

-runToLineAction.label=Run to &Line@Ctrl+R

-

-scrapbookLauncher.label=Java Scrapbook Page

-

-showFinalAction.label=Show &Final Fields

-showFinalAction.tooltip=Show Final Fields

-

-showQualifiedAction.label=Show &Qualified Names

-showQualifiedAction.tooltip=Show Qualified Names

-

-showStaticAction.label=Show &Static Fields

-showStaticAction.tooltip=Show Static Fields

-

-suspendPolicy.label=&Suspend VM

-

-toggleStepFilterAction.label=Use Step &Filters

-toggleStepFilterAction.tooltip=Toggle Enabled State of All Step Filters

-

-uncaughtAction.label=&Uncaught

-

-vmPageName=Runtime JRE

-

-JavaApplicationShortcut.label=Java Application

-

-jreSystemLibrary.name=JRE System Library

-

-JDTLaunchActionSet.label=Java Launch

-

-providerName=Eclipse.org

-

-JavaSourceLocator.name=Prompting Java Source Locator

-JavaDebugActionGroup.name=Java Debug
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/plugin.xml b/org.eclipse.jdt.debug.ui/plugin.xml
deleted file mode 100644
index d25bd2c..0000000
--- a/org.eclipse.jdt.debug.ui/plugin.xml
+++ /dev/null
@@ -1,1031 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- File written by PDE 1.0 -->
-<plugin
-   id="org.eclipse.jdt.debug.ui"
-   name="%pluginName"
-   version="2.0.2"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin">
-<!-- Required plugins -->
-<requires>
-  <import plugin="org.eclipse.ui"/>
-  <import plugin="org.eclipse.core.resources"/>
-  <import plugin="org.eclipse.jdt.core"/>
-  <import plugin="org.apache.xerces"/>
-  <import plugin="org.eclipse.search"/>
-  <import plugin="org.eclipse.debug.core"/>
-  <import plugin="org.eclipse.debug.ui"/> 
-  <import plugin="org.eclipse.jdt.debug"/>
-  <import plugin="org.eclipse.jdt.launching"/>
-  <import plugin="org.eclipse.compare"/>
-  <import plugin="org.eclipse.jdt.ui"/>
-</requires>
-
-<!-- Runtime -->
-<runtime>
-   <library name="jdiui.jar">
-      <export name="*"/>
-   </library>
-</runtime>
-
-<!-- Extensions Points -->
-<extension-point name="%vmInstallTypePage" id="vmInstallTypePage"/>
-
-<!-- Extensions -->
-- <extension point="org.eclipse.jdt.ui.javaEditorTextHovers">
-  <hover id="org.eclipse.jdt.internal.debug.ui.JavaDebugHover" 
-  	class="org.eclipse.jdt.internal.debug.ui.JavaDebugHover" /> 
-  </extension>
-<extension
-    point= "org.eclipse.ui.editors"
-    id= "org.eclipse.jdt.debug.ui.editors">
-   <editor
-      id="org.eclipse.jdt.debug.ui.SnippetEditor"
-      icon="icons/full/obj16/jsbook_obj.gif"
-      name="%JavaSnippetEditor.label"
-      extensions="jpage"
-      class="org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor"
-      contributorClass="org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetEditorActionContributor">
-   </editor>
-</extension>
-
-<extension point="org.eclipse.ui.editorActions">
-	<editorContribution
-		id="org.eclipse.jdt.debug.CompilationUnitEditor.BreakpointRulerActions"
-		targetID="org.eclipse.jdt.ui.CompilationUnitEditor">
-		<action
-			id="org.eclipse.jdt.ui.actions.ManageBreakpointRulerAction"
-			actionID="RulerDoubleClick"
-			label="%Dummy.label"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate">
-		</action>
-	</editorContribution>	
-	<editorContribution
-		id="org.eclipse.jdt.debug.ClassFileEditor.BreakpointRulerActions"
-		targetID="org.eclipse.jdt.ui.ClassFileEditor">
-		<action
-			id="org.eclipse.jdt.ui.actions.ManageBreakpointRulerAction"
-			actionID="RulerDoubleClick"
-			label="%Dummy.label"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate">
-		</action>
-	</editorContribution>
-</extension>
-
-<extension point="org.eclipse.ui.actionSets">
-	<actionSet 
-		label="%JDTDebugActionSet.label" 
-		visible="false" 
-		id="org.eclipse.jdt.debug.ui.JDTDebugActionSet">
-	<menu
-        label="%RunMenu.label"
-        id="org.eclipse.ui.run"
-		path="additions">
-        <separator name="jdtGroup"/>
-        <separator name="breakpointGroup"/>
-     </menu>
-        <action id="org.eclipse.jdt.debug.ui.ManageWatchpointAction"
-  			label="%manageWatchpointAction.label"
-  			icon="icons/full/obj16/readwrite_obj.gif"
-  			helpContextId="manage_watchpoint_action_context"
-  			class="org.eclipse.jdt.internal.debug.ui.actions.ManageWatchpointActionDelegate"
-  			menubarPath="org.eclipse.ui.run/breakpointGroup">
-  			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement> 
-  	    </action>
-      	<action id="org.eclipse.jdt.debug.ui.ManageMethodBreakpointAction"
-  			label="%manageMethodBreakpointAction.label"
-  			icon="icons/full/obj16/brkpi_obj.gif"
-  			helpContextId="manage_method_breakpoint_action_context"
-  			class="org.eclipse.jdt.internal.debug.ui.actions.ManageMethodBreakpointActionDelegate"
-  			menubarPath="org.eclipse.ui.run/breakpointGroup">
-  			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement> 
-  	    </action>
-  	    <action id="org.eclipse.jdt.debug.ui.actionSet.AddException"
-			label="%exceptionAction.accel.label"
-			icon="icons/full/clcl16/exc_catch.gif"
-			helpContextId="add_exception_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.AddExceptionAction"
-			menubarPath="org.eclipse.ui.run/breakpointGroup">
-			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement> 
-		</action>
-      	<action id="org.eclipse.jdt.debug.ui.ManageBreakpointAction"
-  			label="%ManageBreakpointAction.label"
-  			icon="icons/full/obj16/brkpi_obj.gif"
-  			helpContextId="manage_breakpoint_action_context"
-  			class="org.eclipse.jdt.internal.debug.ui.actions.ManageBreakpointActionDelegate"
-  			menubarPath="org.eclipse.ui.run/breakpointGroup">
-  			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement> 
-  	    </action>
-  	  	<action id="org.eclipse.jdt.debug.ui.RunToLineAction"
-  			label="%runToLineAction.label"
-  			icon="icons/full/elcl16/runtoline_co.gif"
-  			disabledIcon="icons/full/dlcl16/runtoline_co.gif"
-  			hoverIcon="icons/full/clcl16/runtoline_co.gif"
-  			helpContextId="run_to_line_action_context"
-  			class="org.eclipse.jdt.internal.debug.ui.actions.RunToLineActionDelegate"
-  			menubarPath="org.eclipse.ui.run/jdtGroup">
-  			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement> 
-  	    </action>
-  	    <action id="org.eclipse.jdt.debug.ui.RunSnippet" 
-			label="%RunSnippet.label" 
-			menubarPath="org.eclipse.ui.run/jdtGroup"
-			icon="icons/full/etool16/run_sbook.gif"
-			disabledIcon="icons/full/dtool16/run_sbook.gif"
-  		 	hoverIcon="icons/full/ctool16/run_sbook.gif"
-			helpContextId="run_snippet_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.snippeteditor.RunSnippetAction">
-			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement> 
-		</action>
-  		<action id="org.eclipse.jdt.debug.ui.Display" 
-			label="%Display.label" 
-			menubarPath="org.eclipse.ui.run/jdtGroup"
-			icon="icons/full/etool16/disp_sbook.gif"
-			disabledIcon="icons/full/dtool16/disp_sbook.gif"
-  		 	hoverIcon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction">
-			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement>
-		</action>
-		<action id="org.eclipse.jdt.debug.ui.Inspect" 
-			label="%Inspect.label" 
-			menubarPath="org.eclipse.ui.run/jdtGroup"
-			icon="icons/full/etool16/insp_sbook.gif"
-			disabledIcon="icons/full/dtool16/insp_sbook.gif"
-  		 	hoverIcon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction">
-			<enablement> 
-             	<pluginState id="org.eclipse.jdt.debug.ui" value="activated"/> 
-            </enablement>
-		</action> 
-   </actionSet>
-</extension>
-
-<extension 
-	point="org.eclipse.ui.views">
-	<view
-		id="org.eclipse.jdt.debug.ui.DisplayView"
-		name="%displayViewName"
-		category="org.eclipse.debug.ui"
-	   	icon="icons/full/ctool16/disp_sbook.gif"
-	   	class="org.eclipse.jdt.internal.debug.ui.display.DisplayView">
-	</view>
-</extension>
-
-<extension point="org.eclipse.ui.perspectiveExtensions">
-	<perspectiveExtension 
-		targetID="org.eclipse.debug.ui.DebugPerspective">
-		<actionSet id="org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
-	</perspectiveExtension>
-	<perspectiveExtension 
-		targetID="org.eclipse.jdt.ui.JavaPerspective">
-		<actionSet id="org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
-	</perspectiveExtension>
-	<perspectiveExtension 
-		targetID="org.eclipse.jdt.ui.JavaHierarchyPerspective">
-		<actionSet id="org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
-	</perspectiveExtension>
-	<perspectiveExtension 
-		targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-		<actionSet id="org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
-	</perspectiveExtension>
-    <perspectiveExtension 
-    	targetID="org.eclipse.debug.ui.DebugPerspective"> 
-    	<view id="org.eclipse.jdt.debug.ui.DisplayView" 
-        	relative="org.eclipse.debug.ui.ExpressionView" 
-    		relationship="stack"/>	
-        <view id="org.eclipse.jdt.ui.PackageExplorer" 
-                relative="org.eclipse.debug.ui.DebugView" 
-                relationship="stack"
-                visible="false"/>
-        <view id="org.eclipse.jdt.ui.TypeHierarchy" 
-                relative="org.eclipse.debug.ui.DebugView" 
-                relationship="stack"
-                visible="false"/>
-         <view id="org.eclipse.search.SearchResultView" 
-                relative="org.eclipse.debug.ui.ConsoleView" 
-                relationship="stack"
-                visible="false"/> 
-    	<viewShortcut id="org.eclipse.jdt.debug.ui.DisplayView"/>
-     </perspectiveExtension> 
-</extension>
-
-<extension point="org.eclipse.ui.popupMenus">
-	<objectContribution
-		id="org.eclipse.jdt.debug.WatchpointToggleActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaWatchpoint">
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.AccessToggle"
-			label="%accessAction.label"
-			menubarPath="emptyBreakpointGroup"
-			state="false"
-			helpContextId="access_toggle_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.AccessWatchpointToggleAction"
-			enablesFor="+">
-		</action>
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.ModificationToggle"
-			label="%modificationAction.label"
-			menubarPath="emptyBreakpointGroup"
-			state="true"
-			helpContextId="modification_toggle_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.ModificationWatchpointToggleAction"
-			enablesFor="+">
-		</action>
-	</objectContribution>
-	<objectContribution
-		id="org.eclipse.jdt.debug.MethodBreakpointToggleActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaMethodBreakpoint">
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.EntryToggle"
-			label="%entryAction.label"
-			menubarPath="emptyBreakpointGroup"
-			state="false"
-			helpContextId="entry_toggle_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.EntryToggleAction"
-			enablesFor="+">
-		</action>
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.ExitToggle"
-			label="%exitAction.label"
-			menubarPath="emptyBreakpointGroup"
-			state="false"
-			helpContextId="exit_toggle_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.ExitToggleAction"
-			enablesFor="+">
-		</action>		
-	</objectContribution>
-	<objectContribution
-		id="org.eclipse.jdt.debug.JavaBreakpointActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaBreakpoint">
-		<action
-			id="org.eclipse.jdt.ui.actions.BreakpointHitCount"
-			label="%hitCount.label"
-			icon="icons/full/elcl16/sethitcount_co.gif"
-			disabledIcon="icons/full/dlcl16/sethitcount_co.gif"
-			hoverIcon="icons/full/clcl16/sethitcount_co.gif"
-			menubarPath="emptyBreakpointGroup"
-			helpContextId="hit_count_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.BreakpointHitCountAction"
-			enablesFor="1">
-		</action>
-		<action
-			id="org.eclipse.jdt.ui.actions.SuspendPolicy"
-			label="%suspendPolicy.label"
-			icon="../org.eclipse.debug.ui/icons/full/clcl16/suspend_co.gif"
-			menubarPath="emptyBreakpointGroup"
-			helpContextId="breakpoint_suspend_policy_toggle_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.BreakpointSuspendPolicyToggleAction"
-			enablesFor="1">
-		</action>
-		<action
-			id="org.eclipse.jdt.ui.actions.JavaBreakpointProperties"
-			label="%breakpointPropertiesAction.label"
-			menubarPath="additions"
-			helpContextId="breakpoint_properties_action_context" 
-			class="org.eclipse.jdt.internal.debug.ui.actions.JavaBreakpointPropertiesAction"
-			enablesFor="1">
-		</action>
-	</objectContribution>	
-	<objectContribution
-		id="org.eclipse.jdt.debug.ExceptionToggleActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint">
-		<action
-			id="org.eclipse.jdt.ui.actions.CaughtToggle"
-			label="%caughtAction.label"
-			menubarPath="emptyBreakpointGroup"
-			state="true"
-			helpContextId="exception_caught_toggle_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ExceptionCaughtToggleAction"
-			enablesFor="+">
-		</action>
-		<action
-			id="org.eclipse.jdt.ui.actions.UncaughtToggle"
-			label="%uncaughtAction.label"
-			menubarPath="emptyBreakpointGroup"
-			state="true"
-			helpContextId="exception_uncaught_toggle_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ExceptionUncaughtToggleAction"
-			enablesFor="+">
-		</action>
-	</objectContribution>
-	<objectContribution
-		id="org.eclipse.jdt.debug.DropToFrameActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaStackFrame">
-		<filter name="DropToFrameActionFilter" value="supportsDropToFrame"/>
-		<action
-			id="org.eclipse.jdt.ui.actions.DropToFrame"
-			label="%dropFrameAction.label"
-			tooltip="%dropFrameAction.tooltip"
-			menubarPath="emptyThreadGroup"
-			helpContextId="drop_to_frame_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DropToFrameAction"
-			enablesFor="1">
-		</action>
-	</objectContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.ToggleStepFilterActions"
-		targetID="org.eclipse.debug.ui.DebugView">
-		<action
-			id="org.eclipse.jdt.ui.actions.ToggleStepFilter"
-			label="%toggleStepFilterAction.label"
-			icon="icons/full/elcl16/stepfilter_co.gif"
-			disabledIcon="icons/full/dlcl16/stepfilter_co.gif"
-			hoverIcon="icons/full/clcl16/stepfilter_co.gif"
-			tooltip="%toggleStepFilter.tooltip"
-			menubarPath="additions"
-			helpContextId="toggle_step_filter_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ToggleStepFilterAction"
-			enablesFor="+">
-			<selection class="org.eclipse.jdt.debug.core.IJavaDebugTarget"/>
-			<selection class="org.eclipse.jdt.debug.core.IJavaThread"/>
-			<selection class="org.eclipse.jdt.debug.core.IJavaStackFrame"/>
-		</action>
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.OpenOnConsoleTypeActions"
-		targetID="org.eclipse.debug.ui.ConsoleView">
-		<action
-			id="org.eclipse.jdt.ui.actions.OpenOnConsoleType"
-			label="%openOnConsoleTypeAction.label"
-			icon="../org.eclipse.jdt.ui/icons/full/ctool16/opentype.gif"
-			tooltip="%openOnConsoleTypeAction.tooltip"
-			menubarPath="additions"
-			helpContextId="open_on_console_type_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.OpenOnConsoleTypeAction">
-		</action>
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.DebugViewPopupActions"
-		targetID="org.eclipse.debug.ui.DebugView">
-		<action id="org.eclipse.jdt.ui.debugViewPopupActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			tooltip="%showQualifiedAction.tooltip"
-			menubarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.BreakpointViewPopupActions"
-		targetID="org.eclipse.debug.ui.BreakpointView">
-		<action id="org.eclipse.jdt.ui.breakpointViewPopupActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			tooltip="%showQualifiedAction.tooltip"
-			menubarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-		<action id="org.eclipse.jdt.debug.ui.breakpointViewPopupActions.AddException"
-			label="%exceptionAction.accel.label"
-			menubarPath="emptyBreakpointGroup"
-			icon="icons/full/clcl16/exc_catch.gif"
-			tooltip="%exceptionAction.tooltip"
-			helpContextId="add_exception_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.AddExceptionAction">
-		</action>
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.VariableViewPopupActions"
-		targetID="org.eclipse.debug.ui.VariableView">
-		<action id="org.eclipse.jdt.ui.variableViewPopupActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			tooltip="%showQualifiedAction.tooltip"
-			menubarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-		<action id="org.eclipse.jdt.ui.variableViewPopupActions.ShowStaticFields"
-			label="%showStaticAction.label"
-			tooltip="%showStaticAction.tooltip"
-			menubarPath="renderGroup"
-			icon="icons/full/clcl16/static_co.gif"
-			helpContextId="show_static_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowStaticFieldsAction">
-		</action>
-		<action id="org.eclipse.jdt.ui.variableViewPopupActions.ShowFinalFields"
-			label="%showFinalAction.label"
-			tooltip="%showFinalAction.tooltip"
-			menubarPath="renderGroup"
-			icon="icons/full/clcl16/final_co.gif"
-			helpContextId="show_final_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowFinalFieldsAction">
-		</action>
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.ExpressionViewPopupActions"
-		targetID="org.eclipse.debug.ui.ExpressionView">
-		<action id="org.eclipse.jdt.ui.expressionViewPopupActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			tooltip="%showQualifiedAction.tooltip"
-			menubarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>	
-		<action id="org.eclipse.jdt.ui.expressionViewPopupActions.ShowStaticFields"
-			label="%showStaticAction.label"
-			tooltip="%showStaticAction.tooltip"
-			menubarPath="renderGroup"
-			icon="icons/full/clcl16/static_co.gif"
-			helpContextId="show_static_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowStaticFieldsAction">
-		</action>
-		<action id="org.eclipse.jdt.ui.expressionViewPopupActions.ShowFinalFields"
-			label="%showFinalAction.label"
-			tooltip="%showFinalAction.tooltip"
-			menubarPath="renderGroup"
-			icon="icons/full/clcl16/final_co.gif"
-			helpContextId="show_final_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowFinalFieldsAction">
-		</action>		
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.DetailsEvaluationActions"
-		targetID="org.eclipse.debug.ui.VariableView.detail">
-		<action id="org.eclipse.jdt.debug.ui.variablesViewDetail.Display" 
-			label="%Display.label" 
-			menubarPath="variableGroup" 
-			icon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"> 
-		</action> 	
-        <action id="org.eclipse.jdt.debug.ui.variablesViewDetail.Inspect" 
-			label="%Inspect.label" 
-			menubarPath="variableGroup" 
-			icon="icons/full/ctool16/insp_sbook.gif" 
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"> 
-		</action>
-	</viewerContribution>
-	<viewerContribution
-		id="org.eclipse.jdt.debug.DisplayEvaluationActions"
-		targetID="org.eclipse.jdt.debug.ui.DisplayView">
-		<action id="org.eclipse.jdt.debug.ui.displayView.Display" 
-			label="%Display.label" 
-			menubarPath="evaluationGroup"
-			icon="icons/full/ctool16/disp_sbook.gif" 
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"
-			enablesFor="+"> 
-		</action>
-		<action id="org.eclipse.jdt.debug.ui.displayView.Inspect" 
-			label="%Inspect.label" 
-			menubarPath="evaluationGroup"
-			icon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"
-			enablesFor="+">
-		</action> 
-	</viewerContribution>
-</extension>
-
-<extension point="org.eclipse.ui.viewActions">
-	<viewContribution
-		id="org.eclipse.jdt.ui.debug.VariableViewActions"
-		targetID="org.eclipse.debug.ui.VariableView">
-		<action id="org.eclipse.jdt.ui.variableViewActions.ShowFinalFields"
-			label="%showFinalAction.label"
-			toolbarPath="javaVariableFilters"
-			icon="icons/full/elcl16/final_co.gif"
-			disabledIcon="icons/full/dlcl16/final_co.gif"
-			hoverIcon="icons/full/clcl16/final_co.gif"
-			tooltip="%showFinalAction.tooltip"
-			helpContextId="show_final_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowFinalFieldsAction">
-		</action>
-		<action id="org.eclipse.jdt.ui.variableViewActions.ShowStaticFields"
-			label="%showStaticAction.label"
-			toolbarPath="javaVariableFilters"
-			icon="icons/full/elcl16/static_co.gif"
-			disabledIcon="icons/full/dlcl16/static_co.gif"
-			hoverIcon="icons/full/clcl16/static_co.gif"
-			tooltip="%showStaticAction.tooltip"
-			helpContextId="show_static_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowStaticFieldsAction">
-		</action>
-		<action id="org.eclipse.jdt.ui.variableViewActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			toolbarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			tooltip="%showQualifiedAction.tooltip"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-	</viewContribution>
-	<viewContribution
-		id="org.eclipse.jdt.ui.debug.ExpressionViewActions"
-		targetID="org.eclipse.debug.ui.ExpressionView">
-		<action id="org.eclipse.jdt.ui.expressionViewActions.ShowFinalFields"
-			label="%showFinalAction.label"
-			toolbarPath="javaVariableFilters"
-			icon="icons/full/elcl16/final_co.gif"
-			disabledIcon="icons/full/dlcl16/final_co.gif"
-			hoverIcon="icons/full/clcl16/final_co.gif"
-			tooltip="%showFinalAction.tooltip"
-			helpContextId="show_final_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowFinalFieldsAction">
-		</action>
-		<action id="org.eclipse.jdt.ui.expressionViewActions.ShowStaticFields"
-			label="%showStaticAction.label"
-			toolbarPath="javaVariableFilters"
-			icon="icons/full/elcl16/static_co.gif"
-			disabledIcon="icons/full/dlcl16/static_co.gif"
-			hoverIcon="icons/full/clcl16/static_co.gif"
-			tooltip="%showStaticAction.tooltip"
-			helpContextId="show_static_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowStaticFieldsAction">
-		</action>
-			<action id="org.eclipse.jdt.ui.expressionViewActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			toolbarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			tooltip="%showQualifiedAction.tooltip"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-	</viewContribution>	
-	<viewContribution
-		id="org.eclipse.jdt.debug.ui.BreakpointViewActions"
-		targetID="org.eclipse.debug.ui.BreakpointView">
-		<action id="org.eclipse.jdt.debug.ui.actions.AddException"
-			label="%exceptionAction.label"
-			toolbarPath="javaExceptions"
-			icon="icons/full/elcl16/exc_catch.gif"
-			disabledIcon="icons/full/dlcl16/exc_catch.gif"
-			hoverIcon="icons/full/clcl16/exc_catch.gif"
-			tooltip="%exceptionAction.tooltip"
-			helpContextId="add_exception_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.AddExceptionAction">
-		</action>
-			<action id="org.eclipse.jdt.ui.breakpointViewActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			toolbarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			tooltip="%showQualifiedAction.tooltip"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-	</viewContribution>
-	<viewContribution
-		id="org.eclipse.jdt.debug.ui.LaunchViewActions"
-		targetID="org.eclipse.debug.ui.DebugView">
-			<action id="org.eclipse.jdt.ui.launchViewActions.ShowQualified"
-			label="%showQualifiedAction.label"
-			toolbarPath="renderGroup"
-			icon="../org.eclipse.jdt.ui/icons/full/obj16/package_obj.gif"
-			tooltip="%showQualifiedAction.tooltip"
-			helpContextId="show_qualified_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ShowQualifiedAction">
-		</action>
-	</viewContribution>
-	<viewContribution
-		id="org.eclipse.jdt.debug.ui.DisplayViewActions"
-		targetID="org.eclipse.jdt.debug.ui.DisplayView">
-		<action id="org.eclipse.jdt.debug.ui.displayViewToolbar.Display" 
-			label="%Display.label" 
-			tooltip="%Display.tooltip"
-			toolbarPath="evaluationGroup"
-			icon="icons/full/etool16/disp_sbook.gif"
-			disabledIcon="icons/full/dtool16/disp_sbook.gif"
-			hoverIcon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"> 
-		</action>
-		<action id="org.eclipse.jdt.debug.ui.displayViewToolbar.Inspect" 
-			label="%Inspect.label" 
-			tooltip="%Inspect.tooltip"
-			toolbarPath="evaluationGroup"
-			icon="icons/full/etool16/insp_sbook.gif"
-			disabledIcon="icons/full/dtool16/insp_sbook.gif"
-			hoverIcon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"> 
-		</action> 
-	</viewContribution>
-</extension>
-
-<!--Java debug model presentation -->
-<extension point = "org.eclipse.debug.ui.debugModelPresentations"> 
-         <debugModelPresentation
-             class = "org.eclipse.jdt.internal.debug.ui.JDIModelPresentation"
-             id = "org.eclipse.jdt.debug"
-             detailsViewerConfiguration = "org.eclipse.jdt.internal.debug.ui.display.DetailsViewerConfiguration">
-          </debugModelPresentation> 
-</extension>
-
-<extension point="org.eclipse.ui.popupMenus">
-	<objectContribution
-		id="org.eclipse.jdt.debug.ui.OpenOnReceivingTypeActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaStackFrame">
-		<menu
-			id="org.eclipse.jdt.debug.ui.actions.OpenOnMenu"
-			path="emptyEditGroup"
-			label="%openOnAction.label">
-			<separator name="group.openOn"/>
-		</menu>
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.OpenOnReceivingType"
-			label="%openRecType.label"
-			tooltip="%openRecType.tooltip"
-			menubarPath="org.eclipse.jdt.debug.ui.actions.OpenOnMenu/group.openOn"
-			helpContextId="open_on_receiving_type_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.OpenOnReceivingTypeAction">
-		</action>
-	</objectContribution>
-	<objectContribution
-		id="org.eclipse.jdt.debug.ui.JavaVariableActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaVariable">
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.OpenOnVariableType"
-			label="%openDeclVarType.label"
-			tooltip="%openDeclVarType.tooltip"
-			menubarPath="openOnGroup"
-			helpContextId="open_on_variable_type_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.OpenOnVariableAction">
-		</action>
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.VariableInspectAction"
-			label="%Inspect.label"
-			menubarPath="openOnGroup"
-			icon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="variable_inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"
-			enablesFor="+">
-		</action>		
-	</objectContribution>
-	<objectContribution
-		id="org.eclipse.jdt.debug.ui.OpenOnDeclaringTypeActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaStackFrame">
-		<action
-			id="org.eclipse.jdt.debug.ui.actions.OpenOnDeclaringType"
-			label="%openDeclType.label"
-			tooltip="%openDeclType.tooltip"
-			menubarPath="org.eclipse.jdt.debug.ui.actions.OpenOnMenu/group.openOn"
-			helpContextId="open_on_declaring_type_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.OpenOnDeclaringTypeAction">
-		</action>
-	</objectContribution>
-	<viewerContribution 
-    	id="org.eclipse.jdt.debug.ui.JavaSnippetPopupActions" 
-    	targetID="#JavaSnippetEditorContext">
-    	<action id="org.eclipse.jdt.debug.ui.Display" 
-			label="%Display.label" 
-			menubarPath="additions" 
-			icon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"> 
-		</action> 	
-        <action id="org.eclipse.jdt.debug.ui.Inspect" 
-			label="%Inspect.label" 
-			menubarPath="additions" 
-			icon="icons/full/ctool16/insp_sbook.gif" 
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"> 
-		</action>
-     </viewerContribution>
-
-	<viewerContribution 
-    	id="org.eclipse.jdt.debug.ui.ClassFileRulerPopupActions" 
-    	targetID="#ClassFileRulerContext">
-    	<action
-			id="org.eclipse.jdt.ui.actions.JavaBreakpointPropertiesRulerActionDelegate"
-			label="%JavaBreakpointProperties.label"
-			menubarPath="debug"
-			helpContextId="breakpoint_properties_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.JavaBreakpointPropertiesRulerActionDelegate">
-		</action>
-    	<action
-			id="org.eclipse.jdt.ui.actions.EnableDisableBreakpointRulerActionDelegate"
-			label="%EnableBreakpoint.label"
-			menubarPath="debug"
-			helpContextId="enable_disable_breakpoint_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.EnableDisableBreakpointRulerActionDelegate">
-		</action>
-		<action
-			id="org.eclipse.jdt.ui.actions.ManageBreakpointRulerActionDelegate"
-			label="%AddBreakpoint.label"
-			menubarPath="debug"
-			helpContextId="manage_breakpoint_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate">
-		</action>
-	</viewerContribution>
-	<viewerContribution 
-    	id="org.eclipse.jdt.debug.ui.CompilationUnitRulerPopupActions" 
-    	targetID="#CompilationUnitRulerContext">
-    	<action
-			id="org.eclipse.jdt.ui.actions.JavaBreakpointPropertiesRulerActionDelegate"
-			label="%JavaBreakpointProperties.label"
-			menubarPath="debug"
-			helpContextId="breakpoint_properties_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.JavaBreakpointPropertiesRulerActionDelegate">
-		</action>
-		<action
-			id="org.eclipse.jdt.ui.actions.EnableDisableBreakpointRulerActionDelegate"
-			label="%EnableBreakpoint.label"
-			menubarPath="debug"
-			helpContextId="enable_disable_breakpoint_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.EnableDisableBreakpointRulerActionDelegate">
-		</action>
-		<action
-			id="org.eclipse.jdt.ui.actions.ManageBreakpointRulerActionDelegate"
-			label="%AddBreakpoint.label"
-			menubarPath="debug"
-			helpContextId="manage_breakpoint_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate">
-		</action>
-	</viewerContribution>	
-	<viewerContribution 
-    	id="org.eclipse.jdt.debug.ui.CUPopupActions" 
-    	targetID="#CompilationUnitEditorContext">
-    	<action id="org.eclipse.jdt.debug.ui.cuPopup.RunToLine"
-    		label="%runToLineAction.label"
-    		icon="icons/full/clcl16/runtoline_co.gif"
-    		menubarPath="additions"
-    		helpContextId="run_to_line_action_context"
-    		class="org.eclipse.jdt.internal.debug.ui.actions.RunToLineActionDelegate"> 
-		</action>
-    	<action id="org.eclipse.jdt.debug.ui.cuPopup.Display" 
-			label="%Display.label" 
-			menubarPath="additions" 
-			icon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"> 
-		</action> 	
-        <action id="org.eclipse.jdt.debug.ui.cuPopup.Inspect" 
-			label="%Inspect.label" 
-			menubarPath="additions" 
-			icon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"> 
-		</action>
-     </viewerContribution>
-     <viewerContribution 
-    	id="org.eclipse.jdt.debug.ui.CFPopupActions" 
-    	targetID="#ClassFileEditorContext">
-    	<action id="org.eclipse.jdt.debug.ui.cfPopup.RunToLine"
- 		   	icon="icons/full/clcl16/runtoline_co.gif"
-    		label="%runToLineAction.label"
-    		menubarPath="additions"
-     		helpContextId="run_to_line_action_context"
-    		class="org.eclipse.jdt.internal.debug.ui.actions.RunToLineActionDelegate"> 
-		</action> 
-    	<action id="org.eclipse.jdt.debug.ui.cfPopup.Display" 
-			label="%Display.label" 
-			menubarPath="additions"
-			icon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"> 
-		</action> 	
-        <action id="org.eclipse.jdt.debug.ui.cfPopup.Inspect" 
-			label="%Inspect.label" 
-			menubarPath="additions"
-			icon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"> 
-		</action> 
-     </viewerContribution>
-     <objectContribution 
-     	id="org.eclipse.jdt.debug.ui.MethodBreakpointActions"
-     	objectClass="org.eclipse.jdt.core.IMethod">
-     	<filter name="MethodActionFilter" value="isBinaryMethod"/>
-		<action id="org.eclipse.jdt.debug.ui.MethodBreakpoint"
-		 	label="%manageMethodBreakpointAction.label"
-		 	helpContextId="manage_method_breakpoint_action_context"
-		 	menubarPath="additions"
-		 	class="org.eclipse.jdt.internal.debug.ui.actions.ManageMethodBreakpointActionDelegate"
-		 	enablesFor="1">
-	  </action>
-  	</objectContribution>
-	<objectContribution 
-		id="org.eclipse.jdt.debug.ui.WatchpointActions"
-		objectClass="org.eclipse.jdt.core.IField">
-  		<action id="org.eclipse.jdt.debug.ui.Watchpoint"
-  			label="%manageWatchpointAction.label"
-  			helpContextId="manage_watchpoint_action_context"
-  			menubarPath="additions"
-  			class="org.eclipse.jdt.internal.debug.ui.actions.ManageWatchpointActionDelegate"
-  			enablesFor="1">
-  		</action> 
-    </objectContribution>
-  	<objectContribution 
-		id="org.eclipse.jdt.debug.ui.WatchpointActions"
-		objectClass="org.eclipse.jdt.debug.core.IJavaFieldVariable">
-  		<action id="org.eclipse.jdt.debug.ui.VariableWatchpoint"
-  			label="%manageWatchpointAction.label"
-  			helpContextId="manage_watchpoint_action_context"
-  			menubarPath="additions"
-  			class="org.eclipse.jdt.internal.debug.ui.actions.ManageWatchpointActionDelegate"
-  			enablesFor="1">
-  		</action> 
-    </objectContribution>
-</extension>
-
-<extension point="org.eclipse.ui.editorActions"> 
-      <editorContribution 
-         id="org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions" 
-         targetID="org.eclipse.jdt.debug.ui.SnippetEditor"> 
-         <action id="org.eclipse.jdt.debug.ui.SnippetDisplay" 
-			label="%Display.label"
-			tooltip="%Display.tooltip"
-			toolbarPath="evaluationGroup" 
-			icon="icons/full/etool16/disp_sbook.gif"
-			disabledIcon="icons/full/dtool16/disp_sbook.gif"
-			hoverIcon="icons/full/ctool16/disp_sbook.gif"
-			helpContextId="display_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.DisplayAction"> 
-		</action> 	
-        <action id="org.eclipse.jdt.debug.ui.SnippetInspect" 
-			label="%Inspect.label" 
-			tooltip="%Inspect.tooltip"
-			toolbarPath="evaluationGroup" 
-			icon="icons/full/etool16/insp_sbook.gif"
-			disabledIcon="icons/full/dtool16/insp_sbook.gif"
-			hoverIcon="icons/full/ctool16/insp_sbook.gif"
-			helpContextId="inspect_action_context"
-			class="org.eclipse.jdt.internal.debug.ui.actions.InspectAction"> 
-		</action>
-      </editorContribution> 
-   </extension> 
-
-<extension
-	point="org.eclipse.ui.propertyPages">
-	<page
-		id="org.eclipse.jdt.debug.ui.launching.ProcessPage" 
-		name="%processInfoPageName"
-		objectClass="org.eclipse.debug.core.model.IProcess"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.ProcessPropertyPage"> 
-    </page>
-	<page
-		id="org.eclipse.jdt.debug.ui.launching.ProcessPage" 
-		name="%processInfoPageName"
-		objectClass="org.eclipse.debug.core.model.IDebugTarget"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.ProcessPropertyPage"> 
-    </page>
-	<page
-		id="org.eclipse.jdt.debug.ui.snippeteditor.SnippetEditorPage" 
-		name="%snippetEditorPageName"
-		objectClass="org.eclipse.core.resources.IFile"
-		class="org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetEditorPropertyPage"
-		nameFilter="*.jpage"> 
-    </page>    
-</extension>
-
-<extension point = "org.eclipse.ui.preferencePages">
-	<page
-		id = "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.VMPreferencePage"
-		name= "%installJREPageName"
-		category= "org.eclipse.jdt.ui.preferences.JavaBasePreferencePage">
-	</page>
-	<page name="%javaDebugPrefName"
-         id="org.eclipse.jdt.ui.JavaDebugPreferencePage"   
-	     class="org.eclipse.jdt.internal.debug.ui.JavaDebugPreferencePage"
-         category="org.eclipse.jdt.ui.preferences.JavaBasePreferencePage">
-	</page>
-	<page name="%javaDebugAppearancePrefName"
-         id="org.eclipse.jdt.ui.JavaDebugAppearancePreferencePage"   
-         class="org.eclipse.jdt.internal.debug.ui.JavaDebugAppearancePreferencePage"
-         category="org.eclipse.jdt.ui.JavaDebugPreferencePage">
-	</page>	
-	<page name="%javaStepFilterPrefName"
-         id="org.eclipse.jdt.ui.JavaStepFilterPreferencePage"   
-         class="org.eclipse.jdt.internal.debug.ui.JavaStepFilterPreferencePage"
-         category="org.eclipse.jdt.ui.JavaDebugPreferencePage">
-	</page>
-</extension>
-
-<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-	<launchConfigurationTypeImage
-		id="org.eclipse.jdt.debug.ui.launchConfigurationTypeImage.localJavaApplication"
-		configTypeID="org.eclipse.jdt.launching.localJavaApplication"
-		icon="icons/full/ctool16/java_app.gif">
-	</launchConfigurationTypeImage>	
-	<launchConfigurationTypeImage
-		id="org.eclipse.jdt.debug.ui.launchConfigurationTypeImage.remoteJavaApplication"
-		configTypeID="org.eclipse.jdt.launching.remoteJavaApplication"
-		icon="icons/full/ctool16/java_attach.gif">
-	</launchConfigurationTypeImage>	
-</extension>
-
-<extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
-	<launchConfigurationTabGroup
-		id="org.eclipse.jdt.debug.ui.launchConfigurationTabGroup.localJavaApplication"
-		type ="org.eclipse.jdt.launching.localJavaApplication"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.LocalJavaApplicationTabGroup">
-	</launchConfigurationTabGroup>
-	<launchConfigurationTabGroup
-		id="org.eclipse.jdt.debug.ui.launchConfigurationTabGroup.remoteJavaApplication"
-		type ="org.eclipse.jdt.launching.remoteJavaApplication"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.RemoteJavaApplicationTabGroup">
-	</launchConfigurationTabGroup>
-</extension>
-
-<extension point = "org.eclipse.debug.core.statusHandlers">
-	<statusHandler
-		id="org.eclipse.jdt.debug.ui.statusHandler.workingDirectory"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryStatusHandler"
-		plugin ="org.eclipse.jdt.launching"
-		code="115">
-	</statusHandler>
-	<statusHandler
-		id="org.eclipse.jdt.debug.ui.statusHandler.vmConnectTimeout"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.VMConnectTimeoutStatusHandler"
-		plugin ="org.eclipse.jdt.launching"
-		code="117">
-	</statusHandler>	
-	<statusHandler
-		id="org.eclipse.jdt.debug.ui.statusHandler.unresolvedJRE"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.UnresolvedJREStatusHandler"
-		plugin ="org.eclipse.jdt.launching"
-		code="160">
-	</statusHandler>
-	<statusHandler
-		id="org.eclipse.jdt.debug.ui.statusHandler.suspendTimeout"
-		class="org.eclipse.jdt.internal.debug.ui.SuspendTimeoutStatusHandler"
-		plugin = "org.eclipse.jdt.debug"
-		code="161">
-	</statusHandler>
-</extension>
-
-<extension point = "org.eclipse.debug.core.sourceLocators">
-	<sourceLocator
-		id = "org.eclipse.jdt.debug.ui.javaSourceLocator"
-	   	class="org.eclipse.jdt.debug.ui.JavaUISourceLocator"
-	   	name="%JavaSourceLocator.name"/>
-</extension>
-
-<extension point = "org.eclipse.debug.ui.debugActionGroups">
-	<debugActionGroup
-		id = "org.eclipse.jdt.debug.ui.javaDebugActionGroup"
-	   	visible="true"
-	   	name="%JavaDebugActionGroup.name">
-	   	<action id="org.eclipse.jdt.ui.breakpointViewActions.ShowQualified"/>
-	   	<action id="org.eclipse.jdt.debug.ui.actions.AddException"/>
-	   	<action id="org.eclipse.jdt.ui.expressionViewActions.ShowQualified"/>
-		<action id="org.eclipse.jdt.ui.expressionViewActions.ShowStaticFields"/>
-		<action id="org.eclipse.jdt.ui.expressionViewActions.ShowFinalFields"/>
-		<action id="org.eclipse.jdt.ui.launchViewActions.ShowQualified"/>
-		<action id="org.eclipse.jdt.ui.actions.ToggleStepFilter"/>
-		<action id="org.eclipse.jdt.ui.variableViewActions.ShowQualified"/>
-		<action id="org.eclipse.jdt.ui.variableViewActions.ShowStaticFields"/>
-		<action id="org.eclipse.jdt.ui.variableViewActions.ShowFinalFields"/>
-	</debugActionGroup>
-</extension>
-
-<extension point = "org.eclipse.debug.ui.launchShortcuts">
-	<shortcut
-		id="org.eclipse.jdt.debug.ui.localJavaShortcut"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.JavaApplicationShortcut"
-		label="%JavaApplicationShortcut.label"
-		icon="icons/full/ctool16/java_app.gif"
-		modes="run, debug">
-		<perspective id="org.eclipse.jdt.ui.JavaPerspective"/>
-		<perspective id="org.eclipse.jdt.ui.JavaHierarchyPerspective"/>
-		<perspective id="org.eclipse.jdt.ui.JavaBrowsingPerspective"/>
-		<perspective id="org.eclipse.debug.ui.DebugPerspective"/>
-	</shortcut>
-</extension>
-
-<extension point = "org.eclipse.jdt.ui.classpathContainerPage">
-	<classpathContainerPage
-		id= "org.eclipse.jdt.launching.JRE_CONTAINER"
-		name= "%jreSystemLibrary.name"
-		class= "org.eclipse.jdt.internal.debug.ui.launcher.JREContainerWizardPage"/>
-</extension>
-
-<extension point = "org.eclipse.jdt.debug.ui.vmInstallTypePage">
-	<vmInstallTypePage
-		id="org.eclipse.jdt.debug.ui.StandardVMCommandTab"
-		vmInstallTypeID="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMCommandTab">
-	</vmInstallTypePage>
-	<vmInstallTypePage
-		id="org.eclipse.jdt.debug.ui.StandardVMCommandTab"
-		vmInstallTypeID="org.eclipse.jdt.launching.Standard11xVMType"
-		class="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMCommandTab">
-	</vmInstallTypePage>	
-</extension>
-
-<extension point="org.eclipse.team.core.fileTypes">
-  <fileTypes extension="jpage" type="text"/>
-</extension>
-
-</plugin>
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/scripts/exportplugin.xml b/org.eclipse.jdt.debug.ui/scripts/exportplugin.xml
deleted file mode 100644
index 27b0279..0000000
--- a/org.eclipse.jdt.debug.ui/scripts/exportplugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Export a jar of .class files for the org.eclipse.jdt.debug.ui Eclipse plug-in

-     along with other important plugin files to the "plugin-export" subdirectory

-     of the target Eclipse installation -->

-<project name="org.eclipse.jdt.debug.ui" default="export" basedir="..">

-

-	<!-- Set the timestamp and important properties -->

-	<target name="init">

-		<tstamp/>

-		<property name="destdir" value="../../plugin-export" />

-		<property name="dest"  value="${destdir}/org.eclipse.jdt.debug.ui_2.0.0" />

-	</target>

-

-	<!-- Create the jar of .class files, and copy other important files to export dir -->

-	<target name="export" depends="init">

-		<mkdir dir="${destdir}" />

-		<delete dir="${dest}" />

-		<mkdir dir="${dest}" />

-		<jar 

-			jarfile="${dest}/jdiui.jar"

-			basedir="bin"

-		/>

-		<!-- Create the source zip -->

-		<zip zipfile="${dest}/jdiuisrc.zip">

-			<fileset dir="ui"/>

-		</zip>

-		<copy file="plugin.xml" todir="${dest}"/>

-		<copy file="plugin.properties" todir="${dest}"/>

-		<copy file=".classpath" todir="${dest}"/>

-		<copy file=".options" todir="${dest}"/>

-		<copy file="snippetsupport.jar" todir="${dest}"/>

-		<copy todir="${dest}/icons">

-			<fileset dir="icons" />

-		</copy>		

-	</target>

-	

-</project>

diff --git a/org.eclipse.jdt.debug.ui/snippetsupport.jar b/org.eclipse.jdt.debug.ui/snippetsupport.jar
deleted file mode 100644
index 6a43861..0000000
--- a/org.eclipse.jdt.debug.ui/snippetsupport.jar
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/IJavaDebugUIConstants.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/IJavaDebugUIConstants.java
deleted file mode 100644
index faa1e54..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/IJavaDebugUIConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.jdt.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2002.

- * All Rights Reserved.

- */

-

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

- 

-/**

- * Constant definitions for Java debug UI plug-in.

- * <p>

- * Clients are not intended to implement this interface; constant definitions only.

- * </p>

- * @since 2.0

- */

-public interface IJavaDebugUIConstants {

-	/**

-	 * Plug-in identifier for the Java Debug UI

-	 */

-	public static final String PLUGIN_ID = JDIDebugUIPlugin.getUniqueIdentifier();

-

-	/**

-	 * Extension point identifier for contributions of a UI page that corresponds to a VMInstallType (value <code>"vmInstallTypePage"</code>).

-	 */

-	public static final String EXTENSION_POINT_VM_INSTALL_TYPE_PAGE = "vmInstallTypePage"; //$NON-NLS-1$

-

-	/**

-	 * Display view identifier (value <code>"org.eclipse.jdt.debug.ui.DisplayView"</code>).

-	 */

-	public static final String ID_DISPLAY_VIEW= PLUGIN_ID + ".DisplayView"; //$NON-NLS-1$

-	

-	/**

-	 * Java snippet editor identifier (value <code>"org.eclipse.jdt.debug.ui.SnippetEditor"</code>)

-	 */

-	public static final String ID_JAVA_SNIPPET_EDITOR= PLUGIN_ID + ".SnippetEditor"; //$NON-NLS-1$

-

-	/**

-	 * Java snippet editor context menu identifier (value <code>"#JavaSnippetEditorContext"</code>).

-	 */

-	public static final String JAVA_SNIPPET_EDITOR_CONTEXT_MENU= "#JavaSnippetEditorContext"; //$NON-NLS-1$

-	

-	/**

-	 * Java snippet editor ruler menu identifier (value <code>"#JavaSnippetRulerContext"</code>).

-	 */	

-	public static final String JAVA_SNIPPET_EDITOR_RULER_MENU= "#JavaSnippetRulerContext"; //$NON-NLS-1$

-

-	/**

-	 * Identifier for a group of evaluation actions in a menu (value <code>"evaluationGroup"</code>).

-	 */

-	public static final String EVALUATION_GROUP= "evaluationGroup"; //$NON-NLS-1$

-	

-	/**

-	 * Status code indicating an unexpected internal error (value <code>150</code>).

-	 */

-	public static final int INTERNAL_ERROR = 150;

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java
deleted file mode 100644
index 9df634d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaSourceLookupDialog.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.eclipse.jdt.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.SourceLookupBlock;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A dialog to manipulate the source lookup path for a launch
- * configuration. 
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- * @since 2.0.2
- * @see org.eclipse.jface.dialogs.Dialog
- */
-public class JavaSourceLookupDialog extends Dialog {
-		
-	private SourceLookupBlock fSourceLookupBlock;
-	private ILaunchConfiguration fConfiguration;
-	private String fMessage;
-	private boolean fNotAskAgain;
-	private Button fAskAgainCheckBox;
-	
-	/**
-	 * Constructs a dialog to manipulate the source lookup path of the given
-	 * launch configuration. The source lookup path is retrieved from the given
-	 * launch configuration, based on the attributes
-	 * <code>IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH</code> and
-	 * <code>IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH</code>. If the user
-	 * changes the source lookup path and presses "ok", the launch configuration
-	 * is updated with the new source lookup path. 
-	 * 
-	 * @param shell the shell to open the dialog on
-	 * @param message the message to display in the dialog
-	 * @param configuration the launch configuration from which the source lookup
-	 *  path is retrieved and (possibly) updated
-	 */
-	public JavaSourceLookupDialog(Shell shell, String message, ILaunchConfiguration configuration) {
-		super(shell);
-		fSourceLookupBlock= new SourceLookupBlock();
-		fMessage = message;
-		fNotAskAgain= false;
-		fAskAgainCheckBox= null;
-		fConfiguration = configuration;
-	}
-	
-	/**
-	 * Returns whether the "do not ask again" check box is selected in the dialog.
-	 * 
-	 * @return whether the "do not ask again" check box is selected in the dialog
-	 */
-	public boolean isNotAskAgain() {
-		return fNotAskAgain;
-	}
-			
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		getShell().setText(LauncherMessages.getString("JavaUISourceLocator.selectprojects.title")); //$NON-NLS-1$
-		
-		Composite composite= (Composite) super.createDialogArea(parent);
-		composite.setLayout(new GridLayout());
-		
-		Label message= new Label(composite, SWT.LEFT + SWT.WRAP);
-		message.setText(fMessage);
-		GridData data= new GridData();
-		data.widthHint= convertWidthInCharsToPixels(message, 70);
-		message.setLayoutData(data);
-
-		fSourceLookupBlock.createControl(composite);
-		Control inner = fSourceLookupBlock.getControl();
-		fSourceLookupBlock.initializeFrom(fConfiguration);
-		inner.setLayoutData(new GridData(GridData.FILL_BOTH));
-		fAskAgainCheckBox= new Button(composite, SWT.CHECK + SWT.WRAP);
-		data= new GridData();
-		data.widthHint= convertWidthInCharsToPixels(fAskAgainCheckBox, 70);
-		fAskAgainCheckBox.setLayoutData(data);
-		fAskAgainCheckBox.setText(LauncherMessages.getString("JavaUISourceLocator.askagain.message")); //$NON-NLS-1$
-		
-		return composite;
-	}
-	
-	/**
-	 * @see Dialog#convertWidthInCharsToPixels(FontMetrics, int)
-	 */
-	protected int convertWidthInCharsToPixels(Control control, int chars) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		FontMetrics fontMetrics= gc.getFontMetrics();
-		gc.dispose();
-		return Dialog.convertWidthInCharsToPixels(fontMetrics, chars);
-	}	
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		try {
-			if (fAskAgainCheckBox != null) {
-				fNotAskAgain= fAskAgainCheckBox.getSelection();
-			}
-			ILaunchConfigurationWorkingCopy wc = fConfiguration.getWorkingCopy();
-			fSourceLookupBlock.performApply(wc);
-			if (!fConfiguration.contentsEqual(wc)) {
-				fConfiguration = wc.doSave();
-			}
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-		super.okPressed();
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
deleted file mode 100644
index be46a35..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/JavaUISourceLocator.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.eclipse.jdt.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
- 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation;
-import org.eclipse.jdt.launching.sourcelookup.JavaSourceLocator;
-
-/**
- * A source locator that prompts the user to find source when source cannot
- * be found on the current source lookup path.
- * <p>
- * This class is intended to be instantiated. This class is not
- * intended to be subclassed.
- * </p>
- * @since 2.0
- */
-
-public class JavaUISourceLocator implements IPersistableSourceLocator {
-
-	/**
-	 * Identifier for the 'Prompting Java Source Locator' extension
-	 * (value <code>"org.eclipse.jdt.debug.ui.javaSourceLocator"</code>).
-	 */
-	public static final String ID_PROMPTING_JAVA_SOURCE_LOCATOR = IJavaDebugUIConstants.PLUGIN_ID + ".javaSourceLocator"; //$NON-NLS-1$
-	
-	/**
-	 * The project being debugged.
-	 */
-	private IJavaProject fJavaProject; 
-	
-	/**
-	 * Underlying source locator.
-	 */
-	private JavaSourceLocator fSourceLocator;
-	
-	/**
-	 * Whether the user should be prompted for source.
-	 * Initially true, until the user checks the 'do not
-	 * ask again' box.
-	 */
-	private boolean fAllowedToAsk;
-	
-	/**
-	 * Constructs an empty source locator.
-	 */
-	public JavaUISourceLocator() {
-		fSourceLocator = new JavaSourceLocator();
-		fAllowedToAsk= true;
-	}
-
-	/**
-	 * Constructs a new 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 JavaUISourceLocator(IJavaProject[] projects, boolean includeRequired) throws JavaModelException {
-		fSourceLocator = new JavaSourceLocator(projects, includeRequired);
-		fAllowedToAsk = true;
-	}	
-		
-	/**
-	 * Constructs a source locator that searches for source
-	 * in the given Java project, and all of its required projects,
-	 * as specified by its build path or default source lookup
-	 * settings.
-	 * 
-	 * @param project Java project
-	 * @exception CoreException if unable to read the project's
-	 * 	 build path
-	 */
-	public JavaUISourceLocator(IJavaProject project) throws CoreException {
-		fJavaProject= project;
-		IJavaSourceLocation[] sls = JavaSourceLocator.getDefaultSourceLocations(project);
-		fSourceLocator= new JavaSourceLocator(project);
-		if (sls != null) {
-			fSourceLocator.setSourceLocations(sls);
-		}
-		fAllowedToAsk= true;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame)
-	 */
-	public Object getSourceElement(IStackFrame stackFrame) {
-		Object res= fSourceLocator.getSourceElement(stackFrame);
-		if (res == null && fAllowedToAsk) {
-			IJavaStackFrame frame= (IJavaStackFrame)stackFrame.getAdapter(IJavaStackFrame.class);
-			if (frame != null) {
-				showDebugSourcePage(frame);
-				res= fSourceLocator.getSourceElement(stackFrame);
-			}
-		}
-		return res;
-	}
-	
-	/**
-	 * Prompts to locate the source of the given type. Prompts in the UI
-	 * thread, since a source lookup could be the result of a conditional
-	 * breakpoint looking up source for an evaluation, from the event
-	 * dispatch thread.
-	 * 
-	 * @param typeName the name of the type for which source
-	 *  could not be located
-	 */
-	private void showDebugSourcePage(final IJavaStackFrame frame) {
-		Runnable prompter = new Runnable() {
-			public void run() {
-				try {
-					String message = LauncherMessages.getFormattedString("JavaUISourceLocator.selectprojects.message", frame.getDeclaringTypeName()); //$NON-NLS-1$
-					ILaunchConfiguration configuration = frame.getLaunch().getLaunchConfiguration();
-					JavaSourceLookupDialog dialog= new JavaSourceLookupDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), message, configuration);
-					int result = dialog.open();
-					if (result == dialog.OK) {
-						fAllowedToAsk= !dialog.isNotAskAgain();
-						JavaUISourceLocator.this.initializeDefaults(configuration);
-					}
-				} catch (CoreException e) {
-					JDIDebugUIPlugin.log(e);
-				}
-			}
-		};
-		JDIDebugUIPlugin.getStandardDisplay().syncExec(prompter);
-	}
-		
-	/**
-	 * @see IPersistableSourceLocator#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		String memento = fSourceLocator.getMemento();
-		String handle = fJavaProject.getHandleIdentifier();
-		memento = handle + '\n' + memento;
-		return memento;
-	}
-
-	/**
-	 * @see IPersistableSourceLocator#initializeDefaults(ILaunchConfiguration)
-	 */
-	public void initializeDefaults(ILaunchConfiguration configuration)
-		throws CoreException {
-			fSourceLocator.initializeDefaults(configuration);
-			fJavaProject = JavaRuntime.getJavaProject(configuration);
-	}
-
-	/**
-	 * @see IPersistableSourceLocator#initializeFromMemento(String)
-	 */
-	public void initializeFromMemento(String memento) throws CoreException {
-		int index = memento.indexOf('\n');
-		String handle = memento.substring(0, index);
-		String rest = memento.substring(index + 1);
-		fJavaProject = (IJavaProject)JavaCore.create(handle);
-		fSourceLocator.initializeFromMemento(rest);
-	}
-	
-	/**
-	 * @see JavaSourceLocator#getSourceLocations()
-	 */
-	public IJavaSourceLocation[] getSourceLocations() {
-		return fSourceLocator.getSourceLocations();
-	}
-	
-	/**
-	 * @see JavaSourceLocator#setSourceLocations(IJavaSourceLocation[])
-	 */
-	public void setSourceLocations(IJavaSourceLocation[] locations) {
-		fSourceLocator.setSourceLocations(locations);
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
deleted file mode 100644
index 3dc6cbd..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaArgumentsTab.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.eclipse.jdt.debug.ui.launchConfigurations;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * A launch configuration tab that displays and edits program arguments,
- * VM arguments, and working directory launch configuration attributes.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-public class JavaArgumentsTab extends JavaLaunchConfigurationTab {
-		
-	// Program arguments widgets
-	protected Label fPrgmArgumentsLabel;
-	protected Text fPrgmArgumentsText;
-
-	// VM arguments widgets
-	protected Label fVMArgumentsLabel;
-	protected Text fVMArgumentsText;
-	
-	// Working directory
-	protected WorkingDirectoryBlock fWorkingDirectoryBlock = new WorkingDirectoryBlock();
-		
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-		
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMENTS_TAB);
-		GridLayout topLayout = new GridLayout();
-		comp.setLayout(topLayout);		
-		GridData gd;
-		
-		createVerticalSpacer(comp, 1);
-				
-		fPrgmArgumentsLabel = new Label(comp, SWT.NONE);
-		fPrgmArgumentsLabel.setText(LauncherMessages.getString("JavaArgumentsTab.&Program_arguments__5")); //$NON-NLS-1$
-						
-		fPrgmArgumentsText = new Text(comp, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 40;
-		fPrgmArgumentsText.setLayoutData(gd);
-		fPrgmArgumentsText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fVMArgumentsLabel = new Label(comp, SWT.NONE);
-		fVMArgumentsLabel.setText(LauncherMessages.getString("JavaArgumentsTab.VM_ar&guments__6")); //$NON-NLS-1$
-		
-		fVMArgumentsText = new Text(comp, SWT.MULTI | SWT.WRAP| SWT.BORDER | SWT.V_SCROLL);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 40;
-		fVMArgumentsText.setLayoutData(gd);	
-		fVMArgumentsText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});	
-		
-		createVerticalSpacer(comp, 1);
-						
-		fWorkingDirectoryBlock.createControl(comp);
-		
-	}
-			
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-	}
-		
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		return fWorkingDirectoryBlock.isValid(config);
-	}
-
-	/**
-	 * Defaults are empty.
-	 * 
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, (String)null);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			fPrgmArgumentsText.setText(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); //$NON-NLS-1$
-			fVMArgumentsText.setText(configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "")); //$NON-NLS-1$
-			fWorkingDirectoryBlock.initializeFrom(configuration);
-		} catch (CoreException e) {
-			setErrorMessage(LauncherMessages.getString("JavaArgumentsTab.Exception_occurred_reading_configuration___15") + e.getStatus().getMessage()); //$NON-NLS-1$
-			JDIDebugUIPlugin.log(e);
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getAttributeValueFrom(fPrgmArgumentsText));
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getAttributeValueFrom(fVMArgumentsText));
-		fWorkingDirectoryBlock.performApply(configuration);
-	}
-
-	/**
-	 * Retuns the string in the text widget, or <code>null</code> if empty.
-	 * 
-	 * @return text or <code>null</code>
-	 */
-	protected String getAttributeValueFrom(Text text) {
-		String content = text.getText().trim();
-		if (content.length() > 0) {
-			return content;
-		}
-		return null;
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("JavaArgumentsTab.&Arguments_16"); //$NON-NLS-1$
-	}	
-	
-	/**
-	 * @see ILaunchConfigurationTab#setLaunchConfigurationDialog(ILaunchConfigurationDialog)
-	 */
-	public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) {
-		super.setLaunchConfigurationDialog(dialog);
-		fWorkingDirectoryBlock.setLaunchConfigurationDialog(dialog);
-	}	
-	/**
-	 * @see ILaunchConfigurationTab#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		String m = super.getErrorMessage();
-		if (m == null) {
-			return fWorkingDirectoryBlock.getErrorMessage();
-		}
-		return m;
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#getMessage()
-	 */
-	public String getMessage() {
-		String m = super.getMessage();
-		if (m == null) {
-			return fWorkingDirectoryBlock.getMessage();
-		}
-		return m;
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return JavaDebugImages.get(JavaDebugImages.IMG_VIEW_ARGUMENTS_TAB);
-	}	
-
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java
deleted file mode 100644
index cd3a7a6..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java
+++ /dev/null
@@ -1,366 +0,0 @@
-package org.eclipse.jdt.debug.ui.launchConfigurations;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.actions.AddAdvancedAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddExternalFolderAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddExternalJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddFolderAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddProjectAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddVariableAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AttachSourceAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveDownAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveUpAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RemoveAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-
-/**
- * A launch configuration tab that displays and edits the user and
- * bootstrap classes comprising the classpath launch configuration
- * attribute.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-public class JavaClasspathTab extends JavaLaunchConfigurationTab {
-
-	protected TabFolder fPathTabFolder;
-	protected TabItem fBootPathTabItem;
-	protected TabItem fClassPathTabItem;
-	protected RuntimeClasspathViewer fClasspathViewer;
-	protected RuntimeClasspathViewer fBootpathViewer;
-	protected Button fClassPathDefaultButton;
-	protected List fActions = new ArrayList(10);
-	protected Image fImage = null;
-
-	/**
-	 * The last launch config this tab was initialized from
-	 */
-	protected ILaunchConfiguration fLaunchConfiguration;
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_CLASSPATH_TAB);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);		
-		GridData gd;
-		
-		createVerticalSpacer(comp, 2);
-		
-		fPathTabFolder = new TabFolder(comp, SWT.NONE);
-		gd = new GridData(GridData.FILL_BOTH);
-		fPathTabFolder.setLayoutData(gd);
-		fPathTabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				TabItem[] tabs = fPathTabFolder.getSelection();
-				if (tabs.length == 1) {
-					RuntimeClasspathViewer data = (RuntimeClasspathViewer)tabs[0].getData();
-					retargetActions(data);
-				}
-			}
-		});
-		
-		Composite classPathComp = new Composite(fPathTabFolder, SWT.NONE);
-		GridLayout classPathLayout = new GridLayout();
-		classPathComp.setLayout(classPathLayout);
-		
-		fClasspathViewer = new RuntimeClasspathViewer(fPathTabFolder);
-		fClasspathViewer.addEntriesChangedListener(this);
-		fClassPathTabItem = new TabItem(fPathTabFolder, SWT.NONE, 0);
-		fClassPathTabItem.setText(LauncherMessages.getString("JavaClasspathTab.Us&er_classes_1")); //$NON-NLS-1$
-		fClassPathTabItem.setControl(fClasspathViewer.getControl());
-		fClassPathTabItem.setData(fClasspathViewer);
-
-		fBootpathViewer = new RuntimeClasspathViewer(fPathTabFolder);
-		fBootpathViewer.addEntriesChangedListener(this);
-		fBootPathTabItem = new TabItem(fPathTabFolder, SWT.NONE, 1);
-		fBootPathTabItem.setText(LauncherMessages.getString("JavaClasspathTab.&Bootstrap_classes_2")); //$NON-NLS-1$
-		fBootPathTabItem.setControl(fBootpathViewer.getControl());
-		fBootPathTabItem.setData(fBootpathViewer);
-
-		Composite pathButtonComp = new Composite(comp, SWT.NONE);
-		GridLayout pathButtonLayout = new GridLayout();
-		pathButtonLayout.marginHeight = 0;
-		pathButtonLayout.marginWidth = 0;
-		pathButtonComp.setLayout(pathButtonLayout);
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		pathButtonComp.setLayoutData(gd);
-
-		createVerticalSpacer(comp, 2);
-						
-		fClassPathDefaultButton = new Button(comp, SWT.CHECK);
-		fClassPathDefaultButton.setText(LauncherMessages.getString("JavaEnvironmentTab.Use_defau&lt_classpath_10")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fClassPathDefaultButton.setLayoutData(gd);
-		fClassPathDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleClasspathDefaultButtonSelected();
-			}
-		});
-		
-		createVerticalSpacer(pathButtonComp, 1);
-		
-		List advancedActions = new ArrayList(5);
-		
-		RuntimeClasspathAction action = new MoveUpAction(null);								
-		Button button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);
-		
-		action = new MoveDownAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new RemoveAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-		
-		action = new AddProjectAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new AddJarAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new AddExternalJarAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new AddFolderAction(null);								
-		advancedActions.add(action);
-
-		action = new AddExternalFolderAction(null);								
-		advancedActions.add(action);		
-
-		action = new AddVariableAction(null);								
-		advancedActions.add(action);		
-		
-		action = new AttachSourceAction(null);								
-		advancedActions.add(action);
-		
-		IAction[] adv = (IAction[])advancedActions.toArray(new IAction[advancedActions.size()]);
-		action = new AddAdvancedAction(null, adv);
-		button = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);
-														
-		retargetActions(fClasspathViewer);		
-	}
-
-	/**
-	 * The default classpath button has been toggled
-	 */
-	protected void handleClasspathDefaultButtonSelected() {
-		boolean useDefault = fClassPathDefaultButton.getSelection();
-		fClassPathDefaultButton.setSelection(useDefault);
-		if (useDefault) {
-			displayDefaultClasspath();
-		}
-		fClasspathViewer.setEnabled(!useDefault);
-		fBootpathViewer.setEnabled(!useDefault);
-		updateLaunchConfigurationDialog();
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		setLaunchConfiguration(configuration);
-		try {
-			boolean useDefault = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
-			fClassPathDefaultButton.setSelection(useDefault);
-			setClasspathEntries(JavaRuntime.computeUnresolvedRuntimeClasspath(configuration));
-			fClasspathViewer.setEnabled(!useDefault);
-			fBootpathViewer.setEnabled(!useDefault);
-			fClasspathViewer.setLaunchConfiguration(configuration);
-			fBootpathViewer.setLaunchConfiguration(configuration);
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}			
-	}
-
-	/**
-	 * Displays the default classpath in the UI
-	 */
-	protected void displayDefaultClasspath() {
-		ILaunchConfiguration config = getLaunchConfiguration();
-		ILaunchConfigurationWorkingCopy wc = null;
-		try {
-			if (config.isWorkingCopy()) {
-				wc= (ILaunchConfigurationWorkingCopy)config;
-			} else {
-				wc = config.getWorkingCopy();
-			}
-			performApply(wc);
-			setClasspathEntries(JavaRuntime.computeUnresolvedRuntimeClasspath(wc));
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-
-	}
-	
-	/**
-	 * Displays the given classpath entries, grouping into user and bootstrap entries
-	 */
-	protected void setClasspathEntries(IRuntimeClasspathEntry[] entries) {
-		List cp = new ArrayList(entries.length);
-		List bp = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			switch (entries[i].getClasspathProperty()) {
-				case IRuntimeClasspathEntry.USER_CLASSES:
-					cp.add(entries[i]);
-					break;
-				default:
-					bp.add(entries[i]);
-					break;
-			}
-		}
-		fClasspathViewer.setEntries((IRuntimeClasspathEntry[])cp.toArray(new IRuntimeClasspathEntry[cp.size()]));
-		fBootpathViewer.setEntries((IRuntimeClasspathEntry[])bp.toArray(new IRuntimeClasspathEntry[bp.size()]));		
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		boolean def = fClassPathDefaultButton.getSelection();		
-		if (def) {
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, (String)null);
-		} else {
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-			try {
-				IRuntimeClasspathEntry[] boot = fBootpathViewer.getEntries();
-				IRuntimeClasspathEntry[] user = fClasspathViewer.getEntries();
-				List mementos = new ArrayList(boot.length + user.length);
-				for (int i = 0; i < boot.length; i++) {
-					boot[i].setClasspathProperty(IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-					mementos.add(boot[i].getMemento());
-				}
-				for (int i = 0; i < user.length; i++) {
-					user[i].setClasspathProperty(IRuntimeClasspathEntry.USER_CLASSES);
-					mementos.add(user[i].getMemento());
-				}
-				configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, mementos);
-			} catch (CoreException e) {
-				JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JavaClasspathTab.Unable_to_save_classpath_1"), e); //$NON-NLS-1$
-			}	
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("JavaClasspathTab.Cla&ss_path_3"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		if (fImage == null) {
-			fImage = JavaPluginImages.DESC_TOOL_CLASSPATH_ORDER.createImage();
-		}
-		return fImage;
-	}		
-	
-	/**
-	 * Sets the java project currently specified by the
-	 * given launch config, if any.
-	 */
-	protected void setLaunchConfiguration(ILaunchConfiguration config) {
-		fLaunchConfiguration = config;
-	}	
-	
-	/**
-	 * Returns the current java project context
-	 */
-	protected ILaunchConfiguration getLaunchConfiguration() {
-		return fLaunchConfiguration;
-	}
-	
-	/**
-	 * Adds the given action to the action collection in this tab
-	 */
-	protected void addAction(RuntimeClasspathAction action) {
-		fActions.add(action);
-	}
-	
-	/**
-	 * Re-targets actions to the given viewer
-	 */
-	protected void retargetActions(RuntimeClasspathViewer viewer) {
-		Iterator actions = fActions.iterator();
-		while (actions.hasNext()) {
-			RuntimeClasspathAction action = (RuntimeClasspathAction)actions.next();
-			action.setViewer(viewer);
-		}
-	}
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		if (fClasspathViewer != null) {
-			fClasspathViewer.removeEntriesChangedListener(this);
-			fBootpathViewer.removeEntriesChangedListener(this);
-		}
-		if (fImage != null) {
-			fImage.dispose();
-		}
-		super.dispose();
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
deleted file mode 100644
index d6a612b..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaConnectTab.java
+++ /dev/null
@@ -1,562 +0,0 @@
-package org.eclipse.jdt.debug.ui.launchConfigurations;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.ComboFieldEditor;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMConnector;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-import com.sun.jdi.connect.Connector;
-/**
- * A launch configuration tab that displays and edits the project associated
- * with a remote connection and the connector used to connect to a remote
- * VM.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-public class JavaConnectTab extends JavaLaunchConfigurationTab implements IPropertyChangeListener {
-
-	// Project UI widgets
-	protected Label fProjLabel;
-	protected Text fProjText;
-	protected Button fProjButton;
-	
-	// Allow terminate UI widgets
-	protected Button fAllowTerminateButton;
-	
-	// Connector attributes for selected connector
-	protected Map fArgumentMap;
-	protected Map fFieldEditorMap = new HashMap();
-	protected Composite fArgumentComposite;
-	// the selected connector
-	protected IVMConnector fConnector;
-	
-	// Connector combo
-	protected Combo fConnectorCombo;
-	protected IVMConnector[] fConnectors = JavaRuntime.getVMConnectors();
-	
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_CONNECT_TAB);
-		GridLayout topLayout = new GridLayout();
-		topLayout.marginHeight = 0;
-		comp.setLayout(topLayout);		
-		GridData gd;
-		
-		createVerticalSpacer(comp, 1);
-
-		Composite projComp = new Composite(comp, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 2;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		projComp.setLayoutData(gd);
-		
-		fProjLabel = new Label(projComp, SWT.NONE);
-		fProjLabel.setText(LauncherMessages.getString("JavaConnectTab.&Project__2")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fProjLabel.setLayoutData(gd);
-		
-		fProjText = new Text(projComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fProjText.setLayoutData(gd);
-		fProjText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fProjButton = createPushButton(projComp, LauncherMessages.getString("JavaConnectTab.&Browse_3"), null); //$NON-NLS-1$
-		fProjButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleProjectButtonSelected();
-			}
-		});
-		
-		Composite connectorComp = new Composite(comp,SWT.NONE);
-		GridLayout y = new GridLayout();
-		y.numColumns = 2;
-		y.marginHeight = 0;
-		y.marginWidth = 0;
-		connectorComp.setLayout(y);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		connectorComp.setLayoutData(gd);
-		
-		Label l = new Label(connectorComp, SWT.NONE);
-		l.setText(LauncherMessages.getString("JavaConnectTab.Connect&ion_Type__7")); //$NON-NLS-1$
-		gd = new GridData(GridData.BEGINNING);
-		gd.horizontalSpan = 2;
-		l.setLayoutData(gd);
-		
-		fConnectorCombo = new Combo(connectorComp, SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fConnectorCombo.setLayoutData(gd);
-		String[] names = new String[fConnectors.length];
-		for (int i = 0; i < fConnectors.length; i++) {
-			names[i] = fConnectors[i].getName();
-		}
-		fConnectorCombo.setItems(names);
-		fConnectorCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				handleConnectorComboModified();
-			}
-		});
-		
-		createVerticalSpacer(comp, 2);
-		
-		Group group = new Group(comp, SWT.NONE);
-		group.setText(LauncherMessages.getString("JavaConnectTab.Connection_Properties_1")); //$NON-NLS-1$
-		group.setLayout(new GridLayout());
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		group.setLayoutData(gd);		
-	
-		//Add in an intermediate composite to allow for spacing
-		Composite spacingComposite = new Composite(group, SWT.NONE);
-		y = new GridLayout();
-		spacingComposite.setLayout(y);
-		gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		spacingComposite.setLayoutData(gd);	
-		fArgumentComposite= spacingComposite;
-		
-		createVerticalSpacer(comp, 2);		
-		
-		fAllowTerminateButton = new Button(comp, SWT.CHECK);
-		fAllowTerminateButton.setText(LauncherMessages.getString("JavaConnectTab.&Allow_termination_of_remote_VM_6")); //$NON-NLS-1$
-		fAllowTerminateButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-
-	/**
-	 * Update the argument area to show the selected connector's arguments
-	 */
-	protected void handleConnectorComboModified() {
-		int index = fConnectorCombo.getSelectionIndex();
-		if ( (index < 0) || (index >= fConnectors.length) ) {
-			return;
-		}
-		IVMConnector vm = fConnectors[index];
-		if (vm.equals(fConnector)) {
-			return; // selection did not change
-		}
-		fConnector = vm;
-		try {
-			fArgumentMap = vm.getDefaultArguments();
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JavaConnectTab.Unable_to_display_connection_arguments._2"), e.getStatus()); //$NON-NLS-1$
-			return;
-		}
-		
-		// Dispose of any current child widgets in the tab holder area
-		Control[] children = fArgumentComposite.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].dispose();
-		}
-		fFieldEditorMap.clear();
-		PreferenceStore store = new PreferenceStore();
-		// create editors
-		Iterator keys = vm.getArgumentOrder().iterator();
-		while (keys.hasNext()) {
-			String key = (String)keys.next();
-			Connector.Argument arg = (Connector.Argument)fArgumentMap.get(key);
-			FieldEditor field = null;
-			if (arg instanceof Connector.IntegerArgument) {
-				store.setDefault(arg.name(), ((Connector.IntegerArgument)arg).intValue());
-				field = new IntegerFieldEditor(arg.name(), getLabel(arg.label()), fArgumentComposite);
-			} else if (arg instanceof Connector.SelectedArgument) {
-				List choices = ((Connector.SelectedArgument)arg).choices();
-				String[][] namesAndValues = new String[choices.size()][2];
-				Iterator iter = choices.iterator();
-				int count = 0;
-				while (iter.hasNext()) {
-					String choice = (String)iter.next();
-					namesAndValues[count][0] = choice;
-					namesAndValues[count][1] = choice;
-					count++;
-				}
-				store.setDefault(arg.name(), arg.value());
-				field = new ComboFieldEditor(arg.name(), getLabel(arg.label()), namesAndValues, fArgumentComposite);
-			} else if (arg instanceof Connector.StringArgument) {
-				store.setDefault(arg.name(), arg.value());
-				field = new StringFieldEditor(arg.name(), getLabel(arg.label()), fArgumentComposite);
-			} else if (arg instanceof Connector.BooleanArgument) {
-				store.setDefault(arg.name(), ((Connector.BooleanArgument)arg).booleanValue());
-				field = new BooleanFieldEditor(arg.name(), getLabel(arg.label()), fArgumentComposite);					
-			}
-			field.setPreferenceStore(store);
-			field.loadDefault();
-			field.setPropertyChangeListener(this);
-			fFieldEditorMap.put(key, field);
-		}
-		
-		fArgumentComposite.getParent().getParent().layout();
-		fArgumentComposite.layout();
-	}
-	
-	/**
-	 * Adds a colon to the label if required
-	 */
-	protected String getLabel(String label) {
-		if (!label.endsWith(":")) { //$NON-NLS-1$
-			label += ":"; //$NON-NLS-1$
-		}
-		return label;
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		updateProjectFromConfig(config);
-		updateAllowTerminateFromConfig(config);
-		updateConnectionFromConfig(config);
-	}
-	
-	protected void updateProjectFromConfig(ILaunchConfiguration config) {
-		String projectName = ""; //$NON-NLS-1$
-		try {
-			projectName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);	
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-		fProjText.setText(projectName);
-	}
-	
-	protected void updateAllowTerminateFromConfig(ILaunchConfiguration config) {
-		boolean allowTerminate = false;
-		try {
-			allowTerminate = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, false);	
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);		
-		}
-		fAllowTerminateButton.setSelection(allowTerminate);	
-	}
-
-	protected void updateConnectionFromConfig(ILaunchConfiguration config) {
-		String id = null;
-		try {
-			id = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_CONNECTOR, JavaRuntime.getDefaultVMConnector().getIdentifier());
-			fConnectorCombo.setText(JavaRuntime.getVMConnector(id).getName());	
-
-
-			Map attrMap = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, (Map)null);
-			if (attrMap == null) {
-				return;
-			}
-			Iterator keys = attrMap.keySet().iterator();
-			while (keys.hasNext()) {
-				String key = (String)keys.next();
-				Connector.Argument arg = (Connector.Argument)fArgumentMap.get(key);
-				FieldEditor editor = (FieldEditor)fFieldEditorMap.get(key);
-				if (arg != null && editor != null) {
-					String value = (String)attrMap.get(key);
-					if (arg instanceof Connector.StringArgument || arg instanceof Connector.SelectedArgument) {
-						editor.getPreferenceStore().setValue(key, value);
-					} else if (arg instanceof Connector.BooleanArgument) {
-						boolean b = new Boolean(value).booleanValue();
-						editor.getPreferenceStore().setValue(key, b);
-					} else if (arg instanceof Connector.IntegerArgument) {
-						int i = new Integer(value).intValue();
-						editor.getPreferenceStore().setValue(key, i);
-					}
-					editor.load();
-				}
-			}						
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}	
-			
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-	}
-		
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText().trim());
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, fAllowTerminateButton.getSelection());
-		IVMConnector vmc = getSelectedConnector();
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_CONNECTOR, vmc.getIdentifier());
-		
-		Map attrMap = new HashMap(fFieldEditorMap.size());
-		Iterator keys = fFieldEditorMap.keySet().iterator();
-		while (keys.hasNext()) {
-			String key = (String)keys.next();
-			FieldEditor editor = (FieldEditor)fFieldEditorMap.get(key);
-			if (!editor.isValid()) {
-				return;
-			}
-			Connector.Argument arg = (Connector.Argument)fArgumentMap.get(key);
-			editor.store();
-			if (arg instanceof Connector.StringArgument || arg instanceof Connector.SelectedArgument) {
-				String value = editor.getPreferenceStore().getString(key);
-				attrMap.put(key, value);
-			} else if (arg instanceof Connector.BooleanArgument) {
-				boolean value = editor.getPreferenceStore().getBoolean(key);
-				attrMap.put(key, new Boolean(value).toString());
-			} else if (arg instanceof Connector.IntegerArgument) {
-				int value = editor.getPreferenceStore().getInt(key);
-				attrMap.put(key, new Integer(value).toString());
-			}
-		}				
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, attrMap);
-	}
-		
-	/**
-	 * Show a dialog that lets the user select a project.  This in turn provides
-	 * context for the main type, allowing the user to key a main type name, or
-	 * constraining the search for main types to the specified project.
-	 */
-	protected void handleProjectButtonSelected() {
-		IJavaProject project = chooseJavaProject();
-		if (project == null) {
-			return;
-		}
-		
-		String projectName = project.getElementName();
-		fProjText.setText(projectName);		
-	}
-	
-	/**
-	 * Realize a Java Project selection dialog and return the first selected project,
-	 * or null if there was none.
-	 */
-	protected IJavaProject chooseJavaProject() {
-		IJavaProject[] projects;
-		try {
-			projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
-		} catch (JavaModelException e) {
-			JDIDebugUIPlugin.log(e);
-			projects= new IJavaProject[0];
-		}
-		
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle(LauncherMessages.getString("JavaConnectTab.Project_selection_10")); //$NON-NLS-1$
-		dialog.setMessage(LauncherMessages.getString("JavaConnectTab.Choose_a_project_to_constrain_the_search_for_main_types_11")); //$NON-NLS-1$
-		dialog.setElements(projects);
-		
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject != null) {
-			dialog.setInitialSelections(new Object[] { javaProject });
-		}
-		if (dialog.open() == dialog.OK) {			
-			return (IJavaProject) dialog.getFirstResult();
-		}			
-		return null;		
-	}
-	
-	/**
-	 * Return the IJavaProject corresponding to the project name in the project name
-	 * text field, or null if the text does not match a project name.
-	 */
-	protected IJavaProject getJavaProject() {
-		String projectName = fProjText.getText().trim();
-		if (projectName.length() < 1) {
-			return null;
-		}
-		return getJavaModel().getJavaProject(projectName);		
-	}
-	
-	/**
-	 * Convenience method to get the workspace root.
-	 */
-	private IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	
-	/**
-	 * Convenience method to get access to the java model.
-	 */
-	private IJavaModel getJavaModel() {
-		return JavaCore.create(getWorkspaceRoot());
-	}
-
-	/**
-	 * Initialize default settings for the given Java element
-	 */
-	protected void initializeDefaults(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		initializeJavaProject(javaElement, config);
-		initializeName(javaElement, config);
-		initializeHardCodedDefaults(config);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		IJavaElement javaElement = getContext();
-		if (javaElement == null) {
-			initializeHardCodedDefaults(config);
-		} else {
-			initializeDefaults(javaElement, config);
-		}
-	}
-
-	/**
-	 * Find the first instance of a type, compilation unit, class file or project in the
-	 * specified element's parental hierarchy, and use this as the default name.
-	 */
-	protected void initializeName(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		String name = ""; //$NON-NLS-1$
-		try {
-			IResource resource = javaElement.getUnderlyingResource();
-			if (resource != null) {
-				name = resource.getName();
-				int index = name.lastIndexOf('.');
-				if (index > 0) {
-					name = name.substring(0, index);
-				}
-			} else {
-				name= javaElement.getElementName();
-			}
-			name = getLaunchConfigurationDialog().generateName(name);				
-		} catch (JavaModelException jme) {
-			JDIDebugUIPlugin.log(jme);
-		}
-		config.rename(name);
-	}
-
-	/**
-	 * Initialize those attributes whose default values are independent of any context.
-	 */
-	protected void initializeHardCodedDefaults(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, false);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_CONNECTOR, JavaRuntime.getDefaultVMConnector().getIdentifier());
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-
-		// project		
-		String name = fProjText.getText().trim();
-		if (name.length() > 0) {
-			if (!ResourcesPlugin.getWorkspace().getRoot().getProject(name).exists()) {
-				setErrorMessage(LauncherMessages.getString("JavaConnectTab.Project_does_not_exist_14")); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		Iterator keys = fFieldEditorMap.keySet().iterator();
-		while (keys.hasNext()) {
-			String key = (String)keys.next();
-			Connector.Argument arg = (Connector.Argument)fArgumentMap.get(key);
-			FieldEditor editor = (FieldEditor)fFieldEditorMap.get(key);
-			if (editor instanceof StringFieldEditor) {
-				String value = ((StringFieldEditor)editor).getStringValue();
-				if (!arg.isValid(value)) {
-					setErrorMessage(arg.label() + LauncherMessages.getString("JavaConnectTab._is_invalid._5")); //$NON-NLS-1$
-					return false;
-				}		
-			}
-		}				
-						
-		return true;
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("JavaConnectTab.Conn&ect_20"); //$NON-NLS-1$
-	}			
-	
-	/**
-	 * @see ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return DebugUITools.getImage(IDebugUIConstants.IMG_LCL_DISCONNECT);
-	}
-		
-	/**
-	 * Returns the selected connector
-	 */
-	protected IVMConnector getSelectedConnector() {
-		return fConnector;
-	}
-	/**
-	 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		updateLaunchConfigurationDialog();
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
deleted file mode 100644
index b6846ae..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaJRETab.java
+++ /dev/null
@@ -1,516 +0,0 @@
-package org.eclipse.jdt.debug.ui.launchConfigurations;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.io.File;
-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.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.AddVMDialog;
-import org.eclipse.jdt.internal.debug.ui.launcher.IAddVMDialogRequestor;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.VMStandin;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-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.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * A launch configuration tab that displays and edits the VM install 
- * launch configuration attributes.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-
-public class JavaJRETab extends JavaLaunchConfigurationTab implements IAddVMDialogRequestor {
-
-	// UI widgets
-	protected Label fJRELabel;
-	protected Combo fJRECombo;
-	protected Button fJREAddButton;
-	
-	// unknown JRE
-	protected String fUnknownVMType;
-	protected String fUnknownVMName;
-	protected boolean fOkToClearUnknownVM = true;
-
-	// Collections used to populate the JRE Combo box
-	protected IVMInstallType[] fVMTypes;
-	protected List fVMStandins;	
-	
-	// Dynamic JRE UI widgets
-	protected ILaunchConfigurationTab fDynamicTab;
-	protected Composite fDynamicTabHolder;
-	protected boolean fUseDynamicArea = true;
-	
-	protected ILaunchConfigurationWorkingCopy fWorkingCopy;
-	protected ILaunchConfiguration fLaunchConfiguration;
-	
-	// Constants
-	protected static final String DEFAULT_JRE_NAME = LauncherMessages.getString("JavaJRETab.Default_1"); //$NON-NLS-1$
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-		
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite topComp = new Composite(parent, SWT.NONE);
-		setControl(topComp);
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_JRE_TAB);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		topLayout.marginHeight = 0;
-		topLayout.marginWidth = 0;
-		topComp.setLayout(topLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		topComp.setLayoutData(gd);
-		
-		createVerticalSpacer(topComp, 2);
-		
-		fJRELabel = new Label(topComp, SWT.NONE);
-		fJRELabel.setText(LauncherMessages.getString("JavaJRETab.Run_with_JRE__1")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fJRELabel.setLayoutData(gd);
-		
-		fJRECombo = new Combo(topComp, SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fJRECombo.setLayoutData(gd);
-		initializeJREComboBox();
-		fJRECombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				handleJREComboBoxModified();
-			}
-		});
-		
-		fJREAddButton = createPushButton(topComp, LauncherMessages.getString("JavaJRETab.Add"), null);  //$NON-NLS-1$
-		fJREAddButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleJREAddButtonSelected();
-			}
-		});	
-		
-		setDynamicTabHolder(new Composite(topComp, SWT.NONE));
-		GridLayout tabHolderLayout = new GridLayout();
-		tabHolderLayout.marginHeight= 0;
-		tabHolderLayout.marginWidth= 0;
-		tabHolderLayout.numColumns = 1;
-		getDynamicTabHolder().setLayout(tabHolderLayout);
-		gd = new GridData(GridData.FILL_BOTH);
-		getDynamicTabHolder().setLayoutData(gd);
-	}
-
-	protected void setDynamicTabHolder(Composite tabHolder) {
-		this.fDynamicTabHolder = tabHolder;
-	}
-
-	protected Composite getDynamicTabHolder() {
-		return fDynamicTabHolder;
-	}
-
-	protected void setDynamicTab(ILaunchConfigurationTab tab) {
-		fDynamicTab = tab;
-	}
-
-	protected ILaunchConfigurationTab getDynamicTab() {
-		return fDynamicTab;
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		setLaunchConfigurationWorkingCopy(config);
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			dynamicTab.setDefaults(config);
-		}
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		fOkToClearUnknownVM = false;
-		if (getLaunchConfiguration() != null && !configuration.equals(getLaunchConfiguration())) {
-			fUnknownVMName = null;
-			fUnknownVMType = null;
-		}
-		setLaunchConfiguration(configuration);
-		updateJREFromConfig(configuration);
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			dynamicTab.initializeFrom(configuration);
-		}		
-		fOkToClearUnknownVM = true;
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		if (fUnknownVMName == null) {
-			int selectedIndex = fJRECombo.getSelectionIndex();
-			if (selectedIndex > -1) {
-				String vmName = null;
-				String vmTypeID = null;
-				if (selectedIndex > 0) {
-					VMStandin vmStandin = (VMStandin)fVMStandins.get(selectedIndex - 1);
-					vmName = vmStandin.getName();
-					vmTypeID = vmStandin.getVMInstallType().getId();
-				} 
-				configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, vmName);
-				configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, vmTypeID);
-			}	
-			ILaunchConfigurationTab dynamicTab = getDynamicTab();
-			if (dynamicTab == null) {
-				configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, (Map)null);
-			} else {
-				dynamicTab.performApply(configuration);
-			}
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-		
-		if (fUnknownVMName != null) {
-			setErrorMessage(MessageFormat.format(LauncherMessages.getString("JavaJRETab.Configuration_specifies_undefined_JRE_-_{0}_1"), new String[]{fUnknownVMName}));			 //$NON-NLS-1$
-			return false;
-		}
-		
-		// Don't do any validation if the default VM was chosen
-		int selectedIndex = fJRECombo.getSelectionIndex();
-		if (selectedIndex > 0) {
-			VMStandin vmStandin = (VMStandin)fVMStandins.get(selectedIndex - 1);
-			IVMInstall vm = vmStandin.convertToRealVM();
-			File location = vm.getInstallLocation();
-			if (location == null) {
-				setErrorMessage(LauncherMessages.getString("JavaJRETab.JRE_home_directory_not_specified_36")); //$NON-NLS-1$
-				return false;
-			}
-			if (!location.exists()) {
-				setErrorMessage(LauncherMessages.getString("JavaJRETab.JRE_home_directory_does_not_exist_37")); //$NON-NLS-1$
-				return false;
-			}			
-		} else if (selectedIndex < 0) {
-			setErrorMessage(LauncherMessages.getString("JavaJRETab.JRE_not_specified_38")); //$NON-NLS-1$
-			return false;
-		}		
-
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			return dynamicTab.isValid(config);
-		}
-		return true;
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("JavaJRETab.&JRE_1"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_LIBRARY);
-	}	
-
-	/**
-	 * @see IAddVMDialogRequestor#isDuplicateName(IVMInstallType, String)
-	 */
-	public boolean isDuplicateName(IVMInstallType type, String name) {
-		if (name.equals(DEFAULT_JRE_NAME)) {
-			return true;
-		}
-		for (int i = 0; i < fVMStandins.size(); i++) {
-			IVMInstall vm= (IVMInstall)fVMStandins.get(i);
-			if (vm.getVMInstallType() == type) {
-				if (vm.getName().equals(name))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see IAddVMDialogRequestor#vmAdded(IVMInstall)
-	 */
-	public void vmAdded(IVMInstall vm) {
-		((VMStandin)vm).convertToRealVM();		
-		try {
-			JavaRuntime.saveVMConfiguration();
-		} catch(CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-		fVMStandins.add(vm);
-		populateJREComboBox();
-		selectJREComboBoxEntry(vm.getVMInstallType().getId(), vm.getName());
-	}
-
-	protected void updateJREFromConfig(ILaunchConfiguration config) {
-		String vmName = null;
-		String vmTypeID = null;
-		try {
-			vmTypeID = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-			vmName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String)null);
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);			
-		}
-		selectJREComboBoxEntry(vmTypeID, vmName);
-	}	
-	
-	/**
-	 * Load the JRE related collections, and use these to set the values on the combo box
-	 */
-	protected void initializeJREComboBox() {
-		fVMTypes= JavaRuntime.getVMInstallTypes();
-		fVMStandins= createFakeVMInstalls(fVMTypes);
-		populateJREComboBox();		
-	}
-	
-	/**
-	 * Notification that the user changed the selection in the JRE combo box.
-	 */
-	protected void handleJREComboBoxModified() {
-		if (fOkToClearUnknownVM) {
-			fUnknownVMName = null;
-			fUnknownVMType = null;
-		}
-		
-		loadDynamicJREArea();
-		
-		// always set the newly created area with defaults
-		ILaunchConfigurationWorkingCopy wc = getLaunchConfigurationWorkingCopy();
-		if (getDynamicTab() == null) {
-			// remove any VM specfic args from the config
-			if (wc == null) {
-				if (getLaunchConfiguration().isWorkingCopy()) {
-					wc = (ILaunchConfigurationWorkingCopy)getLaunchConfiguration();
-				}
-			}
-			if (wc != null) {
-				wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, (Map)null);
-			}
-		} else {
-			if (wc == null) {
-				try {
-					if (getLaunchConfiguration().isWorkingCopy()) {
-						// get a fresh copy to work on
-						wc = ((ILaunchConfigurationWorkingCopy)getLaunchConfiguration()).getOriginal().getWorkingCopy();
-					} else {
-							wc = getLaunchConfiguration().getWorkingCopy();
-					}
-				} catch (CoreException e) {
-					JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JavaJRETab.Unable_to_initialize_defaults_for_selected_JRE_1"), e); //$NON-NLS-1$
-					return;
-				}
-			}
-			getDynamicTab().setDefaults(wc);
-			getDynamicTab().initializeFrom(wc);
-		}
-				
-		updateLaunchConfigurationDialog();		
-	}
-	
-	/**
-	 * Show a dialog that lets the user add a new JRE definition
-	 */
-	protected void handleJREAddButtonSelected() {
-		AddVMDialog dialog= new AddVMDialog(this, getShell(), fVMTypes, null);
-		dialog.setTitle(LauncherMessages.getString("vmPreferencePage.addJRE.title")); //$NON-NLS-1$
-		if (dialog.open() != dialog.OK) {
-			return;
-		}
-	}	
-	
-	/**
-	 * Set the available items on the JRE combo box
-	 */
-	protected void populateJREComboBox() {
-		String[] vmNames = new String[fVMStandins.size() + 1];
-
-		// Set the name of the 'default' VM
-		vmNames[0] = DEFAULT_JRE_NAME;
-		int index = 1;
-
-		// Add all installed VMs
-		Iterator iterator = fVMStandins.iterator();
-		while (iterator.hasNext()) {
-			VMStandin standin = (VMStandin)iterator.next();
-			String vmName = standin.getName();
-			vmNames[index++] = vmName;
-		}
-		fJRECombo.setItems(vmNames);
-	}	
-	
-	/**
-	 * Cause the specified VM to be selected in the JRE combo box.
-	 * This relies on the fact that the JRE names in the combo box are in the
-	 * same order as they are in the <code>fVMStandins</code> list.
-	 * 
-	 * @param typeID the VM install type identifier, or <code>null</code> to select "default"
-	 * @param vmName vm name, or <code>null</code> to select "default"
-	 */
-	protected void selectJREComboBoxEntry(String typeID, String vmName) {
-		int index = 0;
-		if (typeID != null && vmName != null) {
-			boolean found = false;
-			for (int i = 0; i < fVMStandins.size(); i++) {
-				VMStandin vmStandin = (VMStandin)fVMStandins.get(i);
-				if (vmStandin.getVMInstallType().getId().equals(typeID) && vmStandin.getName().equals(vmName)) {
-					index = i + 1;
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				fUnknownVMName = vmName;
-				fUnknownVMType = typeID;
-			}
-		}
-
-		fJRECombo.select(index);
-	}	
-	
-	/**
-	 * Convenience method to remove any selection in the JRE combo box
-	 */
-	protected void clearJREComboBoxEntry() {
-		fJRECombo.deselectAll();
-	}	
-	
-	private java.util.List createFakeVMInstalls(IVMInstallType[] vmTypes) {
-		ArrayList vms= new ArrayList();
-		for (int i= 0; i < vmTypes.length; i++) {
-			IVMInstall[] vmInstalls= vmTypes[i].getVMInstalls();
-			for (int j= 0; j < vmInstalls.length; j++) 
-				vms.add(new VMStandin(vmInstalls[j]));
-		}
-		return vms;
-	}	
-	
-	/**
-	 * Return the class that implements <code>ILaunchConfigurationTab</code>
-	 * that is registered against the install type of the currently selected VM.
-	 */
-	protected ILaunchConfigurationTab getTabForCurrentJRE() {
-		int selectedIndex = fJRECombo.getSelectionIndex();
-		if (selectedIndex > 0) {
-			VMStandin vmStandin = (VMStandin) fVMStandins.get(selectedIndex - 1);
-			String vmInstallTypeID = vmStandin.getVMInstallType().getId();
-			return JDIDebugUIPlugin.getDefault().getVMInstallTypePage(vmInstallTypeID);		
-		}
-		return null;
-	}
-	
-	/**
-	 * Show the contributed piece of UI that was registered for the install type
-	 * of the currently selected VM.
-	 */
-	protected void loadDynamicJREArea() {
-		
-		// Dispose of any current child widgets in the tab holder area
-		Control[] children = getDynamicTabHolder().getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].dispose();
-		}
-		
-		if (isUseDynamicJREArea()) {
-			// Retrieve the dynamic UI for the current JRE 
-			setDynamicTab(getTabForCurrentJRE());
-			if (getDynamicTab() == null) {
-				return;
-			}
-			
-			// Ask the dynamic UI to create its Control
-			getDynamicTab().setLaunchConfigurationDialog(getLaunchConfigurationDialog());
-			getDynamicTab().createControl(getDynamicTabHolder());
-			getDynamicTabHolder().layout();	
-		}
-			
-	}
-
-	protected ILaunchConfigurationWorkingCopy getLaunchConfigurationWorkingCopy() {
-		return fWorkingCopy;
-	}
-	
-	/**
-	 * Overridden here so that any error message in the dynamic UI gets returned.
-	 * 
-	 * @see ILaunchConfigurationTab#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		ILaunchConfigurationTab tab = getDynamicTab();
-		if ((super.getErrorMessage() != null) || (tab == null)) {
-			return super.getErrorMessage();
-		} else {
-			return tab.getErrorMessage();
-		}
-	}
-
-	protected void setLaunchConfigurationWorkingCopy(ILaunchConfigurationWorkingCopy workingCopy) {
-		fWorkingCopy = workingCopy;
-	}
-
-	protected ILaunchConfiguration getLaunchConfiguration() {
-		return fLaunchConfiguration;
-	}
-
-	protected void setLaunchConfiguration(ILaunchConfiguration launchConfiguration) {
-		fLaunchConfiguration = launchConfiguration;
-	}
-	
-	/**
-	 * Sets whether this tab will display the VM specific arguments area
-	 * if a JRE supports VM specific arguments.
-	 * 
-	 * @param visible whether this tab will display the VM specific arguments area
-	 * 	if a JRE supports VM specific arguments
-	 */
-	public void setVMSpecificArgumentsVisible(boolean visible) {
-		fUseDynamicArea = visible;
-	}
-	
-	protected boolean isUseDynamicJREArea() {
-		return fUseDynamicArea;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
deleted file mode 100644
index 4f68e06..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaMainTab.java
+++ /dev/null
@@ -1,412 +0,0 @@
-package org.eclipse.jdt.debug.ui.launchConfigurations;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.MainMethodFinder;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * A launch configuration tab that displays and edits project and
- * main type name launch configuration attributes.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-
-public class JavaMainTab extends JavaLaunchConfigurationTab {
-		
-	// Project UI widgets
-	protected Label fProjLabel;
-	protected Text fProjText;
-	protected Button fProjButton;
-
-	// Main class UI widgets
-	protected Label fMainLabel;
-	protected Text fMainText;
-	protected Button fSearchButton;
-	protected Button fSearchExternalJarsCheckButton;
-			
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB);
-		GridLayout topLayout = new GridLayout();
-		comp.setLayout(topLayout);		
-		GridData gd;
-		
-		createVerticalSpacer(comp, 1);
-		
-		Composite projComp = new Composite(comp, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 2;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		projComp.setLayoutData(gd);
-		
-		fProjLabel = new Label(projComp, SWT.NONE);
-		fProjLabel.setText(LauncherMessages.getString("JavaMainTab.&Project__2")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fProjLabel.setLayoutData(gd);
-		
-		fProjText = new Text(projComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fProjText.setLayoutData(gd);
-		fProjText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fProjButton = createPushButton(projComp, LauncherMessages.getString("JavaMainTab.&Browse_3"), null); //$NON-NLS-1$
-		fProjButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleProjectButtonSelected();
-			}
-		});
-		
-		createVerticalSpacer(comp, 1);
-
-		Composite mainComp = new Composite(comp, SWT.NONE);
-		GridLayout mainLayout = new GridLayout();
-		mainLayout.numColumns = 2;
-		mainLayout.marginHeight = 0;
-		mainLayout.marginWidth = 0;
-		mainComp.setLayout(mainLayout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		mainComp.setLayoutData(gd);
-		
-		fMainLabel = new Label(mainComp, SWT.NONE);
-		fMainLabel.setText(LauncherMessages.getString("JavaMainTab.Main_cla&ss__4")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fMainLabel.setLayoutData(gd);
-
-		fMainText = new Text(mainComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fMainText.setLayoutData(gd);
-		fMainText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fSearchButton = createPushButton(mainComp,LauncherMessages.getString("JavaMainTab.Searc&h_5"), null); //$NON-NLS-1$
-		fSearchButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleSearchButtonSelected();
-			}
-		});
-		
-		fSearchExternalJarsCheckButton = new Button(mainComp, SWT.CHECK);
-		fSearchExternalJarsCheckButton.setText(LauncherMessages.getString("JavaMainTab.E&xt._jars_6")); //$NON-NLS-1$
-	}
-		
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		updateProjectFromConfig(config);
-		updateMainTypeFromConfig(config);
-	}
-	
-	protected void updateProjectFromConfig(ILaunchConfiguration config) {
-		String projectName = ""; //$NON-NLS-1$
-		try {
-			projectName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING);	
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-		fProjText.setText(projectName);
-	}
-	
-	protected void updateMainTypeFromConfig(ILaunchConfiguration config) {
-		String mainTypeName = ""; //$NON-NLS-1$
-		try {
-			mainTypeName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, EMPTY_STRING);
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);	
-		}	
-		fMainText.setText(mainTypeName);	
-	}
-		
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)fProjText.getText());
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)fMainText.getText());
-	}
-			
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-	}
-			
-	/**
-	 * Show a dialog that lists all main types
-	 */
-	protected void handleSearchButtonSelected() {
-		
-		IJavaProject javaProject = getJavaProject();
-		IJavaSearchScope searchScope = null;
-		if ((javaProject == null) || !javaProject.exists()) {
-			searchScope = SearchEngine.createWorkspaceScope();
-		} else {
-			searchScope = SearchEngine.createJavaSearchScope(new IJavaElement[] {javaProject}, false);
-		}		
-		
-		int constraints = IJavaElementSearchConstants.CONSIDER_BINARIES;
-		if (fSearchExternalJarsCheckButton.getSelection()) {
-			constraints |= IJavaElementSearchConstants.CONSIDER_EXTERNAL_JARS;
-		}
-		
-		Shell shell = getShell();
-		SelectionDialog dialog = JavaUI.createMainTypeDialog(shell, 
-															 getLaunchConfigurationDialog(), 
-															 searchScope, 
-															 constraints, 
-															 false, 
-															 fMainText.getText()); 
-		dialog.setTitle(LauncherMessages.getString("JavaMainTab.Choose_Main_Type_11")); //$NON-NLS-1$
-		dialog.setMessage(LauncherMessages.getString("JavaMainTab.Choose_a_main_&type_to_launch__12")); //$NON-NLS-1$
-		if (dialog.open() == dialog.CANCEL) {
-			return;
-		}
-		
-		Object[] results = dialog.getResult();
-		if ((results == null) || (results.length < 1)) {
-			return;
-		}		
-		IType type = (IType)results[0];
-		if (type != null) {
-			fMainText.setText(type.getFullyQualifiedName());
-			javaProject = type.getJavaProject();
-			fProjText.setText(javaProject.getElementName());
-		}
-	}
-		
-	/**
-	 * Show a dialog that lets the user select a project.  This in turn provides
-	 * context for the main type, allowing the user to key a main type name, or
-	 * constraining the search for main types to the specified project.
-	 */
-	protected void handleProjectButtonSelected() {
-		IJavaProject project = chooseJavaProject();
-		if (project == null) {
-			return;
-		}
-		
-		String projectName = project.getElementName();
-		fProjText.setText(projectName);		
-	}
-	
-	/**
-	 * Realize a Java Project selection dialog and return the first selected project,
-	 * or null if there was none.
-	 */
-	protected IJavaProject chooseJavaProject() {
-		IJavaProject[] projects;
-		try {
-			projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
-		} catch (JavaModelException e) {
-			JDIDebugUIPlugin.log(e);
-			projects= new IJavaProject[0];
-		}
-		
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle(LauncherMessages.getString("JavaMainTab.Project_Selection_13")); //$NON-NLS-1$
-		dialog.setMessage(LauncherMessages.getString("JavaMainTab.Choose_a_&project_to_constrain_the_search_for_main_types__14")); //$NON-NLS-1$
-		dialog.setElements(projects);
-		
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject != null) {
-			dialog.setInitialSelections(new Object[] { javaProject });
-		}
-		if (dialog.open() == dialog.OK) {			
-			return (IJavaProject) dialog.getFirstResult();
-		}			
-		return null;		
-	}
-	
-	/**
-	 * Return the IJavaProject corresponding to the project name in the project name
-	 * text field, or null if the text does not match a project name.
-	 */
-	protected IJavaProject getJavaProject() {
-		String projectName = fProjText.getText().trim();
-		if (projectName.length() < 1) {
-			return null;
-		}
-		return getJavaModel().getJavaProject(projectName);		
-	}
-	
-	/**
-	 * Convenience method to get the workspace root.
-	 */
-	private IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	
-	/**
-	 * Convenience method to get access to the java model.
-	 */
-	private IJavaModel getJavaModel() {
-		return JavaCore.create(getWorkspaceRoot());
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-		
-		String name = fProjText.getText().trim();
-		if (name.length() > 0) {
-			if (!ResourcesPlugin.getWorkspace().getRoot().getProject(name).exists()) {
-				setErrorMessage(LauncherMessages.getString("JavaMainTab.Project_does_not_exist_15")); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		name = fMainText.getText().trim();
-		if (name.length() == 0) {
-			setErrorMessage(LauncherMessages.getString("JavaMainTab.Main_type_not_specified_16")); //$NON-NLS-1$
-			return false;
-		}
-		
-		return true;
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		IJavaElement javaElement = getContext();
-		if (javaElement != null) {
-			initializeJavaProject(javaElement, config);
-		} else {
-			// We set empty attributes for project & main type so that when one config is
-			// compared to another, the existence of empty attributes doesn't cause an
-			// incorrect result (the performApply() method can result in empty values
-			// for these attributes being set on a config if there is nothing in the
-			// corresponding text boxes)
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
-		}
-		initializeMainTypeAndName(javaElement, config);
-	}
-
-	/**
-	 * Set the main type & name attributes on the working copy based on the IJavaElement
-	 */
-	protected void initializeMainTypeAndName(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		String name= null;
-		if (javaElement instanceof IMember) {
-			IMember member = (IMember)javaElement;
-			if (member.isBinary()) {
-				javaElement = member.getClassFile();
-			} else {
-				javaElement = member.getCompilationUnit();
-			}
-		}
-		if (javaElement instanceof ICompilationUnit || javaElement instanceof IClassFile) {
-			try {
-				IType[] types = MainMethodFinder.findTargets(new BusyIndicatorRunnableContext(), new Object[] {javaElement});
-				if (types != null && (types.length > 0)) {
-					// Simply grab the first main type found in the searched element
-					name = types[0].getFullyQualifiedName();
-				}
-			} catch (InterruptedException ie) {
-			} catch (InvocationTargetException ite) {
-			}
-		}
-		if (name == null) {
-			name= ""; //$NON-NLS-1$
-		}
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, name);
-		if (name.length() > 0) {
-			int index = name.lastIndexOf('.');
-			if (index > 0) {
-				name = name.substring(index + 1);
-			}		
-			name = getLaunchConfigurationDialog().generateName(name);
-			config.rename(name);
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("JavaMainTab.&Main_19"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java
deleted file mode 100644
index e4e99da..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaSourceLookupTab.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.jdt.debug.ui.launchConfigurations;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.List;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.debug.ui.JavaUISourceLocator;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.SourceLookupBlock;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * A launch configuration tab that displays and edits source lookup
- * path launch configuration attributes.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 2.0
- */
-
-public class JavaSourceLookupTab extends JavaLaunchConfigurationTab {
-
-	protected SourceLookupBlock fSourceLookupBlock;
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_SOURCE_TAB);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 1;
-		comp.setLayout(topLayout);		
-		
-		createVerticalSpacer(comp, 1);
-		
-		fSourceLookupBlock = new SourceLookupBlock();
-		fSourceLookupBlock.setLaunchConfigurationDialog(getLaunchConfigurationDialog());
-		fSourceLookupBlock.createControl(comp);
-		
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		// be default, use a prompting source locator
-		configuration.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, JavaUISourceLocator.ID_PROMPTING_JAVA_SOURCE_LOCATOR);
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, (String)null);
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH, (List)null);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		fSourceLookupBlock.initializeFrom(configuration);
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, JavaUISourceLocator.ID_PROMPTING_JAVA_SOURCE_LOCATOR);
-		fSourceLookupBlock.performApply(configuration);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("JavaSourceLookupTab.Source_1"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
-	}	
-		
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html
deleted file mode 100644
index 069bd54..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/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">
-<title>Java Debug UI</title>
-</head>
-
-<body link="#0000FF" vlink="#800080">
-
-<p align="left">Provides an implementation launch configuration tabs for local and remote
- Java applications.</p>
-
-<h2 align="left">Package Specification</h2>
-
-<p>This package provides launch configuration tabs for local and remote Java applications. </p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html
deleted file mode 100644
index 8133917..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/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">
-<title>Java Debug UI</title>
-</head>
-
-<body link="#0000FF" vlink="#800080">
-
-<p align="left">Provides an implementation of a source locator for the Java debug model.</p>
-
-<h2 align="left">Package Specification</h2>
-
-<p>This package provides a source locator for the Java debug model. The source locator
-prompts the user for source, when source cannot be found on the source lookup path. </p>
-</body>
-</html>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
deleted file mode 100644
index facfecf..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/BreakpointUtils.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.Map;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.debug.core.model.IBreakpoint;

-import org.eclipse.jdt.core.ICompilationUnit;

-import org.eclipse.jdt.core.IField;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IMember;

-import org.eclipse.jdt.core.IMethod;

-import org.eclipse.jdt.core.IType;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaWatchpoint;

- 

-/**

- * Utility class for Java breakpoints 

- */

-public class BreakpointUtils {

-	

-	/**

-	 * Marker attribute storing the handle id of the 

-	 * Java element associated with a Java breakpoint

-	 */

-	private static final String HANDLE_ID = JDIDebugUIPlugin.getUniqueIdentifier() + ".JAVA_ELEMENT_HANDLE_ID"; //$NON-NLS-1$

-

-	/**

-	 * Marker attribute used to denote a run to line breakpoint

-	 */

-	private static final String RUN_TO_LINE =  JDIDebugUIPlugin.getUniqueIdentifier() + ".run_to_line"; //$NON-NLS-1$

-	/**

-	 * Returns the resource on which a breakpoint marker should

-	 * be created for the given member. The resource returned is the 

-	 * associated file, or project in the case of a class file in 

-	 * a jar.

-	 * 

-	 * @param member member in which a breakpoint is being created

-	 * @return resource the resource on which a breakpoint marker

-	 *  should be created

-	 * @exception CoreException if an exception occurs accessing the

-	 *  underlying resource or Java model elements

-	 */

-	public static IResource getBreakpointResource(IMember member) throws CoreException {

-		ICompilationUnit cu = member.getCompilationUnit();

-		if (cu != null && cu.isWorkingCopy()) {

-			member = (IMember)cu.getOriginal(member);

-		}

-		IResource res = member.getUnderlyingResource();

-		if (res == null) {

-			res = member.getJavaProject().getProject();

-		}

-		return res;

-	}

-	

-	/**

-	 * Returns the type that the given Java breakpoint refers to

-	 * 

-	 * @param breakpoint Java breakpoint

-	 * @return the type the breakpoint is associated with

-	 * @exception CoreException if an exception occurs accessing

-	 *  the breakpoint or Java model

-	 */

-	public static IType getType(IJavaBreakpoint breakpoint) throws CoreException {

-		String handle = breakpoint.getMarker().getAttribute(HANDLE_ID, null);

-		if (handle != null) {

-			IJavaElement je = JavaCore.create(handle);

-			if (je != null) {

-				if (je instanceof IType) {

-					return (IType)je;

-				}

-				if (je instanceof IMember) {

-					return ((IMember)je).getDeclaringType();

-				}

-			}

-		}

-		return null;

-	}

-	

-	/**

-	 * Returns the member associated with the line number of

-	 * the given breakpoint.

-	 * 

-	 * @param breakpoint Java line breakpoint

-	 * @return member at the given line number in the type 

-	 *  associated with the breakpoint

-	 * @exception CoreException if an exception occurs accessing

-	 *  the breakpoint

-	 */

-	public static IMember getMember(IJavaLineBreakpoint breakpoint) throws CoreException {

-		if (breakpoint instanceof IJavaMethodBreakpoint) {

-			return getMethod((IJavaMethodBreakpoint)breakpoint);

-		}

-		if (breakpoint instanceof IJavaWatchpoint) {

-			return getField((IJavaWatchpoint)breakpoint);

-		}

-		int start = breakpoint.getCharStart();

-		int end = breakpoint.getCharEnd();

-		IType type = getType(breakpoint);

-		IMember member = null;

-		if ((type != null) && (end >= start) && (start >= 0)) {

-			try {

-				member= binSearch(type, start, end);

-			} catch (CoreException ce) {

-				JDIDebugUIPlugin.log(ce);

-			}

-		}

-		if (member == null) {

-			member= type;

-		}

-		return member;

-	}

-	

-	/**

-	 * Searches the given source range of the container for a member that is

-	 * not the same as the given type.

-	 */

-	protected static IMember binSearch(IType type, int start, int end) throws JavaModelException {

-		IJavaElement je = getElementAt(type, start);

-		if (je != null && !je.equals(type)) {

-			return asMember(je);

-		}

-		if (end > start) {

-			je = getElementAt(type, end);

-			if (je != null && !je.equals(type)) {

-				return asMember(je);

-			}

-			int mid = ((end - start) / 2) + start;

-			if (mid > start) {

-				je = binSearch(type, start + 1, mid);

-				if (je == null) {

-					je = binSearch(type, mid + 1, end - 1);

-				}

-				return asMember(je);

-			}

-		}

-		return null;

-	}	

-	

-	/**

-	 * Returns the given Java element if it is an

-	 * <code>IMember</code>, otherwise <code>null</code>.

-	 * 

-	 * @param element Java element

-	 * @return the given element if it is a type member,

-	 * 	otherwise <code>null</code>

-	 */

-	private static IMember asMember(IJavaElement element) {

-		if (element instanceof IMember) {

-			return (IMember)element;

-		} else {

-			return null;

-		}		

-	}

-	

-	/**

-	 * Returns the element at the given position in the given type

-	 */

-	protected static IJavaElement getElementAt(IType type, int pos) throws JavaModelException {

-		if (type.isBinary()) {

-			return type.getClassFile().getElementAt(pos);

-		} else {

-			return type.getCompilationUnit().getElementAt(pos);

-		}

-	}

-	

-	/**

-	 * Adds attributes to the given attribute map:<ul>

-	 * <li>Java element handle id</li>

-	 * <li>Attributes defined by <code>JavaCore</code></li>

-	 * </ul>

-	 * 

-	 * @param attributes the attribute map to use

-	 * @param element the Java element associated with the breakpoint

-	 * @exception CoreException if an exception occurs configuring

-	 *  the marker

-	 */

-	public static void addJavaBreakpointAttributes(Map attributes, IJavaElement element) {

-		String handleId = element.getHandleIdentifier();

-		attributes.put(HANDLE_ID, handleId);

-		JavaCore.addJavaElementMarkerAttributes(attributes, element);		

-	}

-	

-	/**

-	 * Adds attributes to the given attribute map to make the

-	 * breakpoint a run-to-line breakpoint:<ul>

-	 * <li>PERSISTED = false</li>

-	 * <li>RUN_TO_LINE = true</li>

-	 * </ul>

-	 * 

-	 * @param attributes the attribute map to use

-	 * @param element the Java element associated with the breakpoint

-	 * @exception CoreException if an exception occurs configuring

-	 *  the marker

-	 */

-	public static void addRunToLineAttributes(Map attributes) {

-		attributes.put(IBreakpoint.PERSISTED, Boolean.FALSE);

-		attributes.put(RUN_TO_LINE, Boolean.TRUE);

-	}	

-	

-	/**

-	 * Returns the method associated with the method entry

-	 * breakpoint.

-	 * 

-	 * @param breakpoint Java method entry breakpoint

-	 * @return method

-	 * @exception CoreException if an exception occurs accessing

-	 *  the breakpoint

-	 */

-	public static IMethod getMethod(IJavaMethodBreakpoint breakpoint) throws CoreException {	

-		String handle = breakpoint.getMarker().getAttribute(HANDLE_ID, null);

-		if (handle != null) {

-			IJavaElement je = JavaCore.create(handle);

-			if (je != null) {

-				if (je instanceof IMethod) {

-					return (IMethod)je;

-				}

-			}

-		}

-		return null;

-	}

-	

-	/**

-	 * Returns the field associated with the watchpoint.

-	 * 

-	 * @param breakpoint Java watchpoint

-	 * @return field

-	 * @exception CoreException if an exception occurs accessing

-	 *  the breakpoint

-	 */

-	public static IField getField(IJavaWatchpoint breakpoint) throws CoreException {	

-		String handle = breakpoint.getMarker().getAttribute(HANDLE_ID, null);

-		if (handle != null) {

-			IJavaElement je = JavaCore.create(handle);

-			if (je != null) {

-				if (je instanceof IField) {

-					return (IField)je;

-				}

-			}

-		}

-		return null;

-	}	

-	

-	/**

-	 * Returns whether the given breakpoint is a run to line

-	 * breakpoint

-	 * 

-	 * @param breakpoint line breakpoint

-	 * @return whether the given breakpoint is a run to line

-	 *  breakpoint

-	 */

-	public static boolean isRunToLineBreakpoint(IJavaLineBreakpoint breakpoint) throws CoreException {

-		return breakpoint.getMarker().getAttribute(RUN_TO_LINE, false);

-	}

-	

-	/**

-	 * Returns whether the given breakpoint is a compilation

-	 * problem breakpoint

-	 * 

-	 * @param breakpoint breakpoint

-	 * @return whether the given breakpoint is a run to line

-	 *  breakpoint

-	 */

-	public static boolean isProblemBreakpoint(IBreakpoint breakpoint) {

-		return breakpoint == JavaDebugOptionsManager.getDefault().getSuspendOnCompilationErrorBreakpoint();

-	}	

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ConditionalBreakpointErrorDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ConditionalBreakpointErrorDialog.java
deleted file mode 100644
index 3258907..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ConditionalBreakpointErrorDialog.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-public class ConditionalBreakpointErrorDialog extends ErrorDialog {
-	
-	private Text fTextArea;
-	private String fMessage;
-	private IJavaLineBreakpoint fBreakpoint;
-
-	public ConditionalBreakpointErrorDialog(Shell parentShell, String dialogTitle, String message, IStatus status, IJavaLineBreakpoint breakpoint) {
-		super(parentShell, dialogTitle, message, status, IStatus.ERROR);
-		fMessage= message;
-		fBreakpoint= breakpoint;
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea= (Composite) super.createDialogArea(parent);
-		String condition= ""; //$NON-NLS-1$
-		try {
-			condition= fBreakpoint.getCondition();
-		} catch(CoreException e) {
-		}
-		if (condition == null) {
-			condition = ""; //$NON-NLS-1$
-		}
-		fTextArea= createEditArea(parent, condition, DebugUIMessages.getString("ConditionalBreakpointErrorDialog.Edit_the_condition_1")); //$NON-NLS-1$
-		
-		return dialogArea;
-	}
-	
-	private Text createEditArea(Composite parent, String startingText, String labelText) {
-		Composite editArea = new Composite(parent, SWT.NONE);
-		GridData data = new GridData(SWT.NONE);
-		data.horizontalSpan = GridData.FILL_HORIZONTAL;
-		data.widthHint= 400;
-		data.horizontalAlignment = GridData.CENTER;
-		editArea.setLayoutData(data);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		editArea.setLayout(layout);
-				
-		Label label= new Label(editArea, SWT.NONE);
-		label.setText(labelText);
-		GridData labelData= new GridData(SWT.NONE);
-		labelData.horizontalAlignment= GridData.BEGINNING;
-		labelData.horizontalSpan= 1;
-		label.setLayoutData(labelData);
-		
-		Text text= new Text(editArea, SWT.SINGLE | SWT.BORDER);
-		text.setText(startingText);		
-		GridData textData= new GridData(SWT.NONE);
-		textData.widthHint= 300;
-		textData.horizontalSpan= 1;
-		textData.horizontalAlignment= GridData.BEGINNING;
-		text.setLayoutData(textData);
-		
-		return text;
-	}
-
-	protected void buttonPressed(int id) {
-		if (id == IDialogConstants.OK_ID) {  // was the Ok button pressed?
-			try {
-				String text= fTextArea.getText();
-				fBreakpoint.setCondition(text);
-				if (text == null || text.trim().length() == 0) {
-					fBreakpoint.setConditionEnabled(false);
-				}
-			} catch (CoreException exception) {
-			}
-		}
-		super.buttonPressed(id);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.java
deleted file mode 100644
index 76ccd77..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-public class DebugUIMessages {

-

-	private static final String BUNDLE_NAME =

-		"org.eclipse.jdt.internal.debug.ui.DebugUIMessages"; //$NON-NLS-1$

-

-	private static final ResourceBundle RESOURCE_BUNDLE =

-		ResourceBundle.getBundle(BUNDLE_NAME);

-

-	private DebugUIMessages() {

-	}

-

-	public static String getString(String key) {

-		try {

-			return RESOURCE_BUNDLE.getString(key);

-		} catch (MissingResourceException e) {

-			return '!' + key + '!';

-		}

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
deleted file mode 100644
index 41f9ad2..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
+++ /dev/null
@@ -1,158 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial implementation

-######################################################################

-

-ConditionalBreakpointErrorDialog.Edit_the_condition_1=&Edit the condition:

-

-ExceptionHandler.seeErrorLogMessage= See error log for more details.

-

-ImageDescriptorRegistry.Allocating_image_for_wrong_display_1=Allocating image for wrong display

-

-JavaDebugOptionsManager.An_exception_occurred_while_evaluating_the_condition_for_breakpoint__{0}__4=An exception occurred while evaluating the condition for breakpoint: {0} 

-JavaDebugOptionsManager.Conditional_breakpoint_compilation_failed_6=Conditional breakpoint compilation failed

-JavaDebugOptionsManager.Conditional_breakpoint_evaluation_failed_3=Conditional breakpoint evaluation failed

-JavaDebugOptionsManager.Errors_detected_compiling_the_condition_for_breakpoint_{0}_7=Errors detected compiling the condition for breakpoint {0}

-

-JavaDebugPreferencePage.description=General settings for Java Debugging.

-JavaDebugPreferencePage.Alert_me_when_hot_code_replace_fails_1=Show error when hot code replace &fails

-JavaDebugPreferencePage.Alert_me_when_hot_code_replace_is_not_supported_1=Show error when hot code replace is not &supported

-JavaDebugPreferencePage.Alert_me_when_obsolete_methods_remain_1=Show error when &obsolete methods remain after hot code replace

-JavaDebugPreferencePage.Display_&hexadecimal_values_(byte,_short,_char,_int,_long)_3=Display &hexadecimal values (byte, short, char, int, long)

-JavaDebugPreferencePage.Display_&unsigned_values_(byte)_5=Display &unsigned values (byte)

-JavaDebugPreferencePage.Display_ASCII_&character_values_(byte,_short,_int,_long)_4=Display ASCII &character values (byte, short, int, long)

-JavaDebugPreferencePage.Hot_Code_Replace_Error_Reporting_2=Hot Code Replace Error Reporting

-JavaDebugPreferencePage.Primitive_type_display_options_2=Primitive type display options

-JavaDebugPreferencePage.Suspend_&execution_on_uncaught_exceptions_1=Suspend &execution on uncaught exceptions

-JavaDebugPreferencePage.Suspend_Execution_1=Suspend Execution

-JavaDebugPreferencePage.Suspend_execution_on_co&mpilation_errors_1=Suspend execution on co&mpilation errors

-JavaDebugPreferencePage.Opened_View_Default_Settings_1=Opened View Default Settings

-JavaDebugPreferencePage.Show_&qualified_names_2=Show &qualified names

-JavaDebugPreferencePage.Show_&final_fields_3=Show &final fields

-JavaDebugPreferencePage.&Show_static_fields_4=&Show static fields

-JavaDebugPreferencePage.Value_must_be_a_valid_integer_greater_than_50_ms_1=Value must be a valid integer greater than 50 ms

-

-JavaStepFilterPreferencePage.Filter_co&nstructors_19=Filter co&nstructors

-JavaStepFilterPreferencePage.Filter_s&ynthetic_methods_(requires_VM_support)_17=Filter s&ynthetic methods (requires VM support)

-JavaStepFilterPreferencePage.Filter_static_&initializers_18=Filter static &initializers

-JavaStepFilterPreferencePage.description=Options for Step Filtering.

-JavaStepFilterPreferencePage.Use_&step_filters_7=Apply &step filters to \"Step Into\" actions when debugging

-JavaStepFilterPreferencePage.Remove_all_selected_step_filters_16=Remove All Selected Step Filters

-JavaStepFilterPreferencePage.Select_a_package_to_filter_when_stepping_27=&Select a package to filter when stepping

-JavaStepFilterPreferencePage.Select_a_type_to_filter_when_stepping_23=&Select a class to filter when stepping

-JavaStepFilterPreferencePage.&Remove_15=&Remove

-JavaStepFilterPreferencePage.Add_&Filter_9=Add &Filter

-JavaStepFilterPreferencePage.Add_&Package..._13=Add &Package...

-JavaStepFilterPreferencePage.Add_&Type..._11=Add &Class...

-JavaStepFilterPreferencePage.Add_package_to_step_filters_24=Add Package to Step Filters

-JavaStepFilterPreferencePage.Add_type_to_step_filters_20=Add Class to Step Filters

-JavaStepFilterPreferencePage.Choose_a_Java_type_and_add_it_to_step_filters_12=Choose a Java Type and Add It to Step Filters

-JavaStepFilterPreferencePage.Choose_a_package_and_add_it_to_step_filters_14=Choose a Package and Add It to Step Filters

-JavaStepFilterPreferencePage.Could_not_open_package_selection_dialog_for_step_filters_25=Could not open package selection dialog for step filters

-JavaStepFilterPreferencePage.Could_not_open_type_selection_dialog_for_step_filters_21=Could not open type selection dialog for step filters

-JavaStepFilterPreferencePage.Defined_step_fi&lters__8=Defined step fi&lters:

-JavaStepFilterPreferencePage.Invalid_step_filter._Return_to_continue;_escape_to_exit._1=\ Invalid step filter. Return to continue; escape to exit.

-JavaStepFilterPreferencePage.Key_in_the_name_of_a_new_step_filter_10=Key in the Name of a New Step Filter

-JavaStepFilterPreferencePage.&Enable_All_1=&Enable All

-JavaStepFilterPreferencePage.Enables_all_step_filters_2=Enables all step filters

-JavaStepFilterPreferencePage.Disa&ble_All_3=Disa&ble All

-JavaStepFilterPreferencePage.Disables_all_step_filters_4=Disables all step filters

-

-JDIDebugUIPlugin.{0}_contains_obsolete_methods_1={0} contains obsolete methods.

-JDIDebugUIPlugin.{0}_was_unable_to_replace_the_running_code_with_the_code_in_the_workspace._2={0} was unable to replace the running code with the code in the workspace.

-JDIDebugUIPlugin.Always_alert_me_of_hot_code_replace_failure_1=Show error &when hot code replace fails

-JDIDebugUIPlugin.Always_alert_me_of_obsolete_methods_1=Show error &when obsolete methods remain

-JDIDebugUIPlugin.Error_1=Error

-JDIDebugUIPlugin.Hot_code_replace_failed_1=Hot code replace failed

-JDIDebugUIPlugin.Internal_Error_1=Internal Error

-JDIDebugUIPlugin.Obsolete_methods_remain_1=Obsolete methods on the stack

-JDIDebugUIPlugin.Stepping_may_be_hazardous_1=The virtual machine was unable to remove all stack frames running old code from the call stack. The virtual machine is not supplying the debugger with valid data for those frames. Stepping into these obsolete frames may be hazardous to the target virtual machine.

-JDIDebugUIPlugin.The_target_VM_does_not_support_hot_code_replace_1=The target VM does not support hot code replace

-JDIDebugUIPlugin.Always_alert_me_when_hot_code_replace_is_not_supported_1=Show error &when hot code replace is not supported

-

-JDIModelPresentation.(No_explicit_return_value)_30=(No explicit return value)

-JDIModelPresentation.[conditional]_2=[conditional]

-JDIModelPresentation._(may_be_out_of_synch)_2=\ (may be out of synch)

-JDIModelPresentation._(out_of_synch)_1=\ (out of synch)

-JDIModelPresentation._[scoped]_1=\ [scoped]

-JDIModelPresentation.{1}__{0}_63={1}: {0}

-JDIModelPresentation.{1}__{0}_73={1}: {0}

-JDIModelPresentation.<disconnected>_4=<disconnected> 

-JDIModelPresentation.<not_responding>_6=<not responding>

-JDIModelPresentation.<garbage_collected_object>_6=<garbage collected object>

-JDIModelPresentation.<obsolete_method_in__1=<obsolete method in 

-JDIModelPresentation.<terminated>_2=<terminated> 

-JDIModelPresentation.<unknown>_80=<unknown>

-JDIModelPresentation.access_71=access

-JDIModelPresentation.access_and_modification_70=access and modification

-JDIModelPresentation.caught_61=caught

-JDIModelPresentation.caught_and_uncaught_60=caught and uncaught

-JDIModelPresentation.Compilation_error_1=Compilation error

-JDIModelPresentation.entry_and_exit=\ [entry and exit]

-JDIModelPresentation.entry=\ [entry]

-JDIModelPresentation.exit=\ [exit]

-JDIModelPresentation.hit_count__67=hit count:

-JDIModelPresentation.line__65=line:

-JDIModelPresentation.line__76=line:

-JDIModelPresentation.local_variables_unavailable=[local variables unavailable]

-JDIModelPresentation.modification_72=modification

-JDIModelPresentation.native_method=[native method]

-JDIModelPresentation.not_available=not available

-JDIModelPresentation.null_78=null

-JDIModelPresentation.Suspend_VM=[Suspend VM]

-JDIModelPresentation.System_Thread_[({0}]_(Terminated)_7=System Thread [({0}] (Terminated)

-JDIModelPresentation.System_Thread_[{0}]_(Evaluating)_9=System Thread [{0}] (Evaluating)

-JDIModelPresentation.System_Thread_[{0}]_(Running)_11=System Thread [{0}] (Running)

-JDIModelPresentation.System_Thread_[{0}]_(Stepping)_9=System Thread [{0}] (Stepping)

-JDIModelPresentation.System_Thread_[{0}]_(Suspended)_27=System Thread [{0}] (Suspended)

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_({1}))_2=System Thread [{0}] (Suspended ({1}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_16=System Thread [{0}] (Suspended (access of field {1} in {2}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_24=System Thread [{0}] (Suspended (breakpoint at line {1} in {2}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_21=System Thread [{0}] (Suspended (entry into method {1} in {2}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exception_{1}))_13=System Thread [{0}] (Suspended (exception {1}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_21=System Thread [{0}] (Suspended (exit of method {1} in {2}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_18=System Thread [{0}] (Suspended (modification of field {1} in {2}))

-JDIModelPresentation.System_Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_23=System Thread [{0}] (Suspended (run to line {1} in {2}))

-JDIModelPresentation.target_suspended=\ (Suspended)

-JDIModelPresentation.Thread_[({0}]_(Terminated)_8=Thread [({0}] (Terminated)

-JDIModelPresentation.Thread_[{0}]_(Evaluating)_10=Thread [{0}] (Evaluating)

-JDIModelPresentation.Thread_[{0}]_(Running)_12=Thread [{0}] (Running)

-JDIModelPresentation.Thread_[{0}]_(Stepping)_10=Thread [{0}] (Stepping)

-JDIModelPresentation.Thread_[{0}]_(Suspended)_28=Thread [{0}] (Suspended)

-JDIModelPresentation.Thread_[{0}]_(Suspended_({1}))_3=Thread [{0}] (Suspended ({1}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_17=Thread [{0}] (Suspended (access of field {1} in {2}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_26=Thread [{0}] (Suspended (breakpoint at line {1} in {2}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_22=Thread [{0}] (Suspended (entry into method {1} in {2}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(exception_{1}))_14=Thread [{0}] (Suspended (exception {1}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_22=Thread [{0}] (Suspended (exit of method {1} in {2}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_19=Thread [{0}] (Suspended (modification of field {1} in {2}))

-JDIModelPresentation.Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_25=Thread [{0}] (Suspended (run to line {1} in {2}))

-JDIModelPresentation.thread_filtered=[thread filtered]

-JDIModelPresentation.uncaught_62=uncaught

-JDIModelPresentation.no_suspended_threads_1=[toString() unavailable - no suspended threads]

-JDIModelPresentation.thread_not_suspended_2=[toString() unavailable - thread not suspended]

-JDIModelPresentation.evaluation_in_progress_3=[toString() unavailable - evaluation in progress]

-JDIModelPresentation.thread_must_be_suspended_by_breakpoint_or_step_1=[toString() unavailable - thread must be suspended by breakpoint or step]

-JavaDebugAppearancePreferencePage.Appearance_settings_for_Java_Debugging_1=Appearance settings for Java Debugging

-JavaDebugPreferencePage.Communication_1=Communication

-JavaDebugPreferencePage.Debugger_&timeout__2=Debugger &timeout (ms):

-JavaDebugPreferencePage.&Launch_timeout_(ms)__1=&Launch timeout (ms):

-JDIDebugUIPlugin.An_error_occurred_retrieving_a_VMInstallType_page_1=An error occurred retrieving a VMInstallType page

-

-SuspendTimeoutHandler.suspend=Suspend

-SuspendTimeoutHandler.timeout_occurred=A timeout occurred while retrieving stack frames for thread: {0}.

-JDIDebugUIPlugin.Searching_1=Searching

-JDIModelPresentation<unknown_name>_1=<unknown name>
-JDIModelPresentation<unknown_type>_2=<unknown type>
-JDIModelPresentation<unknown_value>_3=<unknown value>
-JDIModelPresentation<unknown_declaring_type>_4=<unknown declaring type>
-JDIModelPresentation<unknown_receiving_type>_5=<unknown receiving type>
-JDIModelPresentation<unknown_method_name>_6=<unknown method name>
-JDIModelPresentation(<unknown_arguements>)_7=(<unknown arguments>)
-JDIModelPresentation_<unknown_line_number>_8=\ <unknown line number>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DropToFrameActionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DropToFrameActionFilter.java
deleted file mode 100644
index f4e73a6..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DropToFrameActionFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.ui.IActionFilter;
-
-public class DropToFrameActionFilter implements IActionFilter {
-
-	/**
-	 * @see org.eclipse.ui.IActionFilter#testAttribute(Object, String, String)
-	 */
-	public boolean testAttribute(Object target, String name, String value) {
-		if (name.equals("DropToFrameActionFilter") //$NON-NLS-1$
-			&& value.equals("supportsDropToFrame")) { //$NON-NLS-1$
-			if (target instanceof IJavaStackFrame) {
-				IJavaStackFrame frame = (IJavaStackFrame) target;
-				return frame.supportsDropToFrame();
-			}
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ErrorDialogWithToggle.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ErrorDialogWithToggle.java
deleted file mode 100644
index 9164ced..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ErrorDialogWithToggle.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2001.
- * All Rights Reserved.
- */
- 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * An error dialog which allows the user to set
- * a boolean preference.
- * 
- * This is typically used to set a preference that
- * determines if the dialog should be shown in
- * the future
- */
-public class ErrorDialogWithToggle extends ErrorDialog {
-
-	/**
-	 * The preference key which is set by the toggle button.
-	 * This key must be a boolean preference in the preference store.
-	 */
-	private String fPreferenceKey= null;
-	/**
-	 * The message displayed to the user, with the toggle button
-	 */
-	private String fToggleMessage= null;
-	private Button fToggleButton= null;
-	/**
-	 * The preference store which will be affected by the toggle button
-	 */
-	IPreferenceStore fStore= null;
-
-	public ErrorDialogWithToggle(Shell parentShell, String dialogTitle, String message, IStatus status, int displayMask, String preferenceKey, String toggleMessage, IPreferenceStore store) {
-		super(parentShell, dialogTitle, message, status, displayMask);
-		fStore= store;
-		fPreferenceKey= preferenceKey;
-		fToggleMessage= toggleMessage;
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea= (Composite) super.createDialogArea(parent);
-		setToggleButton(createCheckButton(dialogArea, fToggleMessage));
-		getToggleButton().setSelection(fStore.getBoolean(fPreferenceKey));
-		
-		return dialogArea;
-	}
-	
-	/**
-	 * Creates a button with the given label and sets the default 
-	 * configuration data.
-	 */
-	private Button createCheckButton(Composite parent, String label) {
-		Button button= new Button(parent, SWT.CHECK | SWT.LEFT);
-		button.setText(label);		
-
-		// FieldEditor GridData
-		GridData data = new GridData(SWT.NONE);
-		data.horizontalSpan= 2;
-		data.horizontalAlignment= GridData.CENTER;
-		button.setLayoutData(data);
-		
-		return button;
-	}
-
-	protected void buttonPressed(int id) {
-		if (id == IDialogConstants.OK_ID) {  // was the OK button pressed?
-			storePreference();
-		}
-		super.buttonPressed(id);
-	}
-	
-	private void storePreference() {
-		fStore.setValue(fPreferenceKey, getToggleButton().getSelection());
-	}
-
-	protected Button getToggleButton() {
-		return fToggleButton;
-	}
-
-	protected void setToggleButton(Button button) {
-		fToggleButton = button;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExceptionHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExceptionHandler.java
deleted file mode 100644
index 8954f70..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExceptionHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
-
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The default exception handler shows an error dialog when one of its handle methods
- * is called. If the passed exception is a <code>CoreException</code> an error dialog
- * pops up showing the exception's status information. For a <code>InvocationTargetException</code>
- * a normal message dialog pops up showing the exception's message. Additionally the exception
- * is written to the platform log.
- */
-public class ExceptionHandler {
-
-	private static ExceptionHandler fgInstance= new ExceptionHandler();
-	
-	/**
-	 * Handles the given <code>CoreException</code>. The workbench shell is used as a parent
-	 * for the dialog window.
-	 * 
-	 * @param e the <code>CoreException</code> to be handled
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(CoreException e, String title, String message) {
-		handle(e, JDIDebugUIPlugin.getActiveWorkbenchShell(), title, message);
-	}
-	
-	/**
-	 * Handles the given <code>CoreException</code>. 
-	 * 
-	 * @param e the <code>CoreException</code> to be handled
-	 * @param parent the dialog window's parent shell
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(CoreException e, Shell parent, String title, String message) {
-		fgInstance.perform(e, parent, title, message);
-	}
-	
-	/**
-	 * Handles the given <code>InvocationTargetException</code>. The workbench shell is used 
-	 * as a parent for the dialog window.
-	 * 
-	 * @param e the <code>InvocationTargetException</code> to be handled
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(InvocationTargetException e, String title, String message) {
-		handle(e, JDIDebugUIPlugin.getActiveWorkbenchShell(), title, message);
-	}
-	
-	/**
-	 * Handles the given <code>InvocationTargetException</code>. 
-	 * 
-	 * @param e the <code>InvocationTargetException</code> to be handled
-	 * @param parent the dialog window's parent shell
-	 * @param title the dialog window's window title
-	 * @param message message to be displayed by the dialog window
-	 */
-	public static void handle(InvocationTargetException e, Shell parent, String title, String message) {
-		fgInstance.perform(e, parent, title, message);
-	}
-
-	//---- Hooks for subclasses to control exception handling ------------------------------------
-	
-	protected void perform(CoreException e, Shell shell, String title, String message) {
-		IStatus status= e.getStatus();
-		JDIDebugUIPlugin.log(e);
-		if (status != null) {
-			ErrorDialog.openError(shell, title, message, status);
-		} else {
-			displayMessageDialog(e, e.getMessage(), shell, title, message);
-		}
-	}
-
-	protected void perform(InvocationTargetException e, Shell shell, String title, String message) {
-		Throwable target= e.getTargetException();
-		if (target instanceof CoreException) {
-			perform((CoreException)target, shell, title, message);
-		} else {
-			JDIDebugUIPlugin.log(e);
-			if (e.getMessage() != null && e.getMessage().length() > 0) {
-				displayMessageDialog(e, e.getMessage(), shell, title, message);
-			} else {
-				displayMessageDialog(e, target.getMessage(), shell, title, message);
-			}
-		}
-	}
-	
-	private void displayMessageDialog(Throwable t, String exceptionMessage, Shell shell, String title, String message) {
-		StringWriter msg= new StringWriter();
-		if (message != null) {
-			msg.write(message);
-			msg.write("\n\n"); //$NON-NLS-1$
-		}
-		if (exceptionMessage == null || exceptionMessage.length() == 0) {
-			msg.write(DebugUIMessages.getString("ExceptionHandler.seeErrorLogMessage")); //$NON-NLS-1$
-		}
-		else {
-			msg.write(exceptionMessage);
-		}
-		MessageDialog.openError(shell, title, msg.toString());			
-	}	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/Filter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/Filter.java
deleted file mode 100644
index a989e6f..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/Filter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
- 
-/**
- * Model object that represents a single entry in a filter table.
- */
-public class Filter {
-
-	private String fName;
-	private boolean fChecked;
-
-	public Filter(String name, boolean checked) {
-		setName(name);
-		setChecked(checked);
-	}
-
-	public String getName() {
-		return fName;
-	}
-
-	public void setName(String name) {
-		fName = name;
-	}
-
-	public boolean isChecked() {
-		return fChecked;
-	}
-
-	public void setChecked(boolean checked) {
-		fChecked = checked;
-	}
-
-	public boolean equals(Object o) {
-		if (o instanceof Filter) {
-			Filter other = (Filter) o;
-			if (getName().equals(other.getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public int hashCode() {
-		return getName().hashCode();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
deleted file mode 100644
index fb54203..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterLabelProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Label provider for Filter model objects
- */
-public class FilterLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-	private static final Image IMG_CUNIT =
-		JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-	private static final Image IMG_PKG =
-		JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-
-	/**
-	 * @see ITableLabelProvider#getColumnText(Object, int)
-	 */
-	public String getColumnText(Object object, int column) {
-		if (column == 0) {
-			return ((Filter) object).getName();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ILabelProvider#getText(Object)
-	 */
-	public String getText(Object element) {
-		return ((Filter) element).getName();
-	}
-
-	/**
-	 * @see ITableLabelProvider#getColumnImage(Object, int)
-	 */
-	public Image getColumnImage(Object object, int column) {
-		String name = ((Filter) object).getName();
-		if (name.endsWith("*") || name.equals("(default package)")) { //$NON-NLS-1$ //$NON-NLS-2$
-			return IMG_PKG;
-		} else {
-			return IMG_CUNIT;
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterViewerSorter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterViewerSorter.java
deleted file mode 100644
index d4160df..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/FilterViewerSorter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2002.

- * All Rights Reserved.

- */

-

-import org.eclipse.jface.viewers.ContentViewer;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.ui.model.WorkbenchViewerSorter;

-

-public class FilterViewerSorter extends WorkbenchViewerSorter {

-	public int compare(Viewer viewer, Object e1, Object e2) {

-		ILabelProvider lprov =

-			(ILabelProvider) ((ContentViewer) viewer).getLabelProvider();

-		String name1 = lprov.getText(e1);

-		String name2 = lprov.getText(e2);

-		if (name1 == null) {

-			name1 = ""; //$NON-NLS-1$

-		}

-		if (name2 == null) {

-			name2 = ""; //$NON-NLS-1$

-		}

-		if (name1.length() > 0 && name2.length() > 0) {

-			char char1 = name1.charAt(name1.length() - 1);

-			char char2 = name2.charAt(name2.length() - 1);

-			if (char1 == '*' && char1 != char2) {

-				return -1;

-			}

-			if (char2 == '*' && char2 != char1) {

-				return 1;

-			}

-		}

-		return name1.compareTo(name2);

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIPreferencesConstants.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIPreferencesConstants.java
deleted file mode 100644
index 17ae082..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIPreferencesConstants.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;

- 

-/**

- * Defines constants which are used to refer to values in the plugin's preference store.

- */

-public interface IJDIPreferencesConstants {

-	

-	/**

-	 * Boolean preference controlling whether primitive types

-	 * types display hexidecimal values.

-	 */	

-	public static final String PREF_SHOW_HEX_VALUES= IJavaDebugUIConstants.PLUGIN_ID + "javaDebug.showHexValues"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether primitive types

-	 * types display char values.

-	 */	

-	public static final String PREF_SHOW_CHAR_VALUES= IJavaDebugUIConstants.PLUGIN_ID + "javaDebug.showCharValues"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether primitive types

-	 * types display unsigned values.

-	 */	

-	public static final String PREF_SHOW_UNSIGNED_VALUES= IJavaDebugUIConstants.PLUGIN_ID + "javaDebug.showUnsignedValues"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether to suspend

-	 * execution when an uncaught Java exceptionis encountered

-	 * (while debugging).

-	 */	

-	public static final String PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS= IJavaDebugUIConstants.PLUGIN_ID + "javaDebug.SuspendOnUncaughtExceptions"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether to suspend

-	 * execution when a compilation error is encountered

-	 * (while debugging).

-	 */

-	public static final String PREF_SUSPEND_ON_COMPILATION_ERRORS= IJavaDebugUIConstants.PLUGIN_ID + ".suspend_on_compilation_errors"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether step filters

-	 * are currently used in Java debug sessions.

-	 */

-	public static final String PREF_USE_FILTERS = IJavaDebugUIConstants.PLUGIN_ID + ".use_filters"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether synthetic

-	 * methods are to be filtered when stepping (and step

-	 * filters are enabled).

-	 */	

-	public static final String PREF_FILTER_SYNTHETICS = IJavaDebugUIConstants.PLUGIN_ID + ".filter_synthetics"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether static

-	 * initializers are to be filtered when stepping (and step

-	 * filters are enabled).

-	 */		

-	public static final String PREF_FILTER_STATIC_INITIALIZERS = IJavaDebugUIConstants.PLUGIN_ID + ".filter_statics"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether constructors

-	 * are to be filtered when stepping (and step

-	 * filters are enabled).

-	 */			

-	public static final String PREF_FILTER_CONSTRUCTORS = IJavaDebugUIConstants.PLUGIN_ID + ".filter_constructors"; //$NON-NLS-1$

-	

-	/**

-	 * List of active step filters. A String containing a comma

-	 * separated list of fully qualified type names/patterns.

-	 */			

-	public static final String PREF_ACTIVE_FILTERS_LIST = IJavaDebugUIConstants.PLUGIN_ID + ".active_filters"; //$NON-NLS-1$

-	

-	/**

-	 * List of inactive step filters. A String containing a comma

-	 * separated list of fully qualified type names/patterns.

-	 */				

-	public static final String PREF_INACTIVE_FILTERS_LIST = IJavaDebugUIConstants.PLUGIN_ID + ".inactive_filters"; //$NON-NLS-1$	

-	

-	/**

-	 * Boolean preference controlling whether to alert

-	 * with a dialog when hot code replace fails.

-	 */	

-	public static final String PREF_ALERT_HCR_FAILED = IJavaDebugUIConstants.PLUGIN_ID + ".javaDebug.alertHCRFailed"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether to alert

-	 * with a dialog when hot code replace is not supported.

-	 */	

-	public static final String PREF_ALERT_HCR_NOT_SUPPORTED = IJavaDebugUIConstants.PLUGIN_ID + ".javaDebug.alertHCRNotSupported"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether to alert

-	 * with a dialog when hot code replace results in 

-	 * obsolete methods.

-	 */	

-	public static final String PREF_ALERT_OBSOLETE_METHODS = IJavaDebugUIConstants.PLUGIN_ID + "javaDebug.alertObsoleteMethods"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether the debugger shows 

-	 * qualifed names. When <code>true</code> the debugger

-	 * will show qualified names in newly opened views.

-	 * 

-	 * @since 2.0

-	 */

-	public static final String PREF_SHOW_QUALIFIED_NAMES= IJavaDebugUIConstants.PLUGIN_ID + ".show_qualified_names"; //$NON-NLS-1$

-	

-	/**

-	 * Boolean preference controlling whether the debugger shows 

-	 * static fields. When <code>true</code> the debugger

-	 * will show static fields in newly opened views.

-	 * 

-	 * @since 2.0

-	 */

-	public static final String PREF_SHOW_STATIC_FIELDS= IJavaDebugUIConstants.PLUGIN_ID + ".show_static_fields"; //$NON-NLS-1$

-

-	/**

-	 * Boolean preference controlling whether the debugger shows 

-	 * final fields. When <code>true</code> the debugger

-	 * will show final fields in newly opened views.

-	 * 

-	 * @since 2.0

-	 */

-	public static final String PREF_SHOW_FINAL_FIELDS= IJavaDebugUIConstants.PLUGIN_ID + ".show_final_fields"; //$NON-NLS-1$

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIStatusConstants.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIStatusConstants.java
deleted file mode 100644
index 31ee48d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJDIStatusConstants.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- * Constants for status objects

- */

-public interface IJDIStatusConstants {

-

-	/**

-	 * Indicates a connection could not be made with a remote VM

-	 */

-	public static final int CODE_CONNECTION_FAILED= 1;

-

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJavaDebugHelpContextIds.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJavaDebugHelpContextIds.java
deleted file mode 100644
index 5cb9839..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/IJavaDebugHelpContextIds.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-
-/**
- * Help context ids for the Java Debug UI.
- * <p>
- * This interface contains constants only; it is not intended to be implemented
- * or extended.
- * </p>
- * 
- */
-public interface IJavaDebugHelpContextIds {
-	
-	public static final String PREFIX= IJavaDebugUIConstants.PLUGIN_ID + '.';
-
-	// view parts
-	public static final String DISPLAY_VIEW= PREFIX + "display_view_context"; //$NON-NLS-1$
-
-	//dialogs
-	public static final String EDIT_JRE_DIALOG= PREFIX + "edit_jre_dialog_context"; //$NON-NLS-1$
-
-	// Preference/Property pages
-	public static final String JRE_PREFERENCE_PAGE= PREFIX + "jre_preference_page_context"; //$NON-NLS-1$
-	public static final String LAUNCH_JRE_PROPERTY_PAGE= PREFIX + "launch_jre_property_page_context"; //$NON-NLS-1$
-	public static final String JAVA_DEBUG_PREFERENCE_PAGE= PREFIX + "java_debug_preference_page_context"; //$NON-NLS-1$
-	public static final String JAVA_DEBUG_APPEARANCE_PREFERENCE_PAGE= PREFIX + "java_debug_appearance_preference_page_context"; //$NON-NLS-1$	
-	public static final String JAVA_STEP_FILTER_PREFERENCE_PAGE= PREFIX + "java_step_filter_preference_page_context"; //$NON-NLS-1$
-	
-	// reused ui-blocks
-	public static final String SOURCE_ATTACHMENT_BLOCK= PREFIX + "source_attachment_context"; //$NON-NLS-1$
-	public static final String WORKING_DIRECTORY_BLOCK= PREFIX + "working_directory_context"; //$NON-NLS-1$
-
-	// launch configuration dialog tabs
-	public static final String LAUNCH_CONFIGURATION_DIALOG_ARGUMENTS_TAB= PREFIX + "launch_configuration_dialog_arguments_tab"; //$NON-NLS-1$
-	public static final String LAUNCH_CONFIGURATION_DIALOG_CLASSPATH_TAB= PREFIX + "launch_configuration_dialog_classpath_tab"; //$NON-NLS-1$
-	public static final String LAUNCH_CONFIGURATION_DIALOG_CONNECT_TAB= PREFIX + "launch_configuration_dialog_connect_tab"; //$NON-NLS-1$
-	public static final String LAUNCH_CONFIGURATION_DIALOG_JRE_TAB= PREFIX + "launch_configuration_dialog_jre_tab"; //$NON-NLS-1$
-	public static final String LAUNCH_CONFIGURATION_DIALOG_MAIN_TAB= PREFIX + "launch_configuration_dialog_main_tab"; //$NON-NLS-1$
-	public static final String LAUNCH_CONFIGURATION_DIALOG_SOURCE_TAB= PREFIX + "launch_configuration_dialog_source_tab"; //$NON-NLS-1$
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java
deleted file mode 100644
index 3d17202..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ImageDescriptorRegistry.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.HashMap;

-import java.util.Iterator;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.util.Assert;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Display;

-

-/**

- * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.

- */

-public class ImageDescriptorRegistry {

-

-	private HashMap fRegistry= new HashMap(10);

-	private Display fDisplay;

-	

-	/**

-	 * Creates a new image descriptor registry for the current or default display,

-	 * respectively.

-	 */

-	public ImageDescriptorRegistry() {

-		this(JDIDebugUIPlugin.getStandardDisplay());

-	}

-	

-	/**

-	 * Creates a new image descriptor registry for the given display. All images

-	 * managed by this registry will be disposed when the display gets disposed.

-	 * 

-	 * @param diaplay the display the images managed by this registry are allocated for 

-	 */

-	public ImageDescriptorRegistry(Display display) {

-		fDisplay= display;

-		Assert.isNotNull(fDisplay);

-		hookDisplay();

-	}

-	

-	/**

-	 * Returns the image associated with the given image descriptor.

-	 * 

-	 * @param descriptor the image descriptor for which the registry manages an image

-	 * @return the image associated with the image descriptor or <code>null</code>

-	 *  if the image descriptor can't create the requested image.

-	 */

-	public Image get(ImageDescriptor descriptor) {

-		if (descriptor == null)

-			descriptor= ImageDescriptor.getMissingImageDescriptor();

-			

-		Image result= (Image)fRegistry.get(descriptor);

-		if (result != null)

-			return result;

-	

-		Assert.isTrue(fDisplay == JDIDebugUIPlugin.getStandardDisplay(), DebugUIMessages.getString("ImageDescriptorRegistry.Allocating_image_for_wrong_display_1")); //$NON-NLS-1$

-		result= descriptor.createImage();

-		if (result != null)

-			fRegistry.put(descriptor, result);

-		return result;

-	}

-

-	/**

-	 * Disposes all images managed by this registry.

-	 */	

-	public void dispose() {

-		for (Iterator iter= fRegistry.values().iterator(); iter.hasNext(); ) {

-			Image image= (Image)iter.next();

-			image.dispose();

-		}

-		fRegistry.clear();

-	}

-	

-	private void hookDisplay() {

-		fDisplay.disposeExec(new Runnable() {

-			public void run() {

-				dispose();

-			}	

-		});

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java
deleted file mode 100644
index 4cc5b4d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIContentAssistPreference.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.Hashtable;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.internal.debug.ui.display.DisplayCompletionProcessor;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetCompletionProcessor;

-import org.eclipse.jdt.internal.ui.JavaPlugin;

-import org.eclipse.jdt.internal.ui.text.ContentAssistPreference;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jdt.ui.text.IColorManager;

-import org.eclipse.jdt.ui.text.JavaTextTools;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.PreferenceConverter;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.contentassist.ContentAssistant;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.RGB;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-

-

-public class JDIContentAssistPreference {

-	

-	private final static String VISIBILITY= "org.eclipse.jdt.core.codeComplete.visibilityCheck"; //$NON-NLS-1$

-	private final static String ENABLED= "enabled"; //$NON-NLS-1$

-	private final static String DISABLED= "disabled"; //$NON-NLS-1$

-	

-	private static Color getColor(IPreferenceStore store, String key, IColorManager manager) {

-		RGB rgb= PreferenceConverter.getColor(store, key);

-		return manager.getColor(rgb);

-	}

-	

-	private static Color getColor(IPreferenceStore store, String key) {

-		JavaTextTools textTools= JavaPlugin.getDefault().getJavaTextTools();

-		return getColor(store, key, textTools.getColorManager());

-	}

-	

-	private static DisplayCompletionProcessor getDisplayProcessor(ContentAssistant assistant) {

-		IContentAssistProcessor p= assistant.getContentAssistProcessor(IDocument.DEFAULT_CONTENT_TYPE);

-		if (p instanceof DisplayCompletionProcessor)

-			return  (DisplayCompletionProcessor) p;

-		return null;

-	}

-	

-	private static JavaSnippetCompletionProcessor getJavaSnippetProcessor(ContentAssistant assistant) {

-		IContentAssistProcessor p= assistant.getContentAssistProcessor(IDocument.DEFAULT_CONTENT_TYPE);

-		if (p instanceof JavaSnippetCompletionProcessor)

-			return  (JavaSnippetCompletionProcessor) p;

-		return null;

-	}

-	

-	private static void configureDisplayProcessor(ContentAssistant assistant, IPreferenceStore store) {

-		DisplayCompletionProcessor dcp= getDisplayProcessor(assistant);

-		if (dcp == null) {

-			return;

-		}

-		String triggers= store.getString(ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVA);

-		if (triggers != null) {

-			dcp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());

-		}

-			

-		boolean enabled= store.getBoolean(ContentAssistPreference.SHOW_VISIBLE_PROPOSALS);

-		restrictProposalsToVisibility(enabled);

-		

-		enabled= store.getBoolean(ContentAssistPreference.CASE_SENSITIVITY);

-		restrictProposalsToMatchingCases(enabled);

-		

-		enabled= store.getBoolean(ContentAssistPreference.ORDER_PROPOSALS);

-		dcp.orderProposalsAlphabetically(enabled);

-	}

-	

-	private static void configureJavaSnippetProcessor(ContentAssistant assistant, IPreferenceStore store) {

-		JavaSnippetCompletionProcessor cp= getJavaSnippetProcessor(assistant);

-		if (cp == null) {

-			return;

-		}

-			

-		String triggers= store.getString(ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVA);

-		if (triggers != null) {

-			cp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());

-		}

-			

-		boolean enabled= store.getBoolean(ContentAssistPreference.SHOW_VISIBLE_PROPOSALS);

-		restrictProposalsToVisibility(enabled);

-		

-		enabled= store.getBoolean(ContentAssistPreference.CASE_SENSITIVITY);

-		restrictProposalsToMatchingCases(enabled);

-		

-		enabled= store.getBoolean(ContentAssistPreference.ORDER_PROPOSALS);

-		cp.orderProposalsAlphabetically(enabled);

-	}

-	

-	/**

-	 * Configure the given content assistant from the preference store.

-	 */

-	public static void configure(ContentAssistant assistant, IColorManager manager) {

-		

-		IPreferenceStore store= getPreferenceStore();

-		

-		boolean enabled= store.getBoolean(ContentAssistPreference.AUTOACTIVATION);

-		assistant.enableAutoActivation(enabled);

-		

-		int delay= store.getInt(ContentAssistPreference.AUTOACTIVATION_DELAY);

-		assistant.setAutoActivationDelay(delay);

-		

-		Color c= getColor(store, ContentAssistPreference.PROPOSALS_FOREGROUND, manager);

-		assistant.setProposalSelectorForeground(c);

-		

-		c= getColor(store, ContentAssistPreference.PROPOSALS_BACKGROUND, manager);

-		assistant.setProposalSelectorBackground(c);

-		

-		c= getColor(store, ContentAssistPreference.PARAMETERS_FOREGROUND, manager);

-		assistant.setContextInformationPopupForeground(c);

-		assistant.setContextSelectorForeground(c);

-		

-		c= getColor(store, ContentAssistPreference.PARAMETERS_BACKGROUND, manager);

-		assistant.setContextInformationPopupBackground(c);

-		assistant.setContextSelectorBackground(c);

-		

-		enabled= store.getBoolean(ContentAssistPreference.AUTOINSERT);

-		assistant.enableAutoInsert(enabled);

-

-		configureDisplayProcessor(assistant, store);

-		configureJavaSnippetProcessor(assistant, store);

-	}

-	

-	

-	private static void changeDisplayProcessor(ContentAssistant assistant, IPreferenceStore store, String key) {

-		DisplayCompletionProcessor dcp= getDisplayProcessor(assistant);

-		if (dcp == null) {

-			return;

-		}

-		if (ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVA.equals(key)) {

-			String triggers= store.getString(ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVA);

-			if (triggers != null) {

-				dcp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());

-			}

-		} else if (ContentAssistPreference.ORDER_PROPOSALS.equals(key)) {

-			boolean enable= store.getBoolean(ContentAssistPreference.ORDER_PROPOSALS);

-			dcp.orderProposalsAlphabetically(enable);

-		}

-	}

-	

-	private static void changeJavaSnippetProcessor(ContentAssistant assistant, IPreferenceStore store, String key) {

-		JavaSnippetCompletionProcessor cp= getJavaSnippetProcessor(assistant);

-		if (cp == null) {

-			return;

-		}

-		if (ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVA.equals(key)) {

-			String triggers= store.getString(ContentAssistPreference.AUTOACTIVATION_TRIGGERS_JAVA);

-			if (triggers != null) {

-				cp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());

-			}

-		} else if (ContentAssistPreference.ORDER_PROPOSALS.equals(key)) {

-			boolean enable= store.getBoolean(ContentAssistPreference.ORDER_PROPOSALS);

-			cp.orderProposalsAlphabetically(enable);

-		}	

-	}

-	

-	

-	/**

-	 * Changes the configuration of the given content assistant according to the given property

-	 * change event.

-	 */

-	public static void changeConfiguration(ContentAssistant assistant, PropertyChangeEvent event) {

-		

-		IPreferenceStore store= getPreferenceStore();

-		String p= event.getProperty();

-		

-		if (ContentAssistPreference.AUTOACTIVATION.equals(p)) {

-			boolean enabled= store.getBoolean(ContentAssistPreference.AUTOACTIVATION);

-			assistant.enableAutoActivation(enabled);

-		} else if (ContentAssistPreference.AUTOACTIVATION_DELAY.equals(p)) {

-			int delay= store.getInt(ContentAssistPreference.AUTOACTIVATION_DELAY);

-			assistant.setAutoActivationDelay(delay);

-		} else if (ContentAssistPreference.PROPOSALS_FOREGROUND.equals(p)) {

-			Color c= getColor(store, ContentAssistPreference.PROPOSALS_FOREGROUND);

-			assistant.setProposalSelectorForeground(c);

-		} else if (ContentAssistPreference.PROPOSALS_BACKGROUND.equals(p)) {

-			Color c= getColor(store, ContentAssistPreference.PROPOSALS_BACKGROUND);

-			assistant.setProposalSelectorBackground(c);

-		} else if (ContentAssistPreference.PARAMETERS_FOREGROUND.equals(p)) {

-			Color c= getColor(store, ContentAssistPreference.PARAMETERS_FOREGROUND);

-			assistant.setContextInformationPopupForeground(c);

-			assistant.setContextSelectorForeground(c);

-		} else if (ContentAssistPreference.PARAMETERS_BACKGROUND.equals(p)) {

-			Color c= getColor(store, ContentAssistPreference.PARAMETERS_BACKGROUND);

-			assistant.setContextInformationPopupBackground(c);

-			assistant.setContextSelectorBackground(c);

-		} else if (ContentAssistPreference.AUTOINSERT.equals(p)) {

-			boolean enabled= store.getBoolean(ContentAssistPreference.AUTOINSERT);

-			assistant.enableAutoInsert(enabled);

-		}

-		

-		changeDisplayProcessor(assistant, store, p);

-		changeJavaSnippetProcessor(assistant, store, p);

-	}

-	

-	/**

-	 * Tells this processor to restrict its proposal to those element

-	 * visible in the actual invocation context.

-	 * 

-	 * @param restrict <code>true</code> if proposals should be restricted

-	 */

-	private static void restrictProposalsToVisibility(boolean restrict) {

-		Hashtable options= JavaCore.getOptions();

-		Object value= options.get(VISIBILITY);

-		if (value instanceof String) {

-			String newValue= restrict ? ENABLED : DISABLED;

-			if (!newValue.equals((String) value)) {

-				options.put(VISIBILITY, newValue);

-				JavaCore.setOptions(options);

-			}

-		}

-	}

-	

-	/**

-	 * Tells this processor to restrict is proposals to those

-	 * starting with matching cases.

-	 * 

-	 * @param restrict <code>true</code> if proposals should be restricted

-	 */

-	private static void restrictProposalsToMatchingCases(boolean restrict) {

-		// XXX not yet supported

-	}

-	

-	private static IPreferenceStore getPreferenceStore() {

-		return ((AbstractUIPlugin)Platform.getPlugin(JavaUI.ID_PLUGIN)).getPreferenceStore();

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIAdapterFactory.java
deleted file mode 100644
index 68d43bf..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIAdapterFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.io.IOException;

-import org.eclipse.core.runtime.IAdapterFactory;

-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.ui.JavaElementLabelProvider;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.ui.ISharedImages;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.model.IWorkbenchAdapter;

-

-/**

- * Workbench properties adapter for source locations

- */

-/*package*/ class JDIDebugUIAdapterFactory implements IAdapterFactory {

-

-	class SourceLocationPropertiesAdapter implements IWorkbenchAdapter {

-		

-		private JavaElementLabelProvider fJavaElementLabelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_BASICS);

-	

-		/**

-		 * @see IWorkbenchAdapter#getChildren(Object)

-		 */

-		public Object[] getChildren(Object o) {

-			return new Object[0];

-		}

-

-		/**

-		 * @see IWorkbenchAdapter#getImageDescriptor(Object)

-		 */

-		public ImageDescriptor getImageDescriptor(Object o) {

-			if (o instanceof JavaProjectSourceLocation) {

-				return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_PROJECT);

-			} else if (o instanceof DirectorySourceLocation) {

-				return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);

-			} else if (o instanceof ArchiveSourceLocation) {

-				return JavaUI.getSharedImages().getImageDescriptor(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_JAR);

-			}

-			return null;

-		}

-

-		/**

-		 * @see IWorkbenchAdapter#getLabel(Object)

-		 */

-		public String getLabel(Object o) {

-			if (o instanceof JavaProjectSourceLocation) {

-				return fJavaElementLabelProvider.getText(((JavaProjectSourceLocation)o).getJavaProject());

-			} else if (o instanceof DirectorySourceLocation) {

-				try {

-					return ((DirectorySourceLocation)o).getDirectory().getCanonicalPath();

-				} catch (IOException e) {

-					JDIDebugUIPlugin.log(e);

-					return ((DirectorySourceLocation)o).getDirectory().getName();

-				}

-			} else if (o instanceof ArchiveSourceLocation) {

-				return ((ArchiveSourceLocation)o).getName();

-			}

-			return null;

-		}

-

-		/**

-		 * @see IWorkbenchAdapter#getParent(Object)

-		 */

-		public Object getParent(Object o) {

-			return null;

-		}

-	}

-	

-	/**

-	 * @see IAdapterFactory#getAdapter(Object, Class)

-	 */

-	public Object getAdapter(Object obj, Class adapterType) {

-		if (adapterType.isInstance(obj)) {

-			return obj;

-		}

-		if (adapterType == IWorkbenchAdapter.class) {

-			if (obj instanceof IJavaSourceLocation) {

-				return new SourceLocationPropertiesAdapter();

-			}

-		}

-		return null;

-	}

-

-	/**

-	 * @see IAdapterFactory#getAdapterList()

-	 */

-	public Class[] getAdapterList() {

-		return new Class[] {

-			IWorkbenchAdapter.class

-		};

-	}

-}

-

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
deleted file mode 100644
index 7eb2f27..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIDebugUIPlugin.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.lang.reflect.InvocationTargetException;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Map;

-import java.util.Set;

-

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdapterManager;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.IPluginDescriptor;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.debug.ui.ILaunchConfigurationTab;

-import org.eclipse.jdt.core.IElementChangedListener;

-import org.eclipse.jdt.core.IJavaModel;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.IMethod;

-import org.eclipse.jdt.core.IPackageFragment;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.debug.core.IJavaDebugTarget;

-import org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener;

-import org.eclipse.jdt.debug.core.IJavaStackFrame;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-import org.eclipse.jdt.debug.eval.IAstEvaluationEngine;

-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetFileDocumentProvider;

-import org.eclipse.jdt.launching.sourcelookup.IJavaSourceLocation;

-import org.eclipse.jdt.ui.JavaElementLabelProvider;

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.dialogs.ElementListSelectionDialog;

-import org.eclipse.ui.editors.text.FileDocumentProvider;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.eclipse.ui.texteditor.IDocumentProvider;

-

-/**

- * Plug-in class for the org.eclipse.jdt.debug.ui plug-in.

- */

-public class JDIDebugUIPlugin extends AbstractUIPlugin {

-

-	/**

-	 * Java Debug UI plug-in instance

-	 */

-	private static JDIDebugUIPlugin fgPlugin;

-	

-	private FileDocumentProvider fSnippetDocumentProvider;

-	

-	private ImageDescriptorRegistry fImageDescriptorRegistry;

-	

-	private JavaEvaluationEngineManager fEvaluationEngineManager;

-	

-	/**

-	 * Java Debug UI listeners

-	 */

-	private IJavaHotCodeReplaceListener fHCRListener;

-	private IElementChangedListener fJavaModelListener;

-	

-	// Map of VMInstallTypeIDs to IConfigurationElements

-	protected Map fVmInstallTypePageMap;

-

-	/**

-	 * @see Plugin(IPluginDescriptor)

-	 */

-	public JDIDebugUIPlugin(IPluginDescriptor descriptor) {

-		super(descriptor);

-		setDefault(this);

-	}

-	

-	/**

-	 * Sets the Java Debug UI plug-in instance

-	 * 

-	 * @param plugin the plugin instance

-	 */

-	private static void setDefault(JDIDebugUIPlugin plugin) {

-		fgPlugin = plugin;

-	}

-	

-	/**

-	 * Returns the Java Debug UI plug-in instance

-	 * 

-	 * @return the Java Debug UI plug-in instance

-	 */

-	public static JDIDebugUIPlugin getDefault() {

-		return fgPlugin;

-	}

-	

-	/**

-	 * Convenience method which returns the unique identifier of this plugin.

-	 */

-	public 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.debug.ui"; //$NON-NLS-1$

-		}

-		return getDefault().getDescriptor().getUniqueIdentifier();

-	}

-	

-	/**

-	 * Logs the specified status with this plug-in's log.

-	 * 

-	 * @param status status to log

-	 */

-	public static void log(IStatus status) {

-		getDefault().getLog().log(status);

-	}

-	

-	/**

-	 * Logs an internal error with the specified message.

-	 * 

-	 * @param message the error message to log

-	 */

-	public static void logErrorMessage(String message) {

-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, message, null));

-	}

-

-	/**

-	 * Logs an internal error with the specified throwable

-	 * 

-	 * @param e the exception to be logged

-	 */	

-	public static void log(Throwable e) {

-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, DebugUIMessages.getString("JDIDebugUIPlugin.Internal_Error_1"), e));  //$NON-NLS-1$

-	}

-	

-	/**

-	 * Returns the active workbench window

-	 * 

-	 * @return the active workbench window

-	 */

-	public static IWorkbenchWindow getActiveWorkbenchWindow() {

-		return getDefault().getWorkbench().getActiveWorkbenchWindow();

-	}	

-	

-	public static IWorkbenchPage getActivePage() {

-		IWorkbenchWindow w = getActiveWorkbenchWindow();

-		if (w != null) {

-			return w.getActivePage();

-		}

-		return null;

-	}

-	

-	

-	/**

-	 * Returns the active workbench shell or <code>null</code> if none

-	 * 

-	 * @return the active workbench shell or <code>null</code> if none

-	 */

-	public static Shell getActiveWorkbenchShell() {

-		IWorkbenchWindow window = getActiveWorkbenchWindow();

-		if (window != null) {

-			return window.getShell();

-		}

-		return null;

-	}	

-	

-	/* (non - Javadoc)

-	 * Method declared in AbstractUIPlugin

-	 */

-	protected ImageRegistry createImageRegistry() {

-		return JavaDebugImages.getImageRegistry();

-	}	

-	

-	public IDocumentProvider getSnippetDocumentProvider() {

-		if (fSnippetDocumentProvider == null)

-			fSnippetDocumentProvider= new SnippetFileDocumentProvider();

-		return fSnippetDocumentProvider;

-	}	

-	

-	/**

-	 * Logs the given message if in debug mode.

-	 * 

-	 * @param String message to log

-	 */

-	public static void logDebugMessage(String message) {

-		if (getDefault().isDebugging()) {

-			// this message is intentionally not internationalized, as an exception may

-			// be due to the resource bundle itself

-			log(new Status(IStatus.ERROR, getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, "Internal message logged from JDT Debug UI: " + message, null)); //$NON-NLS-1$

-		}

-	}

-	

-	public static void errorDialog(String message, IStatus status) {

-		log(status);

-		Shell shell = getActiveWorkbenchShell();

-		if (shell != null) {

-			ErrorDialog.openError(shell, DebugUIMessages.getString("JDIDebugUIPlugin.Error_1"), message, status); //$NON-NLS-1$

-		}

-	}

-	

-	/**

-	 * Utility method with conventions

-	 */

-	public static void errorDialog(String message, Throwable t) {

-		log(t);

-		Shell shell = getActiveWorkbenchShell();

-		if (shell != null) {

-			IStatus status= new Status(IStatus.ERROR, getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, "Error logged from JDT Debug UI: ", t); //$NON-NLS-1$	

-			ErrorDialog.openError(shell, DebugUIMessages.getString("JDIDebugUIPlugin.Error_1"), message, status); //$NON-NLS-1$

-		}

-	}

-	

-	/**

-	 * @see AbstractUIPlugin#initializeDefaultPreferences

-	 */

-	protected void initializeDefaultPreferences(IPreferenceStore store) {

-		super.initializeDefaultPreferences(store);

-		JavaDebugPreferencePage.initDefaults(store);

-		JavaStepFilterPreferencePage.initDefaults(store);

-	}

-	

-	/**

-	 * @see AbstractUIPlugin#startup()

-	 */

-	public void startup() throws CoreException {

-		super.startup();

-		JavaDebugOptionsManager.getDefault().startup();

-		

-		IAdapterManager manager= Platform.getAdapterManager();

-		manager.registerAdapters(new JDIDebugUIAdapterFactory(), IJavaSourceLocation.class);

-		manager.registerAdapters(new MethodAdapterFactory(), IMethod.class);

-		manager.registerAdapters(new JavaStackFrameAdapterFactory(), IJavaStackFrame.class);

-		

-		fEvaluationEngineManager= new JavaEvaluationEngineManager();

-		fJavaModelListener= new JavaModelListener();

-		JavaCore.addElementChangedListener(fJavaModelListener);

-		fHCRListener= new JavaHotCodeReplaceListener();

-		JDIDebugModel.addHotCodeReplaceListener(fHCRListener);

-		getStandardDisplay().asyncExec(

-			new Runnable() {

-				public void run() {

-					createImageRegistry();

-				}

-			});	

-	}

-	

-	/**

-	 * @see AbstractUIPlugin#shutdown()

-	 */

-	public void shutdown() throws CoreException {

-		JDIDebugModel.removeHotCodeReplaceListener(fHCRListener);

-		JavaCore.removeElementChangedListener(fJavaModelListener);

-		JavaDebugOptionsManager.getDefault().shutdown();

-		if (fImageDescriptorRegistry != null) {

-			fImageDescriptorRegistry.dispose();

-		}

-		fEvaluationEngineManager.dispose();

-		super.shutdown();

-	}

-	

-	/**

-	 * Returns the image descriptor registry used for this plugin.

-	 */

-	public static ImageDescriptorRegistry getImageDescriptorRegistry() {

-		if (getDefault().fImageDescriptorRegistry == null) {

-			getDefault().fImageDescriptorRegistry = new ImageDescriptorRegistry();

-		}

-		return getDefault().fImageDescriptorRegistry;

-	}

-	

-	/**

-	 * Returns the standard display to be used. The method first checks, if

-	 * the thread calling this method has an associated display. If so, this

-	 * display is returned. Otherwise the method returns the default display.

-	 */

-	public static Display getStandardDisplay() {

-		Display display;

-		display= Display.getCurrent();

-		if (display == null)

-			display= Display.getDefault();

-		return display;		

-	}

-	

-	/**

-	 * Returns an evaluation engine for the given project in the given debug target.

-	 * 

-	 * @see JavaEvaluationEngineManager#getEvaluationEngine(IJavaProject, IJavaDebugTarget)

-	 * 

-	 * @param project java project

-	 * @param target the debug target

-	 * @return evalaution engine

-	 */

-	public IAstEvaluationEngine getEvaluationEngine(IJavaProject project, IJavaDebugTarget target) {

-		return fEvaluationEngineManager.getEvaluationEngine(project, target);

-	}

-	

-	/**

-	 * Utility method to create and return a selection dialog that allows

-	 * selection of a specific Java package.  Empty packages are not returned.

-	 * If Java Projects are provided, only packages found within those projects

-	 * are included.  If no Java projects are provided, all Java projects in the

-	 * workspace are considered.

-	 */

-	public static ElementListSelectionDialog createAllPackagesDialog(Shell shell, IJavaProject[] originals, final boolean includeDefaultPackage) throws JavaModelException{

-		final List packageList = new ArrayList();

-		if (originals == null) {

-			IWorkspaceRoot wsroot= ResourcesPlugin.getWorkspace().getRoot();

-			IJavaModel model= JavaCore.create(wsroot);

-			originals= model.getJavaProjects();

-		}

-		final IJavaProject[] projects= originals;

-		final JavaModelException[] exception= new JavaModelException[1];

-		ProgressMonitorDialog monitor= new ProgressMonitorDialog(shell);

-		IRunnableWithProgress r= new IRunnableWithProgress() {

-			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {

-				try {

-					Set packageNameSet= new HashSet();

-					monitor.beginTask(DebugUIMessages.getString("JDIDebugUIPlugin.Searching_1"), projects.length); //$NON-NLS-1$

-					for (int i = 0; i < projects.length; i++) {						

-						IPackageFragment[] pkgs= projects[i].getPackageFragments();	

-						for (int j = 0; j < pkgs.length; j++) {

-							IPackageFragment pkg = pkgs[j];

-							if (!pkg.hasChildren() && (pkg.getNonJavaResources().length > 0)) {

-								continue;

-							}

-							String pkgName= pkg.getElementName();

-							if (!includeDefaultPackage && pkgName.length() == 0) {

-								continue;

-							}

-							if (packageNameSet.add(pkgName)) {

-								packageList.add(pkg);

-							}

-						}

-						monitor.worked(1);

-					}

-					monitor.done();

-				} catch (JavaModelException jme) {

-					exception[0]= jme;

-				}

-			}

-		};

-		try {

-			monitor.run(false, false, r);	

-		} catch (InvocationTargetException e) {

-			JDIDebugUIPlugin.log(e);

-		} catch (InterruptedException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		if (exception[0] != null) {

-			throw exception[0];

-		}

-		int flags= JavaElementLabelProvider.SHOW_DEFAULT;

-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(shell, new JavaElementLabelProvider(flags));

-		dialog.setIgnoreCase(false);

-		dialog.setElements(packageList.toArray()); // XXX inefficient

-		return dialog;

-	}

-	

-	/**

-	 * Return an object that implements <code>ILaunchConfigurationTab</code> for the

-	 * specified vm install type ID.  

-	 */

-	public ILaunchConfigurationTab getVMInstallTypePage(String vmInstallTypeID) {

-		if (fVmInstallTypePageMap == null) {	

-			initializeVMInstallTypePageMap();

-		}

-		IConfigurationElement configElement = (IConfigurationElement) fVmInstallTypePageMap.get(vmInstallTypeID);

-		ILaunchConfigurationTab tab = null;

-		if (configElement != null) {

-			try {

-				tab = (ILaunchConfigurationTab) configElement.createExecutableExtension("class"); //$NON-NLS-1$

-			} catch(CoreException ce) {			 

-				log(new Status(Status.ERROR, getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, DebugUIMessages.getString("JDIDebugUIPlugin.An_error_occurred_retrieving_a_VMInstallType_page_1"), ce)); //$NON-NLS-1$

-			} 

-		}

-		return tab;

-	}

-	

-	protected void initializeVMInstallTypePageMap() {

-		fVmInstallTypePageMap = new HashMap(10);

-

-		IPluginDescriptor descriptor= JDIDebugUIPlugin.getDefault().getDescriptor();

-		IExtensionPoint extensionPoint= descriptor.getExtensionPoint(IJavaDebugUIConstants.EXTENSION_POINT_VM_INSTALL_TYPE_PAGE);

-		IConfigurationElement[] infos= extensionPoint.getConfigurationElements();

-		for (int i = 0; i < infos.length; i++) {

-			String id = infos[i].getAttribute("vmInstallTypeID"); //$NON-NLS-1$

-			fVmInstallTypePageMap.put(id, infos[i]);

-		}		

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIImageDescriptor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIImageDescriptor.java
deleted file mode 100644
index 963129e..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIImageDescriptor.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * A JDIImageDescriptor consists of a main icon and several adornments. The adornments
- * are computed according to flags set on creation of the descriptor.
- */
-public class JDIImageDescriptor extends CompositeImageDescriptor {
-	
-	/** Flag to render the is out of synch adornment */
-	public final static int IS_OUT_OF_SYNCH= 		0x001;
-	/** Flag to render the may be out of synch adornment */
-	public final static int MAY_BE_OUT_OF_SYNCH= 	0x002;
-	/** Flag to render the installed breakpoint adornment */
-	public final static int INSTALLED= 				0x004;
-	/** Flag to render the entry method breakpoint adornment */
-	public final static int ENTRY=				 	0x008;
-	/** Flag to render the exit method breakpoint adornment */
-	public final static int EXIT=				 	0x010;
-	/** Flag to render the enabled breakpoint adornment */
-	public final static int ENABLED=				0x020;
-	/** Flag to render the conditional breakpoint adornment */
-	public final static int CONDITIONAL=				0x040;
-	/** Flag to render the caught breakpoint adornment */
-	public final static int CAUGHT=				0x080;
-	/** Flag to render the uncaught breakpoint adornment */
-	public final static int UNCAUGHT=				0x100;
-	/** Flag to render the scoped breakpoint adornment */
-	public final static int SCOPED=				0x200;
-
-	private ImageDescriptor fBaseImage;
-	private int fFlags;
-	private Point fSize;
-	
-	/**
-	 * Create a new JDIImageDescriptor.
-	 * 
-	 * @param baseImage an image descriptor used as the base image
-	 * @param flags flags indicating which adornments are to be rendered
-	 * 
-	 */
-	public JDIImageDescriptor(ImageDescriptor baseImage, int flags) {
-		setBaseImage(baseImage);
-		setFlags(flags);
-	}
-	
-	/**
-	 * @see CompositeImageDescriptor#getSize()
-	 */
-	protected Point getSize() {
-		if (fSize == null) {
-			ImageData data= getBaseImage().getImageData();
-			setSize(new Point(data.width, data.height));
-		}
-		return fSize;
-	}
-	
-	/**
-	 * @see Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {
-		if (!(object instanceof JDIImageDescriptor)){
-			return false;
-		}
-			
-		JDIImageDescriptor other= (JDIImageDescriptor)object;
-		return (getBaseImage().equals(other.getBaseImage()) && getFlags() == other.getFlags());
-	}
-	
-	/**
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return getBaseImage().hashCode() | getFlags();
-	}
-	
-	/**
-	 * @see CompositeImageDescriptor#drawCompositeImage(int, int)
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		ImageData bg= getBaseImage().getImageData();
-		if (bg == null) {
-			bg= DEFAULT_IMAGE_DATA;
-		}
-		drawImage(bg, 0, 0);
-		drawOverlays();
-	}
-
-/**
-	 * Add any overlays to the image as specified in the flags.
-	 */
-	protected void drawOverlays() {
-		int flags= getFlags();
-		int x= 0;
-		int y= 0;
-		ImageData data= null;
-		if ((flags & IS_OUT_OF_SYNCH) != 0) {
-			x= getSize().x;
-			y= 0;
-			data= JavaDebugImages.DESC_OVR_IS_OUT_OF_SYNCH.getImageData();
-			x -= data.width;
-			drawImage(data, x, y);
-		} else if ((flags & MAY_BE_OUT_OF_SYNCH) != 0) {
-			x= getSize().x;
-			y= 0;
-			data= JavaDebugImages.DESC_OVR_MAY_BE_OUT_OF_SYNCH.getImageData();
-			x -= data.width;
-			drawImage(data, x, y);
-		} else {
-			if ((flags & INSTALLED) != 0) {
-				x= 0;
-				y= getSize().y;
-				if ((flags & ENABLED) !=0) {
-					data= JavaDebugImages.DESC_OBJS_BREAKPOINT_INSTALLED.getImageData();
-				} else {
-					data= JavaDebugImages.DESC_OBJS_BREAKPOINT_INSTALLED_DISABLED.getImageData();
-				}
-				
-				y -= data.height;
-				drawImage(data, x, y);
-			}
-			if ((flags & CAUGHT) != 0) {
-				if ((flags & ENABLED) !=0) {
-					data= JavaDebugImages.DESC_OBJS_CAUGHT_BREAKPOINT.getImageData();
-				} else {
-					data= JavaDebugImages.DESC_OBJS_CAUGHT_BREAKPOINT_DISABLED.getImageData();
-				}
-				x= 0;
-				y= 0;
-				drawImage(data, x, y);
-			}
-			if ((flags & UNCAUGHT) != 0) {
-				if ((flags & ENABLED) !=0) {
-					data= JavaDebugImages.DESC_OBJS_UNCAUGHT_BREAKPOINT.getImageData();
-				} else {
-					data= JavaDebugImages.DESC_OBJS_UNCAUGHT_BREAKPOINT_DISABLED.getImageData();
-				}
-				x= data.width;
-				y= data.height;
-				drawImage(data, x, y);
-			}
-			if ((flags & SCOPED) != 0) {
-				if ((flags & ENABLED) !=0) {
-					data= JavaDebugImages.DESC_OBJS_SCOPED_BREAKPOINT.getImageData();
-				} else {
-					data= JavaDebugImages.DESC_OBJS_SCOPED_BREAKPOINT_DISABLED.getImageData();
-				}
-				x= 0;
-				y= getSize().y;
-				y-= data.height;
-				drawImage(data, x, y);
-			}
-			if ((flags & CONDITIONAL) != 0) {
-				x= getSize().x;
-				y= 0;
-				if ((flags & ENABLED) !=0) {
-					data= JavaDebugImages.DESC_OBJS_CONDITIONAL_BREAKPOINT.getImageData();
-				} else {
-					data= JavaDebugImages.DESC_OBJS_CONDITIONAL_BREAKPOINT_DISABLED.getImageData();
-				}
-				x -= data.width;
-				drawImage(data, x, y);
-			} else {
-				if ((flags & ENTRY) != 0) {
-					x= getSize().x;
-					y= 0;
-					if ((flags & ENABLED) !=0) {
-						data= JavaDebugImages.DESC_OBJS_METHOD_BREAKPOINT_ENTRY.getImageData();
-					} else {
-						data= JavaDebugImages.DESC_OBJS_METHOD_BREAKPOINT_ENTRY_DISABLED.getImageData();
-					}
-					x -= data.width;
-					drawImage(data, x, y);
-				}
-				if ((flags & EXIT)  != 0){
-					x= getSize().x;
-					y= getSize().y;
-					if ((flags & ENABLED) != 0) {
-						data= JavaDebugImages.DESC_OBJS_METHOD_BREAKPOINT_EXIT.getImageData();
-					} else {
-						data= JavaDebugImages.DESC_OBJS_METHOD_BREAKPOINT_EXIT_DISABLED.getImageData();
-					}
-					x -= data.width;
-					y -= data.height;
-					drawImage(data, x, y);
-				}
-			}
-		}
-	}
-	
-	protected ImageDescriptor getBaseImage() {
-		return fBaseImage;
-	}
-
-	protected void setBaseImage(ImageDescriptor baseImage) {
-		fBaseImage = baseImage;
-	}
-
-	protected int getFlags() {
-		return fFlags;
-	}
-
-	protected void setFlags(int flags) {
-		fFlags = flags;
-	}
-
-	protected void setSize(Point size) {
-		fSize = size;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
deleted file mode 100644
index c5ddb16..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDIModelPresentation.java
+++ /dev/null
@@ -1,1548 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.text.MessageFormat;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.debug.core.DebugEvent;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.DebugPlugin;

-import org.eclipse.debug.core.model.IBreakpoint;

-import org.eclipse.debug.core.model.IDisconnect;

-import org.eclipse.debug.core.model.IExpression;

-import org.eclipse.debug.core.model.IStackFrame;

-import org.eclipse.debug.core.model.ITerminate;

-import org.eclipse.debug.core.model.IThread;

-import org.eclipse.debug.core.model.IValue;

-import org.eclipse.debug.ui.DebugUITools;

-import org.eclipse.debug.ui.IDebugModelPresentation;

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.debug.ui.IValueDetailListener;

-import org.eclipse.jdt.core.IMember;

-import org.eclipse.jdt.debug.core.IEvaluationRunnable;

-import org.eclipse.jdt.debug.core.IJavaArray;

-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.IJavaMethodEntryBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaModifiers;

-import org.eclipse.jdt.debug.core.IJavaObject;

-import org.eclipse.jdt.debug.core.IJavaPatternBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;

-import org.eclipse.jdt.debug.core.IJavaStackFrame;

-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.core.IJavaValue;

-import org.eclipse.jdt.debug.core.IJavaVariable;

-import org.eclipse.jdt.debug.core.IJavaWatchpoint;

-import org.eclipse.jdt.internal.ui.JavaPlugin;

-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;

-import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;

-import org.eclipse.jdt.launching.sourcelookup.LocalFileStorage;

-import org.eclipse.jdt.launching.sourcelookup.ZipEntryStorage;

-import org.eclipse.jdt.ui.ISharedImages;

-import org.eclipse.jdt.ui.JavaElementImageDescriptor;

-import org.eclipse.jdt.ui.JavaElementLabelProvider;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.ui.IEditorDescriptor;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorRegistry;

-import org.eclipse.ui.PlatformUI;

-

-import com.sun.jdi.ObjectCollectedException;

-import com.sun.jdi.VMDisconnectedException;

-

-/**

- * @see IDebugModelPresentation

- */

-public class JDIModelPresentation extends LabelProvider implements IDebugModelPresentation {

-

-	/**

-	 * Qualified names presentation property (value <code>"org.eclipse.debug.ui.displayQualifiedNames"</code>).

-	 * When <code>DISPLAY_QUALIFIED_NAMES</code> is set to <code>True</code>,

-	 * this label provider should use fully qualified type names when rendering elements.

-	 * When set to <code>False</code>,this label provider should use simple names

-	 * when rendering elements.

-	 * @see #setAttribute(String, Object)

-	 */

-	public final static String DISPLAY_QUALIFIED_NAMES= "DISPLAY_QUALIFIED_NAMES"; //$NON-NLS-1$

-	

-	protected HashMap fAttributes= new HashMap(3);

-	

-	/**

-	 * A mapping of detail listeners (IValueDetailListener) to the values (IValue) that they

-	 * are currently expecting details from.

-	 */

-	private HashMap fRequestedValues= new HashMap();

-

-	static final Point BIG_SIZE= new Point(22, 16);

-	protected ImageDescriptorRegistry fJavaElementImageRegistry= JavaPlugin.getImageDescriptorRegistry();

-	protected org.eclipse.jdt.internal.debug.ui.ImageDescriptorRegistry fDebugImageRegistry= JDIDebugUIPlugin.getImageDescriptorRegistry();

-

-	protected static final String fgStringName= "java.lang.String"; //$NON-NLS-1$

-	

-	/**

-	 * The signature of <code>java.lang.Object#toString()</code>,

-	 * used to evaluate 'toString()' for displaying details of values.

-	 */

-	private static final String fgToStringSignature = "()Ljava/lang/String;"; //$NON-NLS-1$

-	/**

-	 * The selector of <code>java.lang.Object#toString()</code>,

-	 * used to evaluate 'toString()' for displaying details of values.

-	 */

-	private static final String fgToString = "toString"; //$NON-NLS-1$

-

-	protected JavaElementLabelProvider fJavaLabelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);

-	

-

-	public JDIModelPresentation() {

-		super();

-	}

-			

-	/**

-	 * @see IDebugModelPresentation#computeDetail(IValue, IValueDetailListener)

-	 */

-	public void computeDetail(IValue value, IValueDetailListener listener) {

-		IJavaThread thread = getEvaluationThread((IJavaDebugTarget)value.getDebugTarget());

-		try {

-			DefaultJavaValueDetailProvider detailProvider = new DefaultJavaValueDetailProvider();

-			detailProvider.computeDetail(value, thread, listener);

-		} catch (DebugException de) {

-			JDIDebugUIPlugin.log(de);

-		}

-	}

-	

-	/**

-	 * Returns a thread from the specified VM that can be

-	 * used for an evaluationm or <code>null</code> if

-	 * none.

-	 * 

-	 * @param debug target the target in which a thread is 

-	 * 	required

-	 * @return thread or <code>null</code>

-	 */

-	protected IJavaThread getEvaluationThread(IJavaDebugTarget target) {

-		IAdaptable context = DebugUITools.getDebugContext();

-		IJavaThread thread = null;

-		if (context != null) {

-			if (context instanceof IJavaStackFrame) {

-				thread = (IJavaThread)((IJavaStackFrame)context).getThread();		

-			} else if (context instanceof IJavaThread) {

-				thread = (IJavaThread)context;

-			}

-			if (thread != null && !thread.getDebugTarget().equals(target)) {

-				// can only use threads in the same target

-				thread = null;

-			}

-		}

-		if (thread == null) {

-			try {

-				IThread[] threads = target.getThreads();

-				for (int i = 0; i < threads.length; i++) {

-					if (threads[i].isSuspended()) {

-						thread = (IJavaThread)threads[i];

-						break;

-					}

-				}

-			} catch (DebugException e) {

-				JDIDebugUIPlugin.log(e);

-			}

-		}

-		return thread;

-	}

-			

-	/**

-	 * @see IDebugModelPresentation#getText(Object)

-	 */

-	public String getText(Object item) {

-		try {

-			boolean showQualified= isShowQualifiedNames();

-			if (item instanceof IJavaVariable) {

-				return getVariableText((IJavaVariable) item);

-			} else if (item instanceof IStackFrame) {

-				StringBuffer label= new StringBuffer(getStackFrameText((IStackFrame) item));

-				if (item instanceof IJavaStackFrame) {

-					if (((IJavaStackFrame)item).isOutOfSynch()) {

-						label.append(DebugUIMessages.getString("JDIModelPresentation._(out_of_synch)_1")); //$NON-NLS-1$

-					}

-				}

-				return label.toString();

-			} else if (item instanceof IMarker) {

-				IBreakpoint breakpoint = getBreakpoint((IMarker)item);

-				if (breakpoint != null) {

-					return getBreakpointText(breakpoint);

-				}

-				return null;

-			} else if (item instanceof IBreakpoint) {

-				return getBreakpointText((IBreakpoint)item);

-			} else if (item instanceof IExpression) {

-				return getExpressionText((IExpression)item);

-			} else {

-				StringBuffer label= new StringBuffer();

-				if (item instanceof IJavaThread) {

-					label.append(getThreadText((IJavaThread) item, showQualified));

-					if (((IJavaThread)item).isOutOfSynch()) {

-						label.append(DebugUIMessages.getString("JDIModelPresentation._(out_of_synch)_1")); //$NON-NLS-1$

-					} else if (((IJavaThread)item).mayBeOutOfSynch()) {

-						label.append(DebugUIMessages.getString("JDIModelPresentation._(may_be_out_of_synch)_2")); //$NON-NLS-1$

-					}

-				} else if (item instanceof IJavaDebugTarget) {

-					label.append(getDebugTargetText((IJavaDebugTarget) item, showQualified));

-					if (((IJavaDebugTarget)item).isOutOfSynch()) {

-						label.append(DebugUIMessages.getString("JDIModelPresentation._(out_of_synch)_1")); //$NON-NLS-1$

-					} else if (((IJavaDebugTarget)item).mayBeOutOfSynch()) {

-						label.append(DebugUIMessages.getString("JDIModelPresentation._(may_be_out_of_synch)_2")); //$NON-NLS-1$

-					}

-				} else if (item instanceof IJavaValue) {

-					label.append(getValueText((IJavaValue) item));

-				}

-				if (item instanceof ITerminate) {

-					if (((ITerminate) item).isTerminated()) {

-						label.insert(0, DebugUIMessages.getString("JDIModelPresentation.<terminated>_2")); //$NON-NLS-1$

-						return label.toString();

-					}

-				}

-				if (item instanceof IDisconnect) {

-					if (((IDisconnect) item).isDisconnected()) {

-						label.insert(0, DebugUIMessages.getString("JDIModelPresentation.<disconnected>_4")); //$NON-NLS-1$

-						return label.toString();

-					}

-				}

-				if (label.length() > 0) {

-					return label.toString();

-				}

-			}

-		} catch (CoreException e) {

-			if (!(e.getStatus().getException() instanceof VMDisconnectedException)) {

-				JDIDebugUIPlugin.log(e);

-			}

-			return DebugUIMessages.getString("JDIModelPresentation.<not_responding>_6"); //$NON-NLS-1$

-		}

-		return null;

-	}

-

-	protected IBreakpoint getBreakpoint(IMarker marker) {

-		return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint(marker);

-		}

-	

-	/**

-	 * Build the text for an IJavaThread.

-	 */

-	protected String getThreadText(IJavaThread thread, boolean qualified) throws CoreException {

-		if (thread.isTerminated()) {

-			if (thread.isSystemThread()) {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[({0}]_(Terminated)_7"), thread.getName()); //$NON-NLS-1$

-			} else {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[({0}]_(Terminated)_8"), thread.getName()); //$NON-NLS-1$

-			}

-		}

-		if (thread.isStepping()) {

-			if (thread.isSystemThread()) {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Stepping)_9"), thread.getName()); //$NON-NLS-1$

-			} else {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Stepping)_10"), thread.getName()); //$NON-NLS-1$

-			}

-		}

-		if (thread.isPerformingEvaluation()) {

-			if (thread.isSystemThread()) {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Evaluating)_9"), thread.getName()); //$NON-NLS-1$

-			} else {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Evaluating)_10"), thread.getName()); //$NON-NLS-1$

-			}

-		}

-		if (!thread.isSuspended()) {

-			if (thread.isSystemThread()) {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Running)_11"), thread.getName()); //$NON-NLS-1$

-			} else {

-				return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Running)_12"), thread.getName()); //$NON-NLS-1$

-			}

-		}

-		IBreakpoint[] breakpoints= thread.getBreakpoints();

-		if (breakpoints.length > 0) {

-			IJavaBreakpoint breakpoint= (IJavaBreakpoint)breakpoints[0];

-			for (int i= 0, numBreakpoints= breakpoints.length; i < numBreakpoints; i++) {

-				if (BreakpointUtils.isProblemBreakpoint(breakpoints[i])) {

-					// If a compilation error breakpoint exists, display it instead of the first breakpoint

-					breakpoint= (IJavaBreakpoint)breakpoints[i];

-					break;

-				}

-			}

-			String typeName= getMarkerTypeName(breakpoint, qualified);

-			if (BreakpointUtils.isProblemBreakpoint(breakpoint)) {

-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();

-				IMarker problem = null;

-				if (frame != null) {

-					problem = JavaDebugOptionsManager.getDefault().getProblem(frame);

-				}

-				String message = null;

-				if (problem == null) {

-					message = DebugUIMessages.getString("JDIModelPresentation.Compilation_error_1"); //$NON-NLS-1$

-				} else {

-					message = problem.getAttribute(IMarker.MESSAGE, DebugUIMessages.getString("JDIModelPresentation.Compilation_error_1")); //$NON-NLS-1$

-				}

-				if (thread.isSystemThread()) {

-					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_({1}))_2"), new String[] {thread.getName(), message}); //$NON-NLS-1$

-				} else {

-					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_({1}))_3"), new String[] {thread.getName(), message}); //$NON-NLS-1$

-				}

-			}			

-			if (breakpoint instanceof IJavaExceptionBreakpoint) {

-				String exName = ((IJavaExceptionBreakpoint)breakpoint).getExceptionTypeName();

-				if (exName == null) {

-					exName = typeName;

-				} else if (!qualified) {

-					int index = exName.lastIndexOf('.');

-					exName = exName.substring(index + 1);

-				} 

-				if (thread.isSystemThread()) {

-					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exception_{1}))_13"), new String[] {thread.getName(), exName}); //$NON-NLS-1$

-				} else {

-					return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(exception_{1}))_14"), new String[] {thread.getName(), exName}); //$NON-NLS-1$

-				}

-			}

-			if (breakpoint instanceof IJavaWatchpoint) {

-				IJavaWatchpoint wp = (IJavaWatchpoint)breakpoint;

-				String fieldName = wp.getFieldName(); //$NON-NLS-1$

-				if (wp.isAccessSuspend(thread.getDebugTarget())) {

-					if (thread.isSystemThread()) {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_16"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$

-					} else {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(access_of_field_{1}_in_{2}))_17"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$

-					}

-				} else {

-					// modification

-					if (thread.isSystemThread()) {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_18"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$

-					} else {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(modification_of_field_{1}_in_{2}))_19"), new String[] {thread.getName(), fieldName, typeName}); //$NON-NLS-1$

-					}

-				}

-			}

-			if (breakpoint instanceof IJavaMethodBreakpoint) {

-				IJavaMethodBreakpoint me= (IJavaMethodBreakpoint)breakpoint;

-				String methodName= me.getMethodName();

-				if (me.isEntrySuspend(thread.getDebugTarget())) {

-					if (thread.isSystemThread()) {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_21"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$

-					} else {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(entry_into_method_{1}_in_{2}))_22"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$

-					}

-				} else {

-					if (thread.isSystemThread()) {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_21"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$

-					} else {

-						return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(exit_of_method_{1}_in_{2}))_22"), new String[] {thread.getName(), methodName, typeName}); //$NON-NLS-1$

-					}					

-				}

-			}

-			if (breakpoint instanceof IJavaLineBreakpoint) {

-				IJavaLineBreakpoint jlbp = (IJavaLineBreakpoint)breakpoint;

-				int lineNumber= jlbp.getLineNumber();

-				if (lineNumber > -1) {

-					if (thread.isSystemThread()) {

-						if (BreakpointUtils.isRunToLineBreakpoint(jlbp)) {

-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_23"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$

-						} else {

-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_24"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$

-						}

-					} else {

-						if (BreakpointUtils.isRunToLineBreakpoint(jlbp)) {

-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(run_to_line_{1}_in_{2}))_25"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$

-						} else {

-							return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended_(breakpoint_at_line_{1}_in_{2}))_26"), new String[] {thread.getName(), String.valueOf(lineNumber), typeName}); //$NON-NLS-1$

-						}

-					}

-				}

-			}

-		}

-

-		// Otherwise, it's just suspended

-		if (thread.isSystemThread()) {

-			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.System_Thread_[{0}]_(Suspended)_27"), thread.getName()); //$NON-NLS-1$

-		} else {

-			return getFormattedString(DebugUIMessages.getString("JDIModelPresentation.Thread_[{0}]_(Suspended)_28"), thread.getName()); //$NON-NLS-1$

-		}

-	}

-

-	/**

-	 * Build the text for an IJavaDebugTarget.

-	 */

-	protected String getDebugTargetText(IJavaDebugTarget debugTarget, boolean qualified) throws DebugException {

-		String labelString= debugTarget.getName();

-		if (debugTarget.isSuspended()) {

-			labelString += DebugUIMessages.getString("JDIModelPresentation.target_suspended"); //$NON-NLS-1$

-		}

-		return labelString;

-	}

-

-	/**

-	 * Build the text for an IJavaValue.

-	 */

-	protected String getValueText(IJavaValue value) throws DebugException {

-		IPreferenceStore store= JDIDebugUIPlugin.getDefault().getPreferenceStore();

-		boolean showHexValues= store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES);		

-		boolean showCharValues= store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES);

-		boolean showUnsignedValues= store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES);

-		

-		String refTypeName= value.getReferenceTypeName();

-		String valueString= value.getValueString();

-		boolean isString= refTypeName.equals(fgStringName);

-		IJavaType type= value.getJavaType();

-		String signature= null;

-		if (type != null) {

-			signature= type.getSignature();

-		}

-		if ("V".equals(signature)) { //$NON-NLS-1$

-			valueString= DebugUIMessages.getString("JDIModelPresentation.(No_explicit_return_value)_30"); //$NON-NLS-1$

-		}

-		boolean isObject= isObjectValue(signature);

-		boolean isArray= value instanceof IJavaArray;

-		StringBuffer buffer= new StringBuffer();

-		// Always show type name for objects & arrays (but not Strings)

-		if ((isObject || isArray) && !isString && (refTypeName.length() > 0)) {

-			String qualTypeName= getQualifiedName(refTypeName);

-			if (isArray) {

-				qualTypeName= adjustTypeNameForArrayIndex(qualTypeName, ((IJavaArray)value).getLength());

-			}

-			buffer.append(qualTypeName);

-			buffer.append(' ');

-		}

-		

-		// Put double quotes around Strings

-		if (valueString != null && (isString || valueString.length() > 0)) {

-			if (isString) {

-				buffer.append('"');

-			}

-			buffer.append(valueString);

-			if (isString) {

-				buffer.append('"');

-			}

-		}

-		

-		// show unsigned value second, if applicable

-		if (showUnsignedValues) {

-			buffer= appendUnsignedText(value, buffer);

-		}

-		// show hex value third, if applicable

-		if (showHexValues) {

-			buffer= appendHexText(value, buffer);

-		}

-		// show byte character value last, if applicable

-		if (showCharValues) {

-			buffer= appendCharText(value, buffer);

-		}

-		

-		return buffer.toString();

-	}

-	

-

-	private StringBuffer appendUnsignedText(IJavaValue value, StringBuffer buffer) throws DebugException {

-		String unsignedText= getValueUnsignedText(value);

-		if (unsignedText != null) {

-			buffer.append(" ["); //$NON-NLS-1$

-			buffer.append(unsignedText);

-			buffer.append("]"); //$NON-NLS-1$

-		}

-		return buffer;	

-	}

-		

-	private StringBuffer appendHexText(IJavaValue value, StringBuffer buffer) throws DebugException {

-		String hexText = getValueHexText(value);

-		if (hexText != null) {

-			buffer.append(" ["); //$NON-NLS-1$

-			buffer.append(hexText);

-			buffer.append("]"); //$NON-NLS-1$

-		}		

-		return buffer;

-	}

-	

-	private StringBuffer appendCharText(IJavaValue value, StringBuffer buffer) throws DebugException {

-		String charText= getValueCharText(value);

-		if (charText != null) {

-			buffer.append(" ["); //$NON-NLS-1$

-			buffer.append(charText);

-			buffer.append("]"); //$NON-NLS-1$

-		}		

-		return buffer;

-	}

-	

-	/**

-	 * Given a JNI-style signature String for a IJavaValue, return true

-	 * if the signature represents an Object or an array of Objects.

-	 */

-	protected boolean isObjectValue(String signature) {

-		if (signature == null) {

-			return false;

-		}

-		char sigChar= ' ';

-		for (int i= 0; i < signature.length(); i++) {

-			sigChar= signature.charAt(i);

-			if (sigChar == '[') {

-				continue;

-			}

-			break;

-		}

-		if ((sigChar == 'L') || (sigChar == 'Q')) {

-			return true;

-		}

-		return false;

-	}

-	

-	/**

-	 * Given a JNI-style signature String for a IJavaValue, return true

-	 * if the signature represents a ByteValue

-	 */

-	protected boolean isByteValue(String signature) {

-		if (signature == null) {

-			return false;

-		}

-		return signature.equals("B"); //$NON-NLS-1$

-	}

-	

-	/**

-	 * Returns the type signature for this value if its type is primitive.  

-	 * For non-primitive types, null is returned.

-	 */

-	protected String getPrimitiveValueTypeSignature(IJavaValue value) throws DebugException {

-		IJavaType type= value.getJavaType();

-		if (type != null) {

-			String sig= type.getSignature();

-			if (sig != null || sig.length() == 1) {

-				return sig;

-			}

-		}

-		return null;

-	}

-	/**

-	 * Returns the character string of a byte or <code>null</code if

-	 * the value can not be interpreted as a valid character.

-	 */

-	protected String getValueCharText(IJavaValue value) throws DebugException {

-		String sig= getPrimitiveValueTypeSignature(value);

-		if (sig == null) {

-			return null;

-		}

-		String valueString= value.getValueString();

-		int intValue= 0;	

-		switch (sig.charAt(0)) {

-			case 'B' : // byte

-				intValue= Integer.parseInt(valueString);

-				intValue= intValue & 0xFF; // Only lower 8 bits

-				break;

-			case 'I' : // int

-				intValue= Integer.parseInt(valueString);

-				if (intValue > 255 || intValue < 0) {

-					return null;

-				}

-				break;

-			case 'S' : // short

-				intValue= Integer.parseInt(valueString);

-				if (intValue > 255 || intValue < 0) {

-					return null;

-				}

-				break;

-			case 'J' :

-				long longValue= Long.parseLong(valueString);

-				if (longValue > 255 || longValue < 0) {

-					// Out of character range

-					return null;

-				}

-				intValue= (int) longValue;

-				break;

-			default :

-				return null;

-		};

-		StringBuffer charText = new StringBuffer();

-		if (Character.getType((char) intValue) == Character.CONTROL) {

-			Character ctrl = new Character((char) (intValue + 64));

-			charText.append('^'); //$NON-NLS-1$

-			charText.append(ctrl);

-			switch (intValue) { // common use

-				case 0: charText.append(" (NUL)"); break; //$NON-NLS-1$

-				case 8: charText.append(" (BS)"); break; //$NON-NLS-1$

-				case 9: charText.append(" (TAB)"); break; //$NON-NLS-1$

-				case 10: charText.append(" (LF)"); break; //$NON-NLS-1$

-				case 13: charText.append(" (CR)"); break; //$NON-NLS-1$

-				case 21: charText.append(" (NL)"); break; //$NON-NLS-1$

-				case 27: charText.append(" (ESC)"); break; //$NON-NLS-1$

-				case 127: charText.append(" (DEL)"); break; //$NON-NLS-1$

-			}

-		} else {

-			charText.append(new Character((char)intValue));

-		}

-		return charText.toString();

-	}

-

-	protected String getMarkerTypeName(IJavaBreakpoint breakpoint, boolean qualified) throws CoreException {

-		String typeName= null;

-		if (breakpoint instanceof IJavaPatternBreakpoint) {

-			typeName = breakpoint.getMarker().getResource().getName();

-		} else {

-			typeName = breakpoint.getTypeName();

-		}

-		if (!qualified) {

-			int index= typeName.lastIndexOf('.');

-			if (index != -1) {

-				typeName= typeName.substring(index + 1);

-			}

-		}

-		return typeName;

-	}

-

-	/**

-	 * Maps a Java element to an appropriate image.

-	 * 

-	 * @see IDebugModelPresentation#getImage(Object)

-	 */

-	public Image getImage(Object item) {

-		try {

-			if (item instanceof IJavaVariable) {

-				return getVariableImage((IAdaptable) item);

-			}

-			if (item instanceof IMarker) {

-				IBreakpoint bp = getBreakpoint((IMarker)item);

-				if (bp != null && bp instanceof IJavaBreakpoint) {

-					return getBreakpointImage((IJavaBreakpoint)bp);

-				}

-			}

-			if (item instanceof IJavaBreakpoint) {

-				return getBreakpointImage((IJavaBreakpoint)item);

-			}

-			if (item instanceof IJavaStackFrame || item instanceof IJavaThread || item instanceof IJavaDebugTarget) {

-				return getDebugElementImage(item);

-			}

-		} catch (CoreException e) {

-			if (!(e.getStatus().getException() instanceof VMDisconnectedException)) {

-				JDIDebugUIPlugin.log(e);

-			}

-		}

-		return null;

-	}

-

-	protected Image getBreakpointImage(IJavaBreakpoint breakpoint) throws CoreException {

-		if (breakpoint instanceof IJavaExceptionBreakpoint) {

-			return getExceptionBreakpointImage((IJavaExceptionBreakpoint)breakpoint);

-		} 

-		

-		if (breakpoint instanceof IJavaLineBreakpoint && BreakpointUtils.isRunToLineBreakpoint((IJavaLineBreakpoint)breakpoint)) {

-			return null;

-		} else {

-			return getJavaBreakpointImage(breakpoint);

-		}

-	}

-

-	protected Image getExceptionBreakpointImage(IJavaExceptionBreakpoint exception) throws CoreException {

-		int flags= computeBreakpointAdornmentFlags(exception);

-		JDIImageDescriptor descriptor= null;

-		if ((flags & JDIImageDescriptor.ENABLED) == 0) {

-			descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_EXCEPTION_DISABLED, flags);

-		} else if (exception.isChecked()) {

-			descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_EXCEPTION, flags);

-		} else {

-			descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_ERROR, flags);

-		}

-		return fDebugImageRegistry.get(descriptor);

-	}

-

-	protected Image getJavaBreakpointImage(IJavaBreakpoint breakpoint) throws CoreException {

-		if (breakpoint instanceof IJavaMethodBreakpoint) {

-			IJavaMethodBreakpoint mBreakpoint= (IJavaMethodBreakpoint)breakpoint;

-			return getJavaMethodBreakpointImage(mBreakpoint);

-		} else if (breakpoint instanceof IJavaWatchpoint) {

-			IJavaWatchpoint watchpoint= (IJavaWatchpoint)breakpoint;

-			return getJavaWatchpointImage(watchpoint);

-		} else if (breakpoint instanceof IJavaMethodEntryBreakpoint) {

-			IJavaMethodEntryBreakpoint meBreakpoint = (IJavaMethodEntryBreakpoint)breakpoint;

-			return getJavaMethodEntryBreakpointImage(meBreakpoint);

-		} else {

-			int flags= computeBreakpointAdornmentFlags(breakpoint);

-			JDIImageDescriptor descriptor= null;

-			if (breakpoint.isEnabled()) {

-				descriptor= new JDIImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_BREAKPOINT), flags);

-			} else {

-				descriptor= new JDIImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_BREAKPOINT_DISABLED), flags);

-			}

-			return fDebugImageRegistry.get(descriptor);

-		}

-	}

-

-	protected Image getJavaMethodBreakpointImage(IJavaMethodBreakpoint mBreakpoint) throws CoreException {

-		int flags= computeBreakpointAdornmentFlags(mBreakpoint);

-		JDIImageDescriptor descriptor= null;

-		if (mBreakpoint.isEnabled()) {

-			descriptor= new JDIImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_BREAKPOINT), flags);

-		} else {

-			descriptor= new JDIImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_BREAKPOINT_DISABLED), flags);

-		}

-			

-		return fDebugImageRegistry.get(descriptor);

-	}

-	

-	protected Image getJavaMethodEntryBreakpointImage(IJavaMethodEntryBreakpoint mBreakpoint) throws CoreException {

-		int flags= computeBreakpointAdornmentFlags(mBreakpoint);

-		JDIImageDescriptor descriptor= null;

-		if (mBreakpoint.isEnabled()) {

-			descriptor= new JDIImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_BREAKPOINT), flags);

-		} else {

-			descriptor= new JDIImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_BREAKPOINT_DISABLED), flags);

-		}

-			

-		return fDebugImageRegistry.get(descriptor);

-	}	

-	

-	protected Image getJavaWatchpointImage(IJavaWatchpoint watchpoint) throws CoreException {

-		int flags= computeBreakpointAdornmentFlags(watchpoint);

-		JDIImageDescriptor descriptor= null;

-		boolean enabled= (flags & JDIImageDescriptor.ENABLED) != 0;

-		if (watchpoint.isAccess()) {

-			if (watchpoint.isModification()) {

-				//access and modification

-				if (enabled) {

-					descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_WATCHPOINT_ENABLED, flags);

-				} else {

-					descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_WATCHPOINT_DISABLED, flags);

-				}

-			} else {

-				if (enabled) {

-					descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_ACCESS_WATCHPOINT_ENABLED, flags);

-				} else {

-					descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_ACCESS_WATCHPOINT_DISABLED, flags);

-				}

-			}

-		} else if (watchpoint.isModification()) {

-			if (enabled) {

-				descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_MODIFICATION_WATCHPOINT_ENABLED, flags);

-			} else {

-				descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_MODIFICATION_WATCHPOINT_DISABLED, flags);

-			}

-		} else {

-			//neither access nor modification

-			descriptor= new JDIImageDescriptor(JavaDebugImages.DESC_OBJS_WATCHPOINT_DISABLED, flags);

-		}

-		return fDebugImageRegistry.get(descriptor);

-	}

-	

-	protected Image getVariableImage(IAdaptable element) {

-		JavaElementImageDescriptor descriptor= new JavaElementImageDescriptor(

-			computeBaseImageDescriptor(element), computeAdornmentFlags(element), BIG_SIZE);

-

-		return fJavaElementImageRegistry.get(descriptor);			

-	}

-	

-	/**

-	 * Returns the image associated with the given element or <code>null</code>

-	 * if none is defined.

-	 */

-	protected Image getDebugElementImage(Object element) {

-		ImageDescriptor image= null;

-		if (element instanceof IJavaThread) {

-			IJavaThread thread = (IJavaThread)element;

-			if (thread.isSuspended() && !thread.isPerformingEvaluation()) {

-				image= DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED);

-			} else if (thread.isTerminated()) {

-				image= DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED);

-			} else {

-				image= DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING);

-			}

-		} else {

-			image= DebugUITools.getDefaultImageDescriptor(element);

-		}

-		if (image == null) {

-			return null;

-		}

-		int flags= computeJDIAdornmentFlags(element);

-		JDIImageDescriptor descriptor= new JDIImageDescriptor(image, flags);

-		return fDebugImageRegistry.get(descriptor);

-	}

-	

-	/**

-	 * Returns the adornment flags for the given element.

-	 * These flags are used to render appropriate overlay

-	 * icons for the element.

-	 */

-	private int computeJDIAdornmentFlags(Object element) {

-		try {

-			if (element instanceof IJavaStackFrame) {

-				if (((IJavaStackFrame)element).isOutOfSynch()) {

-					return JDIImageDescriptor.IS_OUT_OF_SYNCH;

-				}

-			}

-			if (element instanceof IJavaThread) {

-				if (((IJavaThread)element).isOutOfSynch()) {

-					return JDIImageDescriptor.IS_OUT_OF_SYNCH;

-				}

-				if (((IJavaThread)element).mayBeOutOfSynch()) {

-					return JDIImageDescriptor.MAY_BE_OUT_OF_SYNCH;

-				}

-			}

-			if (element instanceof IJavaDebugTarget) {

-				if (((IJavaDebugTarget)element).isOutOfSynch()) {

-					return JDIImageDescriptor.IS_OUT_OF_SYNCH;

-				}

-				if (((IJavaDebugTarget)element).mayBeOutOfSynch()) {

-					return JDIImageDescriptor.MAY_BE_OUT_OF_SYNCH;

-				}

-			}

-		} catch (DebugException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return 0;

-	}

-	

-	/**

-	 * Returns the adornment flags for the given breakpoint.

-	 * These flags are used to render appropriate overlay

-	 * icons for the breakpoint.

-	 */

-	private int computeBreakpointAdornmentFlags(IJavaBreakpoint breakpoint)  {

-		int flags= 0;

-		try {

-			if (breakpoint.isEnabled()) {

-				flags |= JDIImageDescriptor.ENABLED;

-			}

-			if (breakpoint.isInstalled()) {

-				flags |= JDIImageDescriptor.INSTALLED;

-			}

-			if (breakpoint instanceof IJavaLineBreakpoint) {

-				if (((IJavaLineBreakpoint)breakpoint).isConditionEnabled()) {

-					flags |= JDIImageDescriptor.CONDITIONAL;

-				}

-				if (breakpoint instanceof IJavaMethodBreakpoint) {

-					IJavaMethodBreakpoint mBreakpoint= (IJavaMethodBreakpoint)breakpoint;

-					if (mBreakpoint.isEntry()) {

-						flags |= JDIImageDescriptor.ENTRY;

-					}

-					if (mBreakpoint.isExit()) {

-						flags |= JDIImageDescriptor.EXIT;

-					}

-				}

-				if (breakpoint instanceof IJavaMethodEntryBreakpoint) {

-					flags |= JDIImageDescriptor.ENTRY;

-				}

-			} else if (breakpoint instanceof IJavaExceptionBreakpoint) {

-				IJavaExceptionBreakpoint eBreakpoint= (IJavaExceptionBreakpoint)breakpoint;

-				if (eBreakpoint.isCaught()) {

-					flags |= JDIImageDescriptor.CAUGHT;

-				}

-				if (eBreakpoint.isUncaught()) {

-					flags |= JDIImageDescriptor.UNCAUGHT;

-				}

-				if (eBreakpoint.getFilters().length > 0) {

-					flags |= JDIImageDescriptor.SCOPED;

-				}

-			}

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return flags;

-	}

-	

-	private ImageDescriptor computeBaseImageDescriptor(IAdaptable element) {

-		IJavaVariable javaVariable= (IJavaVariable) element.getAdapter(IJavaVariable.class);

-		if (javaVariable != null) {

-			try {

-				if (javaVariable.isPublic())

-					return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_PUBLIC);

-				if (javaVariable.isProtected())

-					return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_PROTECTED);

-				if (javaVariable.isPrivate())

-					return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_PRIVATE);

-			} catch (DebugException e) {

-				JDIDebugUIPlugin.log(e);

-			}

-		}

-		return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_DEFAULT);

-	}

-	

-	private int computeAdornmentFlags(IAdaptable element) {

-		int flags= 0;

-		IJavaModifiers javaProperties= (IJavaModifiers)element.getAdapter(IJavaModifiers.class);

-		try {

-			if (javaProperties != null) {

-				if (javaProperties.isFinal()) {

-					flags |= JavaElementImageDescriptor.FINAL;

-				}

-				if (javaProperties.isStatic()) {

-					flags |= JavaElementImageDescriptor.STATIC;

-				}

-			}

-		} catch(DebugException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return flags;

-	}

-

-	/**

-	 * @see IDebugModelPresentation#getEditorInput(Object)

-	 */

-	public IEditorInput getEditorInput(Object item) {

-		try {

-			if (item instanceof IMarker) {

-				item = getBreakpoint((IMarker)item);

-			}

-			if (item instanceof IJavaPatternBreakpoint || item instanceof IJavaTargetPatternBreakpoint) {

-				item = ((IJavaBreakpoint)item).getMarker().getResource();

-			} else if (item instanceof IJavaBreakpoint) {

-				item= BreakpointUtils.getType((IJavaBreakpoint)item);

-			}

-			if (item instanceof LocalFileStorage) {

-				return new LocalFileStorageEditorInput((LocalFileStorage)item);

-			}

-			if (item instanceof ZipEntryStorage) {

-				return new ZipEntryStorageEditorInput((ZipEntryStorage)item);

-			}

-			return EditorUtility.getEditorInput(item);

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-			return null;

-		}

-	}

-

-	/**

-	 * @see IDebugModelPresentation#getEditorId(IEditorInput, Object)

-	 */

-	public String getEditorId(IEditorInput input, Object inputObject) {

-		IEditorRegistry registry= PlatformUI.getWorkbench().getEditorRegistry();

-		IEditorDescriptor descriptor= registry.getDefaultEditor(input.getName());

-		if (descriptor != null)

-			return descriptor.getId();

-		

-		return null;

-	}

-

-	/**

-	 * @see IDebugModelPresentation#setAttribute(String, Object)

-	 */

-	public void setAttribute(String id, Object value) {

-		if (value == null) {

-			return;

-		}

-		fAttributes.put(id, value);

-	}

-

-	protected boolean isShowQualifiedNames() {

-		Boolean showQualified= (Boolean) fAttributes.get(DISPLAY_QUALIFIED_NAMES);

-		showQualified= showQualified == null ? Boolean.FALSE : showQualified;

-		return showQualified.booleanValue();

-	}

-

-	protected boolean isShowVariableTypeNames() {

-		Boolean show= (Boolean) fAttributes.get(DISPLAY_VARIABLE_TYPE_NAMES);

-		show= show == null ? Boolean.FALSE : show;

-		return show.booleanValue();

-	}

-

-	protected String getVariableText(IJavaVariable var) {

-		String varLabel= DebugUIMessages.getString("JDIModelPresentation<unknown_name>_1"); //$NON-NLS-1$

-		try {

-			varLabel= var.getName();

-		} catch (DebugException exception) {

-		}

-		boolean showTypes= isShowVariableTypeNames();

-		int spaceIndex= varLabel.lastIndexOf(' ');

-		StringBuffer buff= new StringBuffer();

-		String typeName= DebugUIMessages.getString("JDIModelPresentation<unknown_type>_2"); //$NON-NLS-1$

-		try {

-			typeName= var.getReferenceTypeName();

-			if (showTypes && spaceIndex == -1) {

-				typeName= getQualifiedName(typeName);

-			}

-		} catch (DebugException exception) {

-		}

-		if (showTypes) {

-			buff.append(typeName);

-			buff.append(' ');

-		}

-		if (spaceIndex != -1 && !showTypes) {

-			varLabel= varLabel.substring(spaceIndex + 1);

-		}

-		buff.append(varLabel);

-

-		String valueString= DebugUIMessages.getString("JDIModelPresentation<unknown_value>_3"); //$NON-NLS-1$

-		try {

-			IJavaValue javaValue= (IJavaValue) var.getValue();

-			valueString= getValueText(javaValue);

-		} catch (DebugException exception) {

-		}

-		buff.append("= "); //$NON-NLS-1$

-		buff.append(valueString);

-		return buff.toString();

-	}

-	

-	protected String getExpressionText(IExpression expression) throws DebugException {

-		String label= '"' + expression.getExpressionText() + '"';

-		if (label != null) {

-			boolean showTypes= isShowVariableTypeNames();

-			StringBuffer buff= new StringBuffer();

-			IJavaValue javaValue= (IJavaValue) expression.getValue();

-			String typeName=null;

-			try {

-				typeName= javaValue.getReferenceTypeName();

-			} catch (DebugException exception) {

-				// ObjectCollectedException is an expected exception which will

-				// occur if the inspected object has been garbage collected.

-				if (exception.getStatus().getException() instanceof ObjectCollectedException) {

-					return DebugUIMessages.getString("JDIModelPresentation.<garbage_collected_object>_6"); //$NON-NLS-1$

-				} else {

-					throw exception;

-				}

-			}

-			if (showTypes ) {

-				typeName= getQualifiedName(typeName);

-				if (typeName.length() > 0) {

-					buff.append(typeName);

-					buff.append(' ');

-				}

-			}

-			buff.append(label);

-

-			String valueString= getValueText(javaValue);

-			if (valueString.length() > 0) {

-				buff.append("= "); //$NON-NLS-1$

-				buff.append(valueString);

-			}

-			return buff.toString();

-		}

-		return ""; //$NON-NLS-1$ 

-	}	

-

-	/**

-	 * Given the reference type name of an array type, insert the array length

-	 * in between the '[]' for the first dimension and return the result.

-	 */

-	protected String adjustTypeNameForArrayIndex(String typeName, int arrayIndex) {

-		int firstBracket= typeName.indexOf("[]"); //$NON-NLS-1$

-		if (firstBracket < 0) {

-			return typeName;

-		}

-		StringBuffer buffer= new StringBuffer(typeName);

-		buffer.insert(firstBracket + 1, Integer.toString(arrayIndex));

-		return buffer.toString();

-	}

-	

-	protected String getValueUnsignedText(IJavaValue value) throws DebugException {

-		String sig= getPrimitiveValueTypeSignature(value);

-		if (sig == null) {

-			return null;

-		}

-

-		switch (sig.charAt(0)) {

-			case 'B' : // byte

-				int byteVal= Integer.parseInt(value.getValueString());

-				if (byteVal < 0) {

-					byteVal = byteVal & 0xFF;

-					return Integer.toString(byteVal);					

-				}

-			default :

-				return null;

-		}

-	}

-

-	protected String getValueHexText(IJavaValue value) throws DebugException {

-		String sig= getPrimitiveValueTypeSignature(value);

-		if (sig == null) {

-			return null;

-		}

-

-		StringBuffer buff= new StringBuffer();

-		switch (sig.charAt(0)) {

-			case 'B' :

-				buff.append("0x"); //$NON-NLS-1$

-				int byteVal = Integer.parseInt(value.getValueString());

-				byteVal = byteVal & 0xFF;

-				buff.append(Integer.toHexString(byteVal));

-				break;

-			case 'I' :

-				buff.append("0x"); //$NON-NLS-1$

-				buff.append(Integer.toHexString(Integer.parseInt(value.getValueString())));

-				break;			

-			case 'S' :

-				buff.append("0x"); //$NON-NLS-1$

-				int shortVal = Integer.parseInt(value.getValueString());

-				shortVal = shortVal & 0xFFFF;

-				buff.append(Integer.toHexString(shortVal));

-				break;

-			case 'J' :

-				buff.append("0x"); //$NON-NLS-1$

-				buff.append(Long.toHexString(Long.parseLong(value.getValueString())));

-				break;

-			case 'C' :

-				buff.append("\\u"); //$NON-NLS-1$

-				String hexString= Integer.toHexString(value.getValueString().charAt(0));

-				int length= hexString.length();

-				while (length < 4) {

-					buff.append('0');

-					length++;

-				}

-				buff.append(hexString);

-				break;

-			default:

-				return null;

-		}

-		return buff.toString();

-	}

-

-	protected String getBreakpointText(IBreakpoint breakpoint) throws CoreException {

-

-		if (breakpoint instanceof IJavaExceptionBreakpoint) {

-			return getExceptionBreakpointText((IJavaExceptionBreakpoint)breakpoint);

-		}

-		if (breakpoint instanceof IJavaWatchpoint) {

-			return getWatchpointText((IJavaWatchpoint)breakpoint);

-		} else if (breakpoint instanceof IJavaPatternBreakpoint) {

-			return getJavaPatternBreakpointText((IJavaPatternBreakpoint)breakpoint);

-		} else if (breakpoint instanceof IJavaTargetPatternBreakpoint) {

-			return getJavaTargetPatternBreakpointText((IJavaTargetPatternBreakpoint)breakpoint);

-		} else if (breakpoint instanceof IJavaLineBreakpoint) {

-			return getLineBreakpointText((IJavaLineBreakpoint)breakpoint);

-		}

-

-		return ""; //$NON-NLS-1$

-	}

-

-	protected String getExceptionBreakpointText(IJavaExceptionBreakpoint breakpoint) throws CoreException {

-		StringBuffer buffer = new StringBuffer();

-		String typeName = breakpoint.getTypeName();

-		buffer.append(getQualifiedName(typeName));

-		appendHitCount(breakpoint, buffer);

-		appendSuspendPolicy(breakpoint, buffer);

-		appendThreadFilter(breakpoint, buffer);

-		if (breakpoint.getFilters().length > 0) {

-			buffer.append(DebugUIMessages.getString("JDIModelPresentation._[scoped]_1")); //$NON-NLS-1$

-		}

-		String state= null;

-		boolean c= breakpoint.isCaught();

-		boolean u= breakpoint.isUncaught();

-		if (c && u) {

-			state= DebugUIMessages.getString("JDIModelPresentation.caught_and_uncaught_60"); //$NON-NLS-1$

-		} else if (c) {

-			state= DebugUIMessages.getString("JDIModelPresentation.caught_61"); //$NON-NLS-1$

-		} else if (u) {

-			state= DebugUIMessages.getString("JDIModelPresentation.uncaught_62"); //$NON-NLS-1$

-		}

-		String label= null;

-		if (state == null) {

-			label= buffer.toString();

-		} else {

-			String format= DebugUIMessages.getString("JDIModelPresentation.{1}__{0}_63"); //$NON-NLS-1$

-			label= MessageFormat.format(format, new Object[] {state, buffer});

-		}

-		return label;

-	}

-

-	protected String getLineBreakpointText(IJavaLineBreakpoint breakpoint) throws CoreException {

-

-		String typeName= breakpoint.getTypeName();

-		IMember member= BreakpointUtils.getMember(breakpoint);

-		StringBuffer label= new StringBuffer();

-		label.append(getQualifiedName(typeName));

-		appendLineNumber(breakpoint, label);

-		appendHitCount(breakpoint, label);

-		appendSuspendPolicy(breakpoint,label);

-		appendThreadFilter(breakpoint, label);

-		appendConditional(breakpoint, label);

-		

-		if (breakpoint instanceof IJavaMethodBreakpoint) {

-			IJavaMethodBreakpoint mbp = (IJavaMethodBreakpoint)breakpoint;

-			boolean entry = mbp.isEntry();

-			boolean exit = mbp.isExit();

-			if (entry && exit) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation.entry_and_exit")); //$NON-NLS-1$

-			} else if (entry) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation.entry")); //$NON-NLS-1$

-			} else if (exit) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation.exit")); //$NON-NLS-1$

-			}

-		}

-					

-		if (member != null) {

-			label.append(" - "); //$NON-NLS-1$

-			label.append(fJavaLabelProvider.getText(member));

-		}

-		

-		return label.toString();

-	}

-	

-	protected StringBuffer appendLineNumber(IJavaLineBreakpoint breakpoint, StringBuffer label) throws CoreException {

-		int lineNumber= breakpoint.getLineNumber();

-		if (lineNumber > 0) {

-			label.append(" ["); //$NON-NLS-1$

-			label.append(DebugUIMessages.getString("JDIModelPresentation.line__65")); //$NON-NLS-1$

-			label.append(' ');

-			label.append(lineNumber);

-			label.append(']');

-

-		}

-		return label;

-	}

-	

-	protected StringBuffer appendHitCount(IJavaBreakpoint breakpoint, StringBuffer label) throws CoreException {

-		int hitCount= breakpoint.getHitCount();

-		if (hitCount > 0) {

-			label.append(" ["); //$NON-NLS-1$

-			label.append(DebugUIMessages.getString("JDIModelPresentation.hit_count__67")); //$NON-NLS-1$

-			label.append(' ');

-			label.append(hitCount);

-			label.append(']');

-		}

-		return label;

-	}

-	

-	protected String getJavaPatternBreakpointText(IJavaPatternBreakpoint breakpoint) throws CoreException {

-	

-		IResource resource= breakpoint.getMarker().getResource();

-		IMember member= BreakpointUtils.getMember(breakpoint);

-		StringBuffer label= new StringBuffer(resource.getName());

-		appendLineNumber(breakpoint, label);

-		appendHitCount(breakpoint, label);

-		appendSuspendPolicy(breakpoint,label);

-		appendThreadFilter(breakpoint, label);

-					

-		if (member != null) {

-			label.append(" - "); //$NON-NLS-1$

-			label.append(fJavaLabelProvider.getText(member));

-		}

-		

-		return label.toString();

-	}

-

-	protected String getJavaTargetPatternBreakpointText(IJavaTargetPatternBreakpoint breakpoint) throws CoreException {

-		IMember member= BreakpointUtils.getMember(breakpoint);

-		StringBuffer label= new StringBuffer(breakpoint.getSourceName());

-		appendLineNumber(breakpoint, label);

-		appendHitCount(breakpoint, label);

-		appendSuspendPolicy(breakpoint,label);

-		appendThreadFilter(breakpoint, label);

-					

-		if (member != null) {

-			label.append(" - "); //$NON-NLS-1$

-			label.append(fJavaLabelProvider.getText(member));

-		}

-		

-		return label.toString();

-	}

-		

-	protected String getWatchpointText(IJavaWatchpoint watchpoint) throws CoreException {

-		

-		String lineInfo= getLineBreakpointText(watchpoint);

-		String state= null;

-		boolean access= watchpoint.isAccess();

-		boolean modification= watchpoint.isModification();

-		if (access && modification) {

-			state= DebugUIMessages.getString("JDIModelPresentation.access_and_modification_70"); //$NON-NLS-1$

-		} else if (access) {

-			state= DebugUIMessages.getString("JDIModelPresentation.access_71"); //$NON-NLS-1$

-		} else if (modification) {

-			state= DebugUIMessages.getString("JDIModelPresentation.modification_72"); //$NON-NLS-1$

-		}		

-		String label= null;

-		if (state == null) {

-			label= lineInfo;

-		} else {

-			String format= DebugUIMessages.getString("JDIModelPresentation.{1}__{0}_73"); //$NON-NLS-1$

-			label= MessageFormat.format(format, new Object[] {state, lineInfo});

-		}

-		return label;	

-	}	

-

-	protected String getStackFrameText(IStackFrame stackFrame) throws DebugException {

-		IJavaStackFrame frame= (IJavaStackFrame) stackFrame.getAdapter(IJavaStackFrame.class);

-		if (frame != null) {

-			StringBuffer label= new StringBuffer();

-			

-			String dec= DebugUIMessages.getString("JDIModelPresentation<unknown_declaring_type>_4"); //$NON-NLS-1$

-			try {

-				dec= frame.getDeclaringTypeName();

-			} catch (DebugException exception) {

-			}

-			if (frame.isObsolete()) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation.<obsolete_method_in__1")); //$NON-NLS-1$

-				label.append(dec);

-				label.append('>');

-				return label.toString();

-			}

-

-			// receiver name

-			String rec= DebugUIMessages.getString("JDIModelPresentation<unknown_receiving_type>_5"); //$NON-NLS-1$

-			try {

-				rec= frame.getReceivingTypeName();

-			} catch (DebugException exception) {

-			}

-			label.append(getQualifiedName(rec));

-

-			// append declaring type name if different

-			if (!dec.equals(rec)) {

-				label.append('(');

-				label.append(getQualifiedName(dec));

-				label.append(')');

-			}

-

-			// append a dot separator and method name

-			label.append('.');

-			try {

-				label.append(frame.getMethodName());

-			} catch (DebugException exception) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation<unknown_method_name>_6")); //$NON-NLS-1$

-			}

-

-			try {

-				List args= frame.getArgumentTypeNames();

-				if (args.isEmpty()) {

-					label.append("()"); //$NON-NLS-1$

-				} else {

-					label.append('(');

-					Iterator iter= args.iterator();

-					while (iter.hasNext()) {

-						label.append(getQualifiedName((String) iter.next()));

-						if (iter.hasNext()) {

-							label.append(", "); //$NON-NLS-1$

-						}

-					}

-					label.append(')');

-				}

-			} catch (DebugException exception) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation(<unknown_arguements>)_7")); //$NON-NLS-1$

-			}

-

-			try {

-				int lineNumber= frame.getLineNumber();

-				label.append(' ');

-				label.append(DebugUIMessages.getString("JDIModelPresentation.line__76")); //$NON-NLS-1$

-				label.append(' ');

-				if (lineNumber >= 0) {

-					label.append(lineNumber);

-				} else {

-					label.append(DebugUIMessages.getString("JDIModelPresentation.not_available")); //$NON-NLS-1$

-					if (frame.isNative()) {

-						label.append(' ');

-						label.append(DebugUIMessages.getString("JDIModelPresentation.native_method")); //$NON-NLS-1$

-					}

-				}

-			} catch (DebugException exception) {

-				label.append(DebugUIMessages.getString("JDIModelPresentation_<unknown_line_number>_8")); //$NON-NLS-1$

-			}

-			

-			if (!frame.wereLocalsAvailable()) {

-				label.append(' ');

-				label.append(DebugUIMessages.getString("JDIModelPresentation.local_variables_unavailable")); //$NON-NLS-1$

-			}

-			

-			return label.toString();

-

-		}

-		return null;

-	}

-

-	protected String getQualifiedName(String qualifiedName) {

-		if (!isShowQualifiedNames()) {

-			int index= qualifiedName.lastIndexOf('.');

-			if (index >= 0) {

-				return qualifiedName.substring(index + 1);

-			}

-		}

-		return qualifiedName;

-	}

-

-	/**

-	 * Plug in the single argument to the resource String for the key to get a formatted resource String

-	 */

-	public static String getFormattedString(String key, String arg) {

-		return getFormattedString(key, new String[] {arg});

-	}

-

-	/**

-	 * Plug in the arguments to the resource String for the key to get a formatted resource String

-	 */

-	public static String getFormattedString(String string, String[] args) {

-		return MessageFormat.format(string, args);

-	}

-	

-	interface IValueDetailProvider {

-		public void computeDetail(IValue value, IJavaThread thread, IValueDetailListener listener) throws DebugException;

-	}

-	

-	class DefaultJavaValueDetailProvider implements IValueDetailProvider {		

-		private StringBuffer fResultBuffer;

-		private Thread fDetailThread;

-		private IValue fValue;

-		private IValueDetailListener fListener;

-		private static final int EVAL_TIMEOUT = 3000;

-		

-		public DefaultJavaValueDetailProvider() {

-			fResultBuffer = new StringBuffer(50);

-		}

-		

-		private void notifyListener() {

-			fListener.detailComputed(fValue, fResultBuffer.toString());

-		}

-		

-		public void computeDetail(final IValue value, final IJavaThread thread, final IValueDetailListener listener) throws DebugException {

-			

-			fValue = value;

-			fListener = listener;

-			

-			if (value == null) {

-				// no need to spawn a thread for a null value

-				fResultBuffer.append(DebugUIMessages.getString("JDIModelPresentation.null_78")); //$NON-NLS-1$

-				notifyListener();

-				return;

-			} else if (value instanceof IJavaPrimitiveValue) {

-				// no need to spawn a thread for a primitive value

-				appendJDIValueString(value);

-				notifyListener();

-				return;

-			} else if (thread == null || !thread.isSuspended()) {

-				// no thread available

-				fResultBuffer = new StringBuffer(DebugUIMessages.getString("JDIModelPresentation.no_suspended_threads_1")); //$NON-NLS-1$

-				appendJDIValueString(value);

-				notifyListener();

-				return;

-			}

-			

-			fRequestedValues.put(listener, value);

-			

-			Runnable detailRunnable = new Runnable() {	

-				public void run() {	

-					IEvaluationRunnable er = new IEvaluationRunnable() {

-						public void run(IJavaThread jt, IProgressMonitor pm) {

-							if (value instanceof IJavaArray) {

-								appendArrayDetail((IJavaArray)value, jt);

-							} else if (fValue instanceof IJavaObject) {

-								try {

-									appendObjectDetail((IJavaObject)value, jt);

-								} catch (DebugException e) {

-									handleDebugException(e, (IJavaValue)value);

-								}

-							} else {

-								appendJDIValueString(value);

-							}

-						}

-					};

-					try {

-						thread.runEvaluation(er, null, DebugEvent.EVALUATION_IMPLICIT, false);

-					} catch (DebugException e) {

-						handleDebugException(e, (IJavaValue)value);

-					}

-					if (value == fRequestedValues.remove(fListener)) {

-						// If another evaluation occurs before this one finished,

-						// don't display this result

-						notifyListener();

-					}

-				}

-			};

-			

-			fDetailThread = new Thread(detailRunnable);

-			fDetailThread.start();

-

-		}

-				

-		protected void appendJDIValueString(IValue value) {

-			try {

-				String result= value.getValueString();

-				fResultBuffer.append(result);

-			} catch (DebugException de) {

-				JDIDebugUIPlugin.log(de);

-				fResultBuffer.append(de.getStatus().getMessage());

-			}

-		}

-		

-		protected void appendObjectDetail(IJavaObject objectValue, IJavaThread thread) throws DebugException {			

-			IJavaValue toStringValue = objectValue.sendMessage(JDIModelPresentation.fgToString, JDIModelPresentation.fgToStringSignature, null, thread, false);

-			if (toStringValue == null) {

-				fResultBuffer.append(DebugUIMessages.getString("JDIModelPresentation.<unknown>_80")); //$NON-NLS-1$

-			} else {

-				appendJDIValueString(toStringValue);

-			}

-		}

-		

-		protected void handleDebugException(DebugException de, IJavaValue value) {

-			String reason = null;

-			switch (de.getStatus().getCode()) {

-				case IJavaThread.ERR_THREAD_NOT_SUSPENDED:

-					reason = DebugUIMessages.getString("JDIModelPresentation.thread_not_suspended_2"); //$NON-NLS-1$

-					break;

-				case IJavaThread.ERR_NESTED_METHOD_INVOCATION:

-					reason = DebugUIMessages.getString("JDIModelPresentation.evaluation_in_progress_3"); //$NON-NLS-1$

-					break;

-				case IJavaThread.ERR_INCOMPATIBLE_THREAD_STATE:

-					reason = DebugUIMessages.getString("JDIModelPresentation.thread_must_be_suspended_by_breakpoint_or_step_1"); //$NON-NLS-1$

-					break;

-				default:

-					reason = de.getStatus().getMessage();

-					break;

-			}

-			fResultBuffer = new StringBuffer(reason);

-		}

-

-		protected void appendArrayDetail(IJavaArray arrayValue, IJavaThread thread) {

-			fResultBuffer.append('[');

-			IJavaValue[] arrayValues;

-			try {

-				arrayValues = arrayValue.getValues();

-			} catch (DebugException de) {

-				JDIDebugUIPlugin.log(de);

-				fResultBuffer.append(de.getStatus().getMessage());

-				return;

-			}

-			try {

-				for (int i = 0; i < arrayValues.length; i++) {

-					IJavaValue value = arrayValues[i];

-					if (value instanceof IJavaArray) {

-						appendArrayDetail((IJavaArray)value, thread);	

-					} else if (value instanceof IJavaObject) {

-						appendObjectDetail((IJavaObject)value, thread);

-					} else {

-						appendJDIValueString(value);

-					}

-					if (i < arrayValues.length - 1) {

-						fResultBuffer.append(',');

-						fResultBuffer.append(' ');

-					}

-				}

-				fResultBuffer.append(']');

-			} catch (DebugException e) {

-				handleDebugException(e, arrayValue);

-			}

-		}

-	}	

-	

-	protected void appendSuspendPolicy(IJavaBreakpoint breakpoint, StringBuffer buffer) throws CoreException {

-		if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_VM) {

-			buffer.append(' ');

-			buffer.append(DebugUIMessages.getString("JDIModelPresentation.Suspend_VM")); //$NON-NLS-1$

-		}

-	}

-	

-	protected void appendThreadFilter(IJavaBreakpoint breakpoint, StringBuffer buffer) throws CoreException {

-		if (breakpoint.getThreadFilters().length != 0) {

-			buffer.append(' ');

-			buffer.append(DebugUIMessages.getString("JDIModelPresentation.thread_filtered")); //$NON-NLS-1$

-		}

-	}

-	

-	protected void appendConditional(IJavaLineBreakpoint breakpoint, StringBuffer buffer) throws CoreException {

-		if (breakpoint.isConditionEnabled() && breakpoint.getCondition() != null) {

-			buffer.append(' ');

-			buffer.append(DebugUIMessages.getString("JDIModelPresentation.[conditional]_2")); //$NON-NLS-1$

-		}

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
deleted file mode 100644
index dc066c0..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JDISourceViewer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.jdt.internal.ui.text.JavaPartitionScanner;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.IRegion;

-import org.eclipse.jface.text.ITypedRegion;

-import org.eclipse.jface.text.contentassist.IContentAssistant;

-import org.eclipse.jface.text.source.IVerticalRuler;

-import org.eclipse.jface.text.source.SourceViewer;

-import org.eclipse.swt.custom.BidiSegmentEvent;

-import org.eclipse.swt.custom.BidiSegmentListener;

-import org.eclipse.swt.custom.StyledText;

-import org.eclipse.swt.widgets.Composite;

-

-public class JDISourceViewer extends SourceViewer {

-

-	public JDISourceViewer(Composite parent, IVerticalRuler ruler, int styles) {

-		super(parent, ruler, styles);

-		StyledText text= this.getTextWidget();

-		text.addBidiSegmentListener(new  BidiSegmentListener() {

-			public void lineGetSegments(BidiSegmentEvent event) {

-				try {

-					event.segments= getBidiLineSegments(event.lineOffset);

-				} catch (BadLocationException x) {

-					// ignore

-				}

-			}

-		});

-	}

-

-	public IContentAssistant getContentAssistant() {

-		return fContentAssistant;

-	}

-	

-	/**

-	 * Returns a segmentation of the line of the given document appropriate for bidi rendering.

-	 * The default implementation returns only the string literals of a Java code line as segments.

-	 * 

-	 * @param document the document

-	 * @param lineOffset the offset of the line

-	 * @return the line's bidi segmentation

-	 * @throws BadLocationException in case lineOffset is not valid in document

-	 */

-	protected int[] getBidiLineSegments(int lineOffset) throws BadLocationException {

-		IDocument document= getDocument();

-		if (document == null) {

-			return null;

-		}

-		IRegion line= document.getLineInformationOfOffset(lineOffset);

-		ITypedRegion[] linePartitioning= document.computePartitioning(lineOffset, line.getLength());

-		

-		List segmentation= new ArrayList();

-		for (int i= 0; i < linePartitioning.length; i++) {

-			if (JavaPartitionScanner.JAVA_STRING.equals(linePartitioning[i].getType()))

-				segmentation.add(linePartitioning[i]);

-		}

-		

-		

-		if (segmentation.size() == 0) 

-			return null;

-			

-		int size= segmentation.size();

-		int[] segments= new int[size * 2 + 1];

-		

-		int j= 0;

-		for (int i= 0; i < size; i++) {

-			ITypedRegion segment= (ITypedRegion) segmentation.get(i);

-			

-			if (i == 0)

-				segments[j++]= 0;

-				

-			int offset= segment.getOffset() - lineOffset;

-			if (offset > segments[j - 1])

-				segments[j++]= offset;

-				

-			if (offset + segment.getLength() >= line.getLength())

-				break;

-				

-			segments[j++]= offset + segment.getLength();

-		}

-		

-		if (j < segments.length) {

-			int[] result= new int[j];

-			System.arraycopy(segments, 0, result, 0, j);

-			segments= result;

-		}

-		

-		return segments;

-	}	

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugAppearancePreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugAppearancePreferencePage.java
deleted file mode 100644
index b6996b7..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugAppearancePreferencePage.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.IDebugView;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Preference page for debug preferences that apply specifically to
- * Java Debugging.
- */
-public class JavaDebugAppearancePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	
-	// Primitive display preference widgets
-	private Button fHexButton;
-	private Button fCharButton;
-	private Button fUnsignedButton;
-	//view settings
-	private Button fPackagesButton;
-	private Button fFinalButton;
-	private Button fStaticButton;
-	
-	private PropertyChangeListener fPropertyChangeListener;
-	
-	protected class PropertyChangeListener implements IPropertyChangeListener {
-		private boolean fHasStateChanged= false;
-		
-		public void propertyChange(PropertyChangeEvent event) {
-			if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES)) {
-				fHasStateChanged= true;
-			} else if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES)) {
-				fHasStateChanged= true;
-			} else if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES)) {
-				fHasStateChanged= true;
-			}
-		}
-		
-		protected boolean hasStateChanged() {
- 			return fHasStateChanged;
- 		}
-	}
-	
-
-		
-	public JavaDebugAppearancePreferencePage() {
-		super();
-		setPreferenceStore(JDIDebugUIPlugin.getDefault().getPreferenceStore());
-		getPreferenceStore().addPropertyChangeListener(getPropertyChangeListener());
-		setDescription(DebugUIMessages.getString("JavaDebugAppearancePreferencePage.Appearance_settings_for_Java_Debugging_1")); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Set the default preferences for this page.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES, false);
-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES, false);
-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES, false);		
-		store.setDefault(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, true);
-		store.setDefault(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, true);
-		store.setDefault(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED, true);
-		store.setDefault(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS, true);
-		
-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES, true);
-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_FINAL_FIELDS, false);
-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_STATIC_FIELDS, false);
-	}
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.JAVA_DEBUG_APPEARANCE_PREFERENCE_PAGE);
-		
-		//The main composite
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight=0;
-		layout.marginWidth=0;
-		composite.setLayout(layout);
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);		
-		
-		
-		createPrimitiveDisplayPreferences(composite);
-		
-		createSpacer(composite, 1);
-		
-		Composite comp= createGroupComposite(composite, 1, DebugUIMessages.getString("JavaDebugPreferencePage.Opened_View_Default_Settings_1")); //$NON-NLS-1$
-		fPackagesButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Show_&qualified_names_2")); //$NON-NLS-1$
-		fFinalButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Show_&final_fields_3")); //$NON-NLS-1$
-		fStaticButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.&Show_static_fields_4")); //$NON-NLS-1$
-		
-		setValues();
-		
-		return composite;		
-	}
-	
-	/**
-	 * Create the primitive display preferences composite widget
-	 */
-	private void createPrimitiveDisplayPreferences(Composite parent) {
-		Composite comp= createGroupComposite(parent, 1, DebugUIMessages.getString("JavaDebugPreferencePage.Primitive_type_display_options_2"));	 //$NON-NLS-1$
-		
-		fHexButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Display_&hexadecimal_values_(byte,_short,_char,_int,_long)_3")); //$NON-NLS-1$
-		fCharButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Display_ASCII_&character_values_(byte,_short,_int,_long)_4")); //$NON-NLS-1$
-		fUnsignedButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Display_&unsigned_values_(byte)_5")); //$NON-NLS-1$
-	}
-			
-	/**
-	 * @see IWorkbenchPreferencePage#init(IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-	/**
-	 * @see IPreferencePage#performOk()
-	 * Also, notifies interested listeners
-	 */
-	public boolean performOk() {
-		storeValues();
-		if (getPropertyChangeListener().hasStateChanged()) {
-			refreshViews();
-		}
-		JDIDebugUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-	
-	/**
-	 * Refresh the variables and expression views as changes
-	 * have occurred that affects these views.
-	 */
-	private void refreshViews() {
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {
-				// Refresh interested views
-				IWorkbenchWindow[] windows= JDIDebugUIPlugin.getDefault().getWorkbench().getWorkbenchWindows();
-				IWorkbenchPage page= null;
-				for (int i= 0; i < windows.length; i++) {
-					page= windows[i].getActivePage();
-					if (page != null) {
-						refreshViews(page, IDebugUIConstants.ID_EXPRESSION_VIEW);
-						refreshViews(page, IDebugUIConstants.ID_VARIABLE_VIEW);
-					}
-				}
-			}
-		});
-	}
-	
-	/**
-	 * Refresh all views in the given workbench page with the given view id
-	 */
-	private void refreshViews(IWorkbenchPage page, String viewID) {
-		IViewPart part= page.findView(viewID);
-		if (part != null) {
-			IDebugView adapter= (IDebugView)part.getAdapter(IDebugView.class);
-			if (adapter != null) {
-				Viewer viewer= adapter.getViewer();
-				if (viewer instanceof StructuredViewer) {
-					((StructuredViewer)viewer).refresh();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Sets the default preferences.
-	 * @see PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		setDefaultValues();
-		super.performDefaults();	
-	}
-	
-	private void setDefaultValues() {
-		IPreferenceStore store = getPreferenceStore();
-		fHexButton.setSelection(store.getDefaultBoolean(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES));
-		fCharButton.setSelection(store.getDefaultBoolean(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES));
-		fUnsignedButton.setSelection(store.getDefaultBoolean(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES));
-	}
-	
-	/**
-	 * Creates a button with the given label and sets the default 
-	 * configuration data.
-	 */
-	private Button createCheckButton(Composite parent, String label) {
-		Button button= new Button(parent, SWT.CHECK | SWT.LEFT);
-		button.setText(label);		
-		// FieldEditor GridData
-		GridData data = new GridData();	
-		button.setLayoutData(data);
-		
-		return button;
-	}
-	
-	/**
-	 * Creates composite group and sets the default layout data.
-	 *
-	 * @param parent  the parent of the new composite
-	 * @param numColumns  the number of columns for the new composite
-	 * @param labelText  the text label of the new composite
-	 * @return the newly-created composite
-	 */
-	private Composite createGroupComposite(Composite parent, int numColumns, String labelText) {
-		Group comp = new Group(parent, SWT.NONE);
-		//GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		comp.setLayout(layout);
-		//GridData
-		GridData gd= new GridData();
-		gd.verticalAlignment = GridData.FILL;
-		gd.horizontalAlignment = GridData.FILL;
-		comp.setLayoutData(gd);
-		comp.setText(labelText);
-		return comp;
-	}
-		
-	/**
-	 * Set the values of the component widgets based on the
-	 * values in the preference store
-	 */
-	private void setValues() {
-		IPreferenceStore store = getPreferenceStore();
-		
-		fHexButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES));
-		fCharButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES));
-		fUnsignedButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES));		
-		
-		fStaticButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_STATIC_FIELDS));
-		fFinalButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_FINAL_FIELDS));
-		fPackagesButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES));
-	}
-	
-	/**
-	 * Store the preference values based on the state of the
-	 * component widgets
-	 */
-	private void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		store.setValue(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES, fHexButton.getSelection());
-		store.setValue(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES, fCharButton.getSelection());
-		store.setValue(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES, fUnsignedButton.getSelection());
-		store.setValue(IJDIPreferencesConstants.PREF_SHOW_FINAL_FIELDS, fFinalButton.getSelection());
-		store.setValue(IJDIPreferencesConstants.PREF_SHOW_STATIC_FIELDS, fStaticButton.getSelection());
-		store.setValue(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES, fPackagesButton.getSelection());
-	}
-	
-	protected PropertyChangeListener getPropertyChangeListener() {
-		if (fPropertyChangeListener == null) {
-			fPropertyChangeListener= new PropertyChangeListener();
-		}
-		return fPropertyChangeListener;
-	}
-	
-	/**
-	 * @see DialogPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		getPreferenceStore().removePropertyChangeListener(getPropertyChangeListener());
-	}
-	
-	protected void createSpacer(Composite composite, int columnSpan) {
-		Label label = new Label(composite, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = columnSpan;
-		label.setLayoutData(gd);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
deleted file mode 100644
index eca76bb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugHover.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.ArrayList;

-import java.util.Iterator;

-import java.util.List;

-

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.DebugPlugin;

-import org.eclipse.debug.core.ILaunchManager;

-import org.eclipse.debug.core.model.IDebugTarget;

-import org.eclipse.debug.core.model.IValue;

-import org.eclipse.debug.core.model.IVariable;

-import org.eclipse.jdt.debug.core.IJavaDebugTarget;

-import org.eclipse.jdt.debug.core.IJavaType;

-import org.eclipse.jdt.debug.core.IJavaValue;

-import org.eclipse.jdt.ui.text.java.hover.IJavaEditorTextHover;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.IRegion;

-import org.eclipse.jface.text.ITextViewer;

-import org.eclipse.ui.IEditorPart;

-

-

-public class JavaDebugHover implements IJavaEditorTextHover {

-		

-	

-	protected IEditorPart fEditor;

-	

-	

-	public JavaDebugHover() {

-	}

-

-	/**

-	 * @see IJavaEditorTextHover#setEditor(IEditorPart)

-	 */

-	public void setEditor(IEditorPart editor) {

-		fEditor= editor;

-	}

-		

-	/**

-	 * @see ITextHover#getHoverRegion(ITextViewer, int)

-	 */

-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {

-		return JavaWordFinder.findWord(textViewer.getDocument(), offset);

-	}

-		

-	/**

-	 * @see ITextHover#getHoverInfo(ITextViewer, IRegion)

-	 */

-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {

-				

-		DebugPlugin debugPlugin= DebugPlugin.getDefault();

-		if (debugPlugin == null) {

-			return null;

-		}

-			

-		ILaunchManager launchManager= debugPlugin.getLaunchManager();

-		if (launchManager == null) {

-			return null;

-		}

-			

-		IDebugTarget[] targets= launchManager.getDebugTargets();

-		if (targets != null && targets.length > 0) {

-			try {

-				

-				IDocument document= textViewer.getDocument();

-				if (document == null)

-					return null;

-					

-				String variableName= document.get(hoverRegion.getOffset(), hoverRegion.getLength());

-				

-				List javaTargetList = new ArrayList(targets.length);

-				for (int i = 0; i < targets.length; i++) {

-					IJavaDebugTarget javaTarget = (IJavaDebugTarget) targets[i].getAdapter(IJavaDebugTarget.class);

-					if (javaTarget != null) {

-						javaTargetList.add(i, javaTarget);

-					}					

-				}

-												

-				StringBuffer buffer= new StringBuffer();

-				boolean showDebugTarget = javaTargetList.size() > 1;

-				Iterator iterator = javaTargetList.iterator();

-				while (iterator.hasNext()) {

-					IJavaDebugTarget javaTarget = (IJavaDebugTarget) iterator.next();	

-					try {

-						IVariable variable= javaTarget.findVariable(variableName);

-						if (variable != null) {

-							String debugTargetName = showDebugTarget ? javaTarget.getName() : null;

-							appendVariable(buffer, variable, debugTargetName);

-						}

-					} catch (DebugException x) {

-						JDIDebugUIPlugin.log(x);

-					}

-				}

-				

-				if (buffer.length() > 0) {

-					return buffer.toString();

-				}

-			

-			} catch (BadLocationException x) {

-				JDIDebugUIPlugin.log(x);

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * A variable gets one line for each debug target it appears in.

-	 */

-	private static void appendVariable(StringBuffer buffer, IVariable variable, String debugTargetName) throws DebugException {

-

-		buffer.append("<p>"); //$NON-NLS-1$

-		if (debugTargetName != null) {

-			buffer.append('[' + debugTargetName + "]&nbsp;"); //$NON-NLS-1$ 

-		}

-		buffer.append(makeHTMLSafe(variable.getName()));

-		buffer.append(" ="); //$NON-NLS-1$

-		

-		String type= getTypeName(variable);

-		String value= "<b>" + makeHTMLSafe(variable.getValue().getValueString().trim()) + "</b>"; //$NON-NLS-1$ //$NON-NLS-2$

-		

-		if (type == null) {

-			buffer.append(" null"); //$NON-NLS-1$

-		} else if (type.equals("java.lang.String")) { //$NON-NLS-1$

-			buffer.append(" \""); //$NON-NLS-1$

-			buffer.append(value);

-			buffer.append('"');

-		} else if (type.equals("boolean")) { //$NON-NLS-1$

-			buffer.append(' ');

-			buffer.append(value);

-		} else {

-			buffer.append(" ("); //$NON-NLS-1$

-			buffer.append(makeHTMLSafe(type));

-			buffer.append(") "); //$NON-NLS-1$

-			buffer.append(value);			

-		}		

-		buffer.append("</p>"); //$NON-NLS-1$

-	}

-

-	private static String getTypeName(IVariable variable) throws DebugException {

-		IValue value= variable.getValue();

-		if (value instanceof IJavaValue) {

-			IJavaType type= ((IJavaValue) value).getJavaType();

-			if (type == null) {

-				return null;

-			}			

-			return type.getName();

-		}

-		return value.getReferenceTypeName();

-	}

-	

-	/**

-	 * Replace any characters in the given String that would confuse an HTML 

-	 * parser with their escape sequences.

-	 */

-	private static String makeHTMLSafe(String string) {

-		StringBuffer buffer= new StringBuffer(string.length());

-	

-		for (int i= 0; i != string.length(); i++) {

-			char ch= string.charAt(i);

-			

-			switch (ch) {

-				case '&':

-					buffer.append("&amp;"); //$NON-NLS-1$

-					break;

-					

-				case '<':

-					buffer.append("&lt;"); //$NON-NLS-1$

-					break;

-

-				case '>':

-					buffer.append("&gt;"); //$NON-NLS-1$

-					break;

-

-				default:

-					buffer.append(ch);

-					break;

-			}

-		}

-

-		return buffer.toString();		

-	}

-

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
deleted file mode 100644
index 336e870..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugImages.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.resource.ImageRegistry;

-import org.eclipse.swt.graphics.Image;

-

-/**

- * Bundle of most images used by the Java debug plug-in.

- */

-public class JavaDebugImages {

-

-	private static final String NAME_PREFIX= "org.eclipse.jdt.debug.ui."; //$NON-NLS-1$

-	private static final int    NAME_PREFIX_LENGTH= NAME_PREFIX.length();

-

-	private static URL fgIconBaseURL= null;

-	

-	static {

-		String pathSuffix= "icons/full/"; //$NON-NLS-1$

-		try {

-			fgIconBaseURL= new URL(JDIDebugUIPlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);

-		} catch (MalformedURLException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-	}

-	

-	// The plugin registry

-	private final static ImageRegistry IMAGE_REGISTRY= new ImageRegistry(JDIDebugUIPlugin.getStandardDisplay());

-

-	/*

-	 * Available cached Images in the Java debug plug-in image registry.

-	 */	

-	public static final String IMG_OBJS_EXCEPTION= NAME_PREFIX + "jexception_obj.gif";			//$NON-NLS-1$

-	public static final String IMG_OBJS_EXCEPTION_DISABLED= NAME_PREFIX + "jexceptiond_obj.gif";			//$NON-NLS-1$

-	public static final String IMG_OBJS_ERROR= NAME_PREFIX + "jrtexception_obj.gif";			//$NON-NLS-1$	

-	

-	public static final String IMG_OBJS_BREAKPOINT_INSTALLED= NAME_PREFIX + "installed_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_BREAKPOINT_INSTALLED_DISABLED= NAME_PREFIX + "installed_ovr_disabled.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_OBJS_ACCESS_WATCHPOINT_ENABLED= NAME_PREFIX + "read_obj.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_ACCESS_WATCHPOINT_DISABLED= NAME_PREFIX + "read_obj_disabled.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_MODIFICATION_WATCHPOINT_ENABLED= NAME_PREFIX + "write_obj.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_MODIFICATION_WATCHPOINT_DISABLED= NAME_PREFIX + "write_obj_disabled.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_WATCHPOINT_ENABLED= NAME_PREFIX + "readwrite_obj.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_WATCHPOINT_DISABLED= NAME_PREFIX + "readwrite_obj_disabled.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_OBJS_METHOD_BREAKPOINT_ENTRY= NAME_PREFIX + "entry_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_METHOD_BREAKPOINT_ENTRY_DISABLED= NAME_PREFIX + "entry_ovr_disabled.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_METHOD_BREAKPOINT_EXIT= NAME_PREFIX + "exit_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_METHOD_BREAKPOINT_EXIT_DISABLED= NAME_PREFIX + "exit_ovr_disabled.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_OBJS_CONDITIONAL_BREAKPOINT= NAME_PREFIX + "conditional_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_CONDITIONAL_BREAKPOINT_DISABLED= NAME_PREFIX + "conditional_ovr_disabled.gif";	//$NON-NLS-1$

-

-	public static final String IMG_OBJS_SCOPED_BREAKPOINT= NAME_PREFIX + "scoped_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_SCOPED_BREAKPOINT_DISABLED= NAME_PREFIX + "scoped_ovr_disabled.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_OBJS_UNCAUGHT_BREAKPOINT= NAME_PREFIX + "uncaught_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_UNCAUGHT_BREAKPOINT_DISABLED= NAME_PREFIX + "uncaught_ovr_disabled.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_OBJS_CAUGHT_BREAKPOINT= NAME_PREFIX + "caught_ovr.gif";	//$NON-NLS-1$

-	public static final String IMG_OBJS_CAUGHT_BREAKPOINT_DISABLED= NAME_PREFIX + "caught_ovr_disabled.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_OBJS_SNIPPET_EVALUATING= NAME_PREFIX + "jsbook_run_obj.gif";	//$NON-NLS-1$

-	

-	public static final String IMG_VIEW_ARGUMENTS_TAB= NAME_PREFIX + "variable_tab.gif";  //$NON-NLS-1$

-

-	/*

-	 * Set of predefined Image Descriptors.

-	 */

-	private static final String T_OBJ= "obj16"; 		//$NON-NLS-1$

-	private static final String T_OVR= "ovr16"; 		//$NON-NLS-1$

-	private static final String T_WIZBAN= "wizban"; 	//$NON-NLS-1$

-	private static final String T_LCL= "clcl16"; 	//$NON-NLS-1$

-	private static final String T_CTOOL= "ctool16"; 	//$NON-NLS-1$

-	private static final String T_CVIEW= "cview16"; 	//$NON-NLS-1$

-	private static final String T_DTOOL= "dtool16"; 	//$NON-NLS-1$

-	private static final String T_ETOOL= "etool16"; 	//$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_OBJS_EXCEPTION= createManaged(T_OBJ, IMG_OBJS_EXCEPTION);

-	public static final ImageDescriptor DESC_OBJS_EXCEPTION_DISABLED= createManaged(T_OBJ, IMG_OBJS_EXCEPTION_DISABLED);

-	public static final ImageDescriptor DESC_OBJS_BREAKPOINT_INSTALLED= createManaged(T_OVR, IMG_OBJS_BREAKPOINT_INSTALLED);

-	public static final ImageDescriptor DESC_OBJS_BREAKPOINT_INSTALLED_DISABLED= createManaged(T_OVR, IMG_OBJS_BREAKPOINT_INSTALLED_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_WATCHPOINT_ENABLED= createManaged(T_OBJ, IMG_OBJS_WATCHPOINT_ENABLED);

-	public static final ImageDescriptor DESC_OBJS_WATCHPOINT_DISABLED= createManaged(T_OBJ, IMG_OBJS_WATCHPOINT_DISABLED);

-	public static final ImageDescriptor DESC_OBJS_ACCESS_WATCHPOINT_ENABLED= createManaged(T_OBJ, IMG_OBJS_ACCESS_WATCHPOINT_ENABLED);

-	public static final ImageDescriptor DESC_OBJS_ACCESS_WATCHPOINT_DISABLED= createManaged(T_OBJ, IMG_OBJS_ACCESS_WATCHPOINT_DISABLED);

-	public static final ImageDescriptor DESC_OBJS_MODIFICATION_WATCHPOINT_ENABLED= createManaged(T_OBJ, IMG_OBJS_MODIFICATION_WATCHPOINT_ENABLED);

-	public static final ImageDescriptor DESC_OBJS_MODIFICATION_WATCHPOINT_DISABLED= createManaged(T_OBJ, IMG_OBJS_MODIFICATION_WATCHPOINT_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_METHOD_BREAKPOINT_ENTRY= createManaged(T_OVR, IMG_OBJS_METHOD_BREAKPOINT_ENTRY);

-	public static final ImageDescriptor DESC_OBJS_METHOD_BREAKPOINT_ENTRY_DISABLED= createManaged(T_OVR, IMG_OBJS_METHOD_BREAKPOINT_ENTRY_DISABLED);

-	public static final ImageDescriptor DESC_OBJS_METHOD_BREAKPOINT_EXIT= createManaged(T_OVR, IMG_OBJS_METHOD_BREAKPOINT_EXIT);

-	public static final ImageDescriptor DESC_OBJS_METHOD_BREAKPOINT_EXIT_DISABLED= createManaged(T_OVR, IMG_OBJS_METHOD_BREAKPOINT_EXIT_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_CONDITIONAL_BREAKPOINT= createManaged(T_OVR, IMG_OBJS_CONDITIONAL_BREAKPOINT);

-	public static final ImageDescriptor DESC_OBJS_CONDITIONAL_BREAKPOINT_DISABLED= createManaged(T_OVR, IMG_OBJS_CONDITIONAL_BREAKPOINT_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_SCOPED_BREAKPOINT= createManaged(T_OVR, IMG_OBJS_SCOPED_BREAKPOINT);

-	public static final ImageDescriptor DESC_OBJS_SCOPED_BREAKPOINT_DISABLED= createManaged(T_OVR, IMG_OBJS_SCOPED_BREAKPOINT_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_UNCAUGHT_BREAKPOINT= createManaged(T_OVR, IMG_OBJS_UNCAUGHT_BREAKPOINT);

-	public static final ImageDescriptor DESC_OBJS_UNCAUGHT_BREAKPOINT_DISABLED= createManaged(T_OVR, IMG_OBJS_UNCAUGHT_BREAKPOINT_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_CAUGHT_BREAKPOINT= createManaged(T_OVR, IMG_OBJS_CAUGHT_BREAKPOINT);

-	public static final ImageDescriptor DESC_OBJS_CAUGHT_BREAKPOINT_DISABLED= createManaged(T_OVR, IMG_OBJS_CAUGHT_BREAKPOINT_DISABLED);

-	

-	public static final ImageDescriptor DESC_OBJS_ERROR= createManaged(T_OBJ, IMG_OBJS_ERROR);

-	

-	public static final ImageDescriptor DESC_OBJS_SNIPPET_EVALUATING= createManaged(T_OBJ, IMG_OBJS_SNIPPET_EVALUATING);

-	

-	public static final ImageDescriptor DESC_VIEW_ARGUMENTS_TAB = createManaged(T_CVIEW, IMG_VIEW_ARGUMENTS_TAB);

-		

-	public static final ImageDescriptor DESC_OVR_IS_OUT_OF_SYNCH= create(T_OVR, "error_co.gif");			//$NON-NLS-1$

-	public static final ImageDescriptor DESC_OVR_MAY_BE_OUT_OF_SYNCH= create(T_OVR, "warning_co.gif");		//$NON-NLS-1$

-			

-	public static final ImageDescriptor DESC_WIZBAN_NEWSCRAPPAGE= create(T_WIZBAN, "newsbook_wiz.gif");		//$NON-NLS-1$

-	public static final ImageDescriptor DESC_WIZBAN_JAVA_LAUNCH= create(T_WIZBAN, "java_app_wiz.gif"); 		//$NON-NLS-1$

-	public static final ImageDescriptor DESC_WIZBAN_JAVA_ATTACH= create(T_WIZBAN, "java_attach_wiz.gif"); 	//$NON-NLS-1$

-	public static final ImageDescriptor DESC_WIZBAN_LIBRARY= create(T_WIZBAN, "library_wiz.gif"); 	//$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_TOOL_RUNSNIPPET= create(T_ETOOL, "run_sbook.gif"); 			//$NON-NLS-1$

-	public static final ImageDescriptor DESC_TOOL_RUNSNIPPET_HOVER= create(T_CTOOL, "run_sbook.gif"); 	//$NON-NLS-1$

-	public static final ImageDescriptor DESC_TOOL_RUNSNIPPET_DISABLED= create(T_DTOOL, "run_sbook.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_TOOL_TERMSNIPPET= create(T_ETOOL, "term_sbook.gif"); 			//$NON-NLS-1$

-	public static final ImageDescriptor DESC_TOOL_TERMSNIPPET_HOVER= create(T_CTOOL, "term_sbook.gif"); 			//$NON-NLS-1$

-	public static final ImageDescriptor DESC_TOOL_TERMSNIPPET_DISABLED= create(T_DTOOL, "term_sbook.gif"); 			//$NON-NLS-1$

-

-

-	/**

-	 * Returns the image managed under the given key in this registry.

-	 * 

-	 * @param key the image's key

-	 * @return the image managed under the given key

-	 */ 

-	public static Image get(String key) {

-		return IMAGE_REGISTRY.get(key);

-	}

-	

-	/**

-	 * Sets the three image descriptors for enabled, disabled, and hovered to an action. The actions

-	 * are retrieved from the *tool16 folders.

-	 */

-	public static void setToolImageDescriptors(IAction action, String iconName) {

-		setImageDescriptors(action, "tool16", iconName); //$NON-NLS-1$

-	}

-	

-	/**

-	 * Sets the three image descriptors for enabled, disabled, and hovered to an action. The actions

-	 * are retrieved from the *lcl16 folders.

-	 */

-	public static void setLocalImageDescriptors(IAction action, String iconName) {

-		setImageDescriptors(action, "lcl16", iconName); //$NON-NLS-1$

-	}

-	

-	/*

-	 * Helper method to access the image registry from the JDIDebugUIPlugin class.

-	 */

-	/* package */ static ImageRegistry getImageRegistry() {

-		return IMAGE_REGISTRY;

-	}

-

-	//---- Helper methods to access icons on the file system --------------------------------------

-

-	private static void setImageDescriptors(IAction action, String type, String relPath) {

-		

-		try {

-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("d" + type, relPath)); //$NON-NLS-1$

-			if (id != null)

-				action.setDisabledImageDescriptor(id);

-		} catch (MalformedURLException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-	

-		try {

-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("c" + type, relPath)); //$NON-NLS-1$

-			if (id != null)

-				action.setHoverImageDescriptor(id);

-		} catch (MalformedURLException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-	

-		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$

-	}

-	

-	private static ImageDescriptor createManaged(String prefix, String name) {

-		try {

-			ImageDescriptor result= ImageDescriptor.createFromURL(makeIconFileURL(prefix, name.substring(NAME_PREFIX_LENGTH)));

-			IMAGE_REGISTRY.put(name, result);

-			return result;

-		} catch (MalformedURLException e) {

-			JDIDebugUIPlugin.log(e);

-			return ImageDescriptor.getMissingImageDescriptor();

-		}

-	}

-	

-	private static ImageDescriptor create(String prefix, String name) {

-		try {

-			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));

-		} catch (MalformedURLException e) {

-			JDIDebugUIPlugin.log(e);

-			return ImageDescriptor.getMissingImageDescriptor();

-		}

-	}

-	

-	private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {

-		if (fgIconBaseURL == null)

-			throw new MalformedURLException();

-			

-		StringBuffer buffer= new StringBuffer(prefix);

-		buffer.append('/');

-		buffer.append(name);

-		return new URL(fgIconBaseURL, buffer.toString());

-	}	

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
deleted file mode 100644
index 37f5786..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugOptionsManager.java
+++ /dev/null
@@ -1,762 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.text.MessageFormat;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IMarkerDelta;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IWorkspaceRunnable;

-import org.eclipse.core.resources.ResourcesPlugin;

-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.DebugEvent;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.DebugPlugin;

-import org.eclipse.debug.core.IDebugEventSetListener;

-import org.eclipse.debug.core.ILaunch;

-import org.eclipse.debug.core.ILaunchListener;

-import org.eclipse.debug.core.model.IBreakpoint;

-import org.eclipse.debug.core.model.IDebugTarget;

-import org.eclipse.debug.ui.DebugUITools;

-import org.eclipse.jdt.core.ICompilationUnit;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.JavaCore;

-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.IJavaStackFrame;

-import org.eclipse.jdt.debug.core.IJavaThread;

-import org.eclipse.jdt.debug.core.IJavaType;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-

-import com.sun.jdi.InvocationException;

-import com.sun.jdi.ObjectReference;

-

-/**

- * Manages options for the Java Debugger:<ul>

- * <li>Suspend on compilation errors</li>

- * <li>Ssuspend on uncaught exceptions</li>

- * <li>Step filters</li>

- * </ul>

- */

-public class JavaDebugOptionsManager implements IResourceChangeListener, IDebugEventSetListener, IPropertyChangeListener, IJavaBreakpointListener, ILaunchListener {

-	

-	/**

-	 * Singleton options manager

-	 */

-	private static JavaDebugOptionsManager fgOptionsManager = null;

-	

-	/**

-	 * Map of problems to locations

-	 * (<code>IMarker</code> -> <code>Location</code>)

-	 */

-	private HashMap fProblemMap = new HashMap(10);

-	

-	/**

-	 * Map of locations to problems.

-	 * (<code>Location</code> -> <code>IMarker</code>)

-	 */

-	private HashMap fLocationMap = new HashMap(10);

-	

-	/**

-	 * Breakpoint used to suspend on uncaught exceptions

-	 */

-	private IJavaExceptionBreakpoint fSuspendOnExceptionBreakpoint = null;

-	

-	/**

-	 * Breakpoint used to suspend on compilation errors

-	 */

-	private IJavaExceptionBreakpoint fSuspendOnErrorBreakpoint = null;	

-	

-	/**

-	 * A label provider

-	 */

-	private static ILabelProvider fLabelProvider= DebugUITools.newDebugModelPresentation();

-	

-	/**

-	 * Constants indicating whether a breakpoint

-	 * is added, removed, or changed.

-	 */

-	private static final int ADDED = 0;

-	private static final int REMOVED = 1;

-	private static final int CHANGED = 2;

-		

-	/**

-	 * Local cache of active step filters.

-	 */

-	private String[] fActiveStepFilters = null;

-	

-	/**

-	 * Helper class that describes a location in a stack

-	 * frame. A location consists of a package name, source

-	 * file name, and a line number.

-	 */

-	class Location {

-		private String fPackageName;

-		private String fSourceName;

-		private int fLineNumber;

-		

-		public Location(String packageName, String sourceName, int lineNumber) {

-			fPackageName = packageName;

-			fSourceName = sourceName;

-			fLineNumber = lineNumber;

-		}

-		

-		public boolean equals(Object o) {

-			if (o instanceof Location) {

-				Location l = (Location)o;

-				return l.fPackageName.equals(fPackageName) && l.fSourceName.equals(fSourceName) && l.fLineNumber == fLineNumber;

-				

-			}

-			return false;

-		}

-		

-		public int hashCode() {

-			return fPackageName.hashCode() + fSourceName.hashCode() + fLineNumber;

-		}

-	}

-

-	/**

-	 * Update cache of problems as they are added/removed.

-	 * 

-	 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)

-	 */

-	public void resourceChanged(IResourceChangeEvent event) {

-		IMarkerDelta[] deltas = event.findMarkerDeltas("org.eclipse.jdt.core.problem", true); //$NON-NLS-1$

-		if (deltas != null) {

-			for (int i = 0; i < deltas.length; i++) {

-				IMarkerDelta delta = deltas[i];

-				switch (delta.getKind()) {

-					case IResourceDelta.ADDED:

-						problemAdded(delta.getMarker());

-						break;

-					case IResourceDelta.REMOVED:

-						problemRemoved(delta.getMarker());

-						break;

-				}

-			}

-		}

-	}

-	

-	/**

-	 * Not to be instantiated

-	 * 

-	 * @see JavaDebugOptionsManager.getDefault();

-	 */

-	private JavaDebugOptionsManager() {

-	}

-	

-	/**

-	 * Return the default options manager

-	 */

-	public static JavaDebugOptionsManager getDefault() {

-		if (fgOptionsManager == null) {

-			fgOptionsManager = new JavaDebugOptionsManager();

-		}

-		return fgOptionsManager;

-	}

-	

-	/**

-	 * Called at startup by the java debug ui plug-in

-	 */

-	public void startup() throws CoreException {

-		// lazy initialization will occur on the first launch

-		DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);

-	}

-	

-	/**

-	 * Called at shutdown by the java debug ui plug-in

-	 */

-	public void shutdown() throws CoreException {

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);

-		DebugPlugin.getDefault().removeDebugEventListener(this);

-		DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);

-		JDIDebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);

-		JDIDebugModel.removeJavaBreakpointListener(this);

-		fProblemMap.clear();

-		fLocationMap.clear();

-	}	

-

-	/**

-	 * Initializes compilation error handling and suspending

-	 * on uncaught exceptions.

-	 */

-	protected void initializeProblemHandling() {

-		IWorkspaceRunnable wr = new IWorkspaceRunnable() {

-			public void run(IProgressMonitor monitor) throws CoreException {

-				// compilation error breakpoint

-				IJavaExceptionBreakpoint bp = JDIDebugModel.createExceptionBreakpoint(ResourcesPlugin.getWorkspace().getRoot(),"java.lang.Error", true, true, false, false, null); //$NON-NLS-1$

-				bp.setPersisted(false);

-				bp.setRegistered(false);

-				// disabled until there are errors

-				bp.setEnabled(false);

-				setSuspendOnCompilationErrorsBreakpoint(bp);

-				

-				// uncaught exception breakpoint

-				bp = JDIDebugModel.createExceptionBreakpoint(ResourcesPlugin.getWorkspace().getRoot(),"java.lang.Throwable", false, true, false, false, null); //$NON-NLS-1$

-				bp.setPersisted(false);

-				bp.setRegistered(false);

-				bp.setEnabled(isSuspendOnUncaughtExceptions());

-				setSuspendOnUncaughtExceptionBreakpoint(bp);

-				

-				// note existing compilation errors

-				IMarker[] problems = ResourcesPlugin.getWorkspace().getRoot().findMarkers("org.eclipse.jdt.core.problem", true, IResource.DEPTH_INFINITE); //$NON-NLS-1$

-				if (problems != null) {

-					for (int i = 0; i < problems.length; i++) {

-						problemAdded(problems[i]);

-					}

-				}				

-			}

-		};

-		

-		try {

-			ResourcesPlugin.getWorkspace().run(wr, null);

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-	}

-		

-	/**

-	 * The given problem has been added. Cross

-	 * reference the problem with its location.

-	 * Enable the error breakpoint if the suspend

-	 * option is on, and this is the first problem

-	 * being added.

-	 */

-	protected void problemAdded(IMarker problem) {

-		if (problem.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {

-			IResource res = problem.getResource();

-			IJavaElement cu = JavaCore.create(res);

-			if (cu != null && cu instanceof ICompilationUnit) {

-				// auto-enable the exception breakpoint if this is the first problem added

-				// and the preference is turned on.

-				boolean autoEnable = fProblemMap.isEmpty();

-				int line = problem.getAttribute(IMarker.LINE_NUMBER, -1);

-				String name = cu.getElementName();

-				Location l = new Location(cu.getParent().getElementName(), name, line);

-				fLocationMap.put(l, problem);

-				fProblemMap.put(problem, l);

-				if (autoEnable) {

-					IWorkspaceRunnable wRunnable= new IWorkspaceRunnable() {

-						public void run(IProgressMonitor monitor) {

-							try {

-								getSuspendOnCompilationErrorBreakpoint().setEnabled(isSuspendOnCompilationErrors());

-							} catch (CoreException e) {

-								JDIDebugUIPlugin.log(e);

-							}

-						}

-					};

-					fork(wRunnable);

-				}

-			}

-		}

-	}

-	

-	/**

-	 * The given problem has been removed. Remove

-	 * cross reference of problem and location.

-	 * Disable the breakpoint if there are no errors.

-	 */

-	protected void problemRemoved(IMarker problem) {

-		Object location = fProblemMap.remove(problem);

-		if (location != null) {

-			fLocationMap.remove(location);

-		}

-		if (fProblemMap.isEmpty()) {

-			IWorkspaceRunnable wRunnable= new IWorkspaceRunnable() {

-				public void run(IProgressMonitor monitor) {

-					try {

-						getSuspendOnCompilationErrorBreakpoint().setEnabled(false);

-					} catch (CoreException e) {

-						JDIDebugUIPlugin.log(e);

-					}

-				}

-			};

-			fork(wRunnable);

-		}

-	}

-				

-	/**

-	 * Notifies java debug targets of the given breakpoint

-	 * addition or removal.

-	 * 

-	 * @param breakpoint a breakpoint

-	 * @param kind ADDED, REMOVED, or CHANGED

-	 */

-	protected void notifyTargets(IBreakpoint breakpoint, int kind) {

-		IDebugTarget[] targets = DebugPlugin.getDefault().getLaunchManager().getDebugTargets();

-		for (int i = 0; i < targets.length; i++) {

-			if (targets[i] instanceof IJavaDebugTarget) {

-				IJavaDebugTarget target = (IJavaDebugTarget)targets[i];

-				notifyTarget(target, breakpoint, kind);

-			}

-		}	

-	}

-	

-	/**

-	 * Notifies the give debug target of filter specifications

-	 * 

-	 * @param target Java debug target

-	 */

-	protected void notifyTargetOfFilters(IJavaDebugTarget target) {

-

-		IPreferenceStore store = JDIDebugUIPlugin.getDefault().getPreferenceStore();

-		

-		target.setFilterConstructors(store.getBoolean(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS));

-		target.setFilterStaticInitializers(store.getBoolean(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS));

-		target.setFilterSynthetics(store.getBoolean(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS));

-		target.setStepFiltersEnabled(store.getBoolean(IJDIPreferencesConstants.PREF_USE_FILTERS));

-		target.setStepFilters(getActiveStepFilters());

-

-	}	

-	

-	/**

-	 * Notifies all targets of current filter specifications.

-	 */

-	protected void notifyTargetsOfFilters() {

-		IDebugTarget[] targets = DebugPlugin.getDefault().getLaunchManager().getDebugTargets();

-		for (int i = 0; i < targets.length; i++) {

-			if (targets[i] instanceof IJavaDebugTarget) {

-				IJavaDebugTarget target = (IJavaDebugTarget)targets[i];

-				notifyTargetOfFilters(target);

-			}

-		}	

-	}		

-

-	/**

-	 * Notifies the given target of the given breakpoint

-	 * addition or removal.

-	 * 

-	 * @param target Java debug target

-	 * @param breakpoint a breakpoint

-	 * @param kind ADDED, REMOVED, or CHANGED

-	 */	

-	protected void notifyTarget(IJavaDebugTarget target, IBreakpoint breakpoint, int kind) {

-		switch (kind) {

-			case ADDED:

-				target.breakpointAdded(breakpoint);

-				break;

-			case REMOVED:

-				target.breakpointRemoved(breakpoint,null);

-				break;

-			case CHANGED:

-				target.breakpointChanged(breakpoint,null);

-				break;

-		}

-	}

-	

-	/**

-	 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)

-	 */

-	public void propertyChange(PropertyChangeEvent event) {

-		if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS)) {

-			IBreakpoint breakpoint = getSuspendOnCompilationErrorBreakpoint();

-			if (breakpoint != null) {

-				setEnabled(breakpoint, JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS));

-			}

-		} else if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS)) {

-			IBreakpoint breakpoint = getSuspendOnUncaughtExceptionBreakpoint();

-			if (breakpoint != null) {

-				setEnabled(breakpoint, JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS));

-			}

-		} else if (isUseFilterProperty(event.getProperty())) {

-			notifyTargetsOfFilters();

-		} else if (isFilterListProperty(event.getProperty())) {

-			updateActiveFilters();

-		}

-	}

-	

-	/**

-	 * Returns whether the given property is a property that affects whether

-	 * or not step filters are used.

-	 */

-	private boolean isUseFilterProperty(String property) {

-		return property.equals(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS) ||

-			property.equals(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS) ||

-			property.equals(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS) ||

-			property.equals(IJDIPreferencesConstants.PREF_USE_FILTERS);

-	}

-	

-	/**

-	 * Returns whether the given property is a property that affects

-	 * the list of active or inactive step filters.

-	 */

-	private boolean isFilterListProperty(String property) {

-		return property.equals(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST) ||

-			property.equals(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST);

-	}

-	

-	/**

-	 * Enable/Disable the given breakpoint and notify

-	 * targets of the change.

-	 * 

-	 * @param breakpoint a breakpoint

-	 * @param enabled whether enabeld

-	 */ 

-	protected void setEnabled(IBreakpoint breakpoint, boolean enabled) {

-		try {

-			breakpoint.setEnabled(enabled);

-			notifyTargets(breakpoint, CHANGED);

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-		}		

-	}

-	

-	/**

-	 * Returns whether suspend on compilation errors is

-	 * enabled.

-	 * 

-	 * @return whether suspend on compilation errors is

-	 * enabled

-	 */

-	protected boolean isSuspendOnCompilationErrors() {

-		return JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS);

-	}

-	

-	/**

-	 * Returns whether suspend on uncaught exception is

-	 * enabled

-	 * 

-	 * @return whether suspend on uncaught exception is

-	 * enabled

-	 */

-	protected boolean isSuspendOnUncaughtExceptions() {

-		return JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS);

-	}	

-

-

-	/**

-	 * Sets the breakpoint used to suspend on uncaught exceptions

-	 * 

-	 * @param breakpoint exception breakpoint

-	 */

-	private void setSuspendOnUncaughtExceptionBreakpoint(IJavaExceptionBreakpoint breakpoint) {

-		fSuspendOnExceptionBreakpoint = breakpoint;

-	}

-	

-	/**

-	 * Returns the breakpoint used to suspend on uncaught exceptions

-	 * 

-	 * @return exception breakpoint

-	 */

-	protected IJavaExceptionBreakpoint getSuspendOnUncaughtExceptionBreakpoint() {

-		return fSuspendOnExceptionBreakpoint;

-	}	

-	

-	/**

-	 * Sets the breakpoint used to suspend on compilation 

-	 * errors.

-	 * 

-	 * @param breakpoint exception breakpoint

-	 */

-	private void setSuspendOnCompilationErrorsBreakpoint(IJavaExceptionBreakpoint breakpoint) {

-		fSuspendOnErrorBreakpoint = breakpoint;

-	}

-	

-	/**

-	 * Returns the breakpoint used to suspend on compilation

-	 * errors

-	 * 

-	 * @return exception breakpoint

-	 */

-	protected IJavaExceptionBreakpoint getSuspendOnCompilationErrorBreakpoint() {

-		return fSuspendOnErrorBreakpoint;

-	}	

-	

-	/**

-	 * Parses the comma separated string into an array of strings

-	 * 

-	 * @return list

-	 */

-	public static String[] parseList(String listString) {

-		List list = new ArrayList(10);

-		StringTokenizer tokenizer = new StringTokenizer(listString, ","); //$NON-NLS-1$

-		while (tokenizer.hasMoreTokens()) {

-			String token = tokenizer.nextToken();

-			list.add(token);

-		}

-		return (String[])list.toArray(new String[list.size()]);

-	}

-	

-	/**

-	 * Serializes the array of strings into one comma

-	 * separated string.

-	 * 

-	 * @param list array of strings

-	 * @return a single string composed of the given list

-	 */

-	public static String serializeList(String[] list) {

-		if (list == null) {

-			return ""; //$NON-NLS-1$

-		}

-		StringBuffer buffer = new StringBuffer();

-		for (int i = 0; i < list.length; i++) {

-			if (i > 0) {

-				buffer.append(',');

-			}

-			buffer.append(list[i]);

-		}

-		return buffer.toString();

-	}

-	

-	/**

-	 * Returns the current list of active step filters.

-	 * 

-	 * @return current list of active step filters

-	 */

-	protected String[] getActiveStepFilters() {

-		if (fActiveStepFilters == null) {

-			fActiveStepFilters= parseList(JDIDebugUIPlugin.getDefault().getPreferenceStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST));

-			// After active filters are cached, register to hear about future changes

-			JDIDebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);

-		}

-		return fActiveStepFilters;

-	}

-	

-	/**

-	 * Updates local copy of active step filters and

-	 * notifies targets.

-	 */

-	protected void updateActiveFilters() {

-		fActiveStepFilters= parseList(JDIDebugUIPlugin.getDefault().getPreferenceStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST));

-		notifyTargetsOfFilters();

-	}

-	

-	/**

-	 * When a Java debug target is created, install options in

-	 * the target.

-	 * 

-	 * @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.CREATE) {

-				Object source = event.getSource();

-				if (source instanceof IJavaDebugTarget) {

-					IJavaDebugTarget javaTarget = (IJavaDebugTarget)source;

-					

-					// compilation breakpoints				

-					notifyTarget(javaTarget, getSuspendOnCompilationErrorBreakpoint(), ADDED);

-					

-					// uncaught exception breakpoint

-					notifyTarget(javaTarget, getSuspendOnUncaughtExceptionBreakpoint(), ADDED);

-					

-					// step filters

-					notifyTargetOfFilters(javaTarget);

-				}

-			}

-		}

-	}

-

-	/**

-	 * @see IJavaBreakpointListener#addingBreakpoint(IJavaDebugTarget, IJavaBreakpoint)

-	 */

-	public void addingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {

-	}

-

-	/**

-	 * @see IJavaBreakpointListener#installingBreakpoint(IJavaDebugTarget, IJavaBreakpoint, IJavaType)

-	 */

-	public boolean installingBreakpoint(IJavaDebugTarget target, IJavaBreakpoint breakpoint, IJavaType type) {

-		return true;

-	}

-	

-	/**

-	 * @see IJavaBreakpointListener#breakpointHit(IJavaThread, IJavaBreakpoint)

-	 */

-	public boolean breakpointHit(IJavaThread thread, IJavaBreakpoint breakpoint) {

-		if (breakpoint == getSuspendOnCompilationErrorBreakpoint()) {

-			try {

-				IJavaStackFrame frame = (IJavaStackFrame)thread.getTopStackFrame();

-				if (frame != null) {

-					return  getProblem(frame) != null;

-				}

-			} catch (DebugException e) {

-				JDIDebugUIPlugin.log(e);

-			}

-			

-		}

-		return true;

-	}

-

-	/**

-	 * @see IJavaBreakpointListener#breakpointInstalled(IJavaDebugTarget, IJavaBreakpoint)

-	 */

-	public void breakpointInstalled(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {

-	}

-

-	/**

-	 * @see IJavaBreakpointListener#breakpointRemoved(IJavaDebugTarget, IJavaBreakpoint)

-	 */

-	public void breakpointRemoved(IJavaDebugTarget target, IJavaBreakpoint breakpoint) {

-	}

-	

-	/**

-	 * Returns any problem marker associated with the current location

-	 * of the given stack frame, or <code>null</code> if none.

-	 * 

-	 * @param frame stack frame

-	 * @return marker representing compilation problem, or <code>null</code>

-	 */

-	protected IMarker getProblem(IJavaStackFrame frame) {

-		try {

-			String name = frame.getSourceName();

-			String packageName = frame.getDeclaringTypeName();

-			int index = packageName.lastIndexOf('.');

-			if (index == -1) {

-				if (name == null) {

-					// guess at source name if no debug attribute

-					name = packageName;

-					int dollar = name.indexOf('$');

-					if (dollar >= 0) {

-						name = name.substring(0, dollar);

-					}

-					name+= ".java"; //$NON-NLS-1$

-				}

-				packageName = ""; //$NON-NLS-1$

-			} else {

-				if (name == null) {

-					name = packageName.substring(index + 1);

-					int dollar = name.indexOf('$');

-					if (dollar >= 0) {

-						name = name.substring(0, dollar);

-					}

-					name += ".java"; //$NON-NLS-1$

-				}

-				packageName = packageName.substring(0,index);

-			}

-			int line = frame.getLineNumber();

-			Location l = new Location(packageName, name, line);

-			return  (IMarker)fLocationMap.get(l);		

-		} catch (DebugException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return null;

-	}

-	

-	protected void fork(final IWorkspaceRunnable wRunnable) {

-		Runnable runnable= new Runnable() {

-			public void run() {

-				try {

-					ResourcesPlugin.getWorkspace().run(wRunnable, null);

-				} catch (CoreException ce) {

-					JDIDebugUIPlugin.log(ce);

-				}

-			}

-		};

-		new Thread(runnable).start();

-	}		

-	

-	/**

-	 * @see IJavaConditionalBreakpointListener#breakpointHasRuntimeException(IJavaLineBreakpoint, Throwable)

-	 */

-	public void breakpointHasRuntimeException(final IJavaLineBreakpoint breakpoint, final DebugException exception) {

-		IStatus status;

-		Throwable wrappedException= exception.getStatus().getException();

-		if (wrappedException instanceof InvocationException) {

-			InvocationException ie= (InvocationException) wrappedException;

-			ObjectReference ref= ie.exception();		

-			status= new Status(IStatus.ERROR,JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, ref.referenceType().name(), null);

-		} else {

-			status= exception.getStatus();

-		}

-		openConditionErrorDialog(breakpoint, DebugUIMessages.getString("JavaDebugOptionsManager.Conditional_breakpoint_evaluation_failed_3"), DebugUIMessages.getString("JavaDebugOptionsManager.An_exception_occurred_while_evaluating_the_condition_for_breakpoint__{0}__4"), status); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * @see IJavaConditionalBreakpointListener#breakpointHasCompilationErrors(IJavaLineBreakpoint, Message[])

-	 */

-	public void breakpointHasCompilationErrors(final IJavaLineBreakpoint breakpoint, final Message[] errors) {

-		StringBuffer message= new StringBuffer();

-		Message error;

-		for (int i=0, numErrors= errors.length; i < numErrors; i++) {

-			error= errors[i];

-			message.append(error.getMessage());

-			message.append("\n "); //$NON-NLS-1$

-		}

-		IStatus status= new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, message.toString(), null);

-		openConditionErrorDialog(breakpoint, DebugUIMessages.getString("JavaDebugOptionsManager.Conditional_breakpoint_compilation_failed_6"), DebugUIMessages.getString("JavaDebugOptionsManager.Errors_detected_compiling_the_condition_for_breakpoint_{0}_7"), status); //$NON-NLS-1$ //$NON-NLS-2$

-	}

-	

-	private void openConditionErrorDialog(final IJavaLineBreakpoint breakpoint, final String title, final String errorMessage, final IStatus status) {

-		final Display display= JDIDebugUIPlugin.getStandardDisplay();

-		if (display.isDisposed()) {

-			return;

-		}

-		display.asyncExec(new Runnable() {

-			public void run() {

-				if (display.isDisposed()) {

-					return;

-				}

-				Shell shell= JDIDebugUIPlugin.getActiveWorkbenchShell();

-				String breakpointText= fLabelProvider.getText(breakpoint);

-				ConditionalBreakpointErrorDialog dialog= new ConditionalBreakpointErrorDialog(shell, title,

-					MessageFormat.format(errorMessage, new String[] {breakpointText}), status, breakpoint);

-				dialog.open();

-			}

-		});

-	}

-	

-	/**

-	 * Activates this debug options manager. When active, this

-	 * manager becomes a listener to many notifications and updates

-	 * running debug targets based on these notifications.

-	 * 

-	 * A debug options manager does not need to be activated until

-	 * there is a running debug target.

-	 */

-	private void activate() {

-		initializeProblemHandling();

-		notifyTargetsOfFilters();

-		DebugPlugin.getDefault().addDebugEventListener(this);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);

-		JDIDebugModel.addJavaBreakpointListener(this);

-	}	

-

-	/**

-	 * Startup problem handling on the first launch.

-	 * 

-	 * @see ILaunchListener#launchAdded(ILaunch)

-	 */

-	public void launchAdded(ILaunch launch) {

-		launchChanged(launch);

-	}

-	/**

-	 * @see ILaunchListener#launchChanged(ILaunch)

-	 */

-	public void launchChanged(ILaunch launch) {

-		activate();

-		DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);		

-	}

-

-	/**

-	 * @see ILaunchListener#launchRemoved(ILaunch)

-	 */

-	public void launchRemoved(ILaunch launch) {

-	}

-	

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
deleted file mode 100644
index 2c55706..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaDebugPreferencePage.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.debug.ui.IDebugView;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-import org.eclipse.jdt.launching.JavaRuntime;

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.preference.IntegerFieldEditor;

-import org.eclipse.jface.preference.PreferencePage;

-import org.eclipse.jface.preference.StringFieldEditor;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Group;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPreferencePage;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.help.WorkbenchHelp;

-

-/**

- * Preference page for debug preferences that apply specifically to

- * Java Debugging.

- */

-public class JavaDebugPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {

-	

-	// Suspend preference widgets

-	private Button fSuspendButton;

-	private Button fSuspendOnCompilationErrors;

-	// Alert preference widgets

-	private Button fAlertHCRButton;

-	private Button fAlertHCRNotSupportedButton;

-	private Button fAlertObsoleteButton;

-	// Timeout preference widgets

-	private IntegerFieldEditor fTimeoutText;

-	private IntegerFieldEditor fConnectionTimeoutText;

-	

-	private PropertyChangeListener fPropertyChangeListener;

-	

-	protected class PropertyChangeListener implements IPropertyChangeListener {

-		private boolean fHasStateChanged= false;

-		

-		public void propertyChange(PropertyChangeEvent event) {

-			if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES)) {

-				fHasStateChanged= true;

-			} else if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES)) {

-				fHasStateChanged= true;

-			} else if (event.getProperty().equals(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES)) {

-				fHasStateChanged= true;

-			}

-		}

-		

-		protected boolean hasStateChanged() {

- 			return fHasStateChanged;

- 		}

-	}

-	

-

-		

-	public JavaDebugPreferencePage() {

-		super();

-		setPreferenceStore(JDIDebugUIPlugin.getDefault().getPreferenceStore());

-		getPreferenceStore().addPropertyChangeListener(getPropertyChangeListener());

-		setDescription(DebugUIMessages.getString("JavaDebugPreferencePage.description")); //$NON-NLS-1$

-	}

-	

-	/**

-	 * Set the default preferences for this page.

-	 */

-	public static void initDefaults(IPreferenceStore store) {

-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_HEX_VALUES, false);

-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_CHAR_VALUES, false);

-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_UNSIGNED_VALUES, false);		

-		store.setDefault(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, true);

-		store.setDefault(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, true);

-		store.setDefault(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED, true);

-		store.setDefault(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED, true);

-		store.setDefault(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS, true);

-		

-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES, true);

-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_FINAL_FIELDS, false);

-		store.setDefault(IJDIPreferencesConstants.PREF_SHOW_STATIC_FIELDS, false);

-	}

-	/**

-	 * @see PreferencePage#createContents(Composite)

-	 */

-	protected Control createContents(Composite parent) {

-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.JAVA_DEBUG_PREFERENCE_PAGE);

-		

-		//The main composite

-		Composite composite = new Composite(parent, SWT.NULL);

-		GridLayout layout = new GridLayout();

-		layout.numColumns = 1;

-		layout.marginHeight=0;

-		layout.marginWidth=0;

-		composite.setLayout(layout);

-		GridData data = new GridData();

-		data.verticalAlignment = GridData.FILL;

-		data.horizontalAlignment = GridData.FILL;

-		composite.setLayoutData(data);		

-		

-		Composite comp= createGroupComposite(composite, 1, DebugUIMessages.getString("JavaDebugPreferencePage.Suspend_Execution_1")); //$NON-NLS-1$

-		fSuspendButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Suspend_&execution_on_uncaught_exceptions_1")); //$NON-NLS-1$

-		fSuspendOnCompilationErrors= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Suspend_execution_on_co&mpilation_errors_1")); //$NON-NLS-1$

-		

-		createSpacer(composite, 1);

-		

-		comp= createGroupComposite(composite, 1, DebugUIMessages.getString("JavaDebugPreferencePage.Hot_Code_Replace_Error_Reporting_2")); //$NON-NLS-1$

-		fAlertHCRButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Alert_me_when_hot_code_replace_fails_1")); //$NON-NLS-1$

-		fAlertHCRNotSupportedButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Alert_me_when_hot_code_replace_is_not_supported_1")); //$NON-NLS-1$

-		fAlertObsoleteButton= createCheckButton(comp, DebugUIMessages.getString("JavaDebugPreferencePage.Alert_me_when_obsolete_methods_remain_1")); //$NON-NLS-1$

-		

-		createSpacer(composite, 1);

-		

-		comp = createGroupComposite(composite, 1, DebugUIMessages.getString("JavaDebugPreferencePage.Communication_1")); //$NON-NLS-1$

-		//Add in an intermediate composite to allow for spacing

-		Composite spacingComposite = new Composite(comp, SWT.NONE);

-		layout = new GridLayout();

-		spacingComposite.setLayout(layout);

-		data = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL);

-		data.horizontalSpan = 2;

-		spacingComposite.setLayoutData(data);

-		

-		fTimeoutText = new IntegerFieldEditor(JDIDebugModel.PREF_REQUEST_TIMEOUT, DebugUIMessages.getString("JavaDebugPreferencePage.Debugger_&timeout__2"), spacingComposite); //$NON-NLS-1$

-		fTimeoutText.setPreferenceStore(JDIDebugUIPlugin.getDefault().getPreferenceStore());

-		fTimeoutText.setPreferencePage(this);

-		fTimeoutText.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);

-		fTimeoutText.setValidRange(50, Integer.MAX_VALUE);

-		fTimeoutText.setErrorMessage(DebugUIMessages.getString("JavaDebugPreferencePage.Value_must_be_a_valid_integer_greater_than_50_ms_1")); //$NON-NLS-1$

-		fTimeoutText.load();

-		fTimeoutText.setPropertyChangeListener(new IPropertyChangeListener() {

-			public void propertyChange(PropertyChangeEvent event) {

-				if (event.getProperty().equals(FieldEditor.IS_VALID)) 

-					setValid(fTimeoutText.isValid());

-			}

-		});

-		fConnectionTimeoutText = new IntegerFieldEditor(JavaRuntime.PREF_CONNECT_TIMEOUT, DebugUIMessages.getString("JavaDebugPreferencePage.&Launch_timeout_(ms)__1"), spacingComposite); //$NON-NLS-1$

-		fConnectionTimeoutText.setPreferenceStore(JDIDebugUIPlugin.getDefault().getPreferenceStore());

-		fConnectionTimeoutText.setPreferencePage(this);

-		fConnectionTimeoutText.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);

-		fConnectionTimeoutText.load();

-		fConnectionTimeoutText.setPropertyChangeListener(new IPropertyChangeListener() {

-			public void propertyChange(PropertyChangeEvent event) {

-				if (event.getProperty().equals(FieldEditor.IS_VALID)) 

-					setValid(fConnectionTimeoutText.isValid());

-			}

-		});

-		// cannot set preference store, as it is a core preference

-				

-		setValues();

-		

-		return composite;		

-	}

-		

-	/**

-	 * @see IWorkbenchPreferencePage#init(IWorkbench)

-	 */

-	public void init(IWorkbench workbench) {

-	}

-	

-	/**

-	 * @see IPreferencePage#performOk()

-	 * Also, notifies interested listeners

-	 */

-	public boolean performOk() {

-		storeValues();

-		if (getPropertyChangeListener().hasStateChanged()) {

-			refreshViews();

-		}

-		JDIDebugUIPlugin.getDefault().savePluginPreferences();

-		JDIDebugModel.savePreferences();

-		JavaRuntime.savePreferences();

-		return true;

-	}

-	

-	/**

-	 * Refresh the variables and expression views as changes

-	 * have occurred that affects these views.

-	 */

-	private void refreshViews() {

-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {

-			public void run() {

-				// Refresh interested views

-				IWorkbenchWindow[] windows= JDIDebugUIPlugin.getDefault().getWorkbench().getWorkbenchWindows();

-				IWorkbenchPage page= null;

-				for (int i= 0; i < windows.length; i++) {

-					page= windows[i].getActivePage();

-					if (page != null) {

-						refreshViews(page, IDebugUIConstants.ID_EXPRESSION_VIEW);

-						refreshViews(page, IDebugUIConstants.ID_VARIABLE_VIEW);

-					}

-				}

-			}

-		});

-	}

-	

-	/**

-	 * Refresh all views in the given workbench page with the given view id

-	 */

-	private void refreshViews(IWorkbenchPage page, String viewID) {

-		IViewPart part= page.findView(viewID);

-		if (part != null) {

-			IDebugView adapter= (IDebugView)part.getAdapter(IDebugView.class);

-			if (adapter != null) {

-				Viewer viewer= adapter.getViewer();

-				if (viewer instanceof StructuredViewer) {

-					((StructuredViewer)viewer).refresh();

-				}

-			}

-		}

-	}

-	

-	/**

-	 * Sets the default preferences.

-	 * @see PreferencePage#performDefaults()

-	 */

-	protected void performDefaults() {

-		setDefaultValues();

-		super.performDefaults();	

-	}

-	

-	private void setDefaultValues() {

-		IPreferenceStore store = getPreferenceStore();		

-		fSuspendButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS));

-		fSuspendOnCompilationErrors.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS));

-		fAlertHCRButton.setSelection(store.getDefaultBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED));

-		fAlertHCRNotSupportedButton.setSelection(store.getDefaultBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED));

-		fAlertObsoleteButton.setSelection(store.getDefaultBoolean(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS));

-		fTimeoutText.setStringValue(new Integer(JDIDebugModel.DEF_REQUEST_TIMEOUT).toString());

-		fConnectionTimeoutText.setStringValue(new Integer(JavaRuntime.DEF_CONNECT_TIMEOUT).toString());

-	}

-	

-	/**

-	 * Creates a button with the given label and sets the default 

-	 * configuration data.

-	 */

-	private Button createCheckButton(Composite parent, String label) {

-		Button button= new Button(parent, SWT.CHECK | SWT.LEFT);

-		button.setText(label);		

-		// FieldEditor GridData

-		GridData data = new GridData();	

-		button.setLayoutData(data);

-		

-		return button;

-	}

-	

-	/**

-	 * Creates composite group and sets the default layout data.

-	 *

-	 * @param parent  the parent of the new composite

-	 * @param numColumns  the number of columns for the new composite

-	 * @param labelText  the text label of the new composite

-	 * @return the newly-created composite

-	 */

-	private Composite createGroupComposite(Composite parent, int numColumns, String labelText) {

-		Group comp = new Group(parent, SWT.NONE);

-		//GridLayout

-		GridLayout layout = new GridLayout();

-		layout.numColumns = numColumns;

-		comp.setLayout(layout);

-		//GridData

-		GridData gd= new GridData();

-		gd.verticalAlignment = GridData.FILL;

-		gd.horizontalAlignment = GridData.FILL;

-		comp.setLayoutData(gd);

-		comp.setText(labelText);

-		return comp;

-	}

-		

-	/**

-	 * Set the values of the component widgets based on the

-	 * values in the preference store

-	 */

-	private void setValues() {

-		IPreferenceStore store = getPreferenceStore();

-		

-		fSuspendButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS));

-		fSuspendOnCompilationErrors.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS));

-		fAlertHCRButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED));

-		fAlertHCRNotSupportedButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED));

-		fAlertObsoleteButton.setSelection(store.getBoolean(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS));

-		fTimeoutText.setStringValue(new Integer(JDIDebugModel.getPreferences().getInt(JDIDebugModel.PREF_REQUEST_TIMEOUT)).toString());

-		fConnectionTimeoutText.setStringValue(new Integer(JavaRuntime.getPreferences().getInt(JavaRuntime.PREF_CONNECT_TIMEOUT)).toString());

-	}

-	

-	/**

-	 * Store the preference values based on the state of the

-	 * component widgets

-	 */

-	private void storeValues() {

-		IPreferenceStore store = getPreferenceStore();

-		store.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_UNCAUGHT_EXCEPTIONS, fSuspendButton.getSelection());

-		store.setValue(IJDIPreferencesConstants.PREF_SUSPEND_ON_COMPILATION_ERRORS, fSuspendOnCompilationErrors.getSelection());

-		store.setValue(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED, fAlertHCRButton.getSelection());

-		store.setValue(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED, fAlertHCRNotSupportedButton.getSelection());

-		store.setValue(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS, fAlertObsoleteButton.getSelection());

-		JDIDebugModel.getPreferences().setValue(JDIDebugModel.PREF_REQUEST_TIMEOUT, fTimeoutText.getIntValue());

-		JavaRuntime.getPreferences().setValue(JavaRuntime.PREF_CONNECT_TIMEOUT, fConnectionTimeoutText.getIntValue());

-	}

-	

-	protected PropertyChangeListener getPropertyChangeListener() {

-		if (fPropertyChangeListener == null) {

-			fPropertyChangeListener= new PropertyChangeListener();

-		}

-		return fPropertyChangeListener;

-	}

-	

-	/**

-	 * @see DialogPage#dispose()

-	 */

-	public void dispose() {

-		super.dispose();

-		getPreferenceStore().removePropertyChangeListener(getPropertyChangeListener());

-	}

-	

-	protected void createSpacer(Composite composite, int columnSpan) {

-		Label label = new Label(composite, SWT.NONE);

-		GridData gd = new GridData();

-		gd.horizontalSpan = columnSpan;

-		label.setLayoutData(gd);

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaEvaluationEngineManager.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaEvaluationEngineManager.java
deleted file mode 100644
index dc677b5..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaEvaluationEngineManager.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.eval.EvaluationManager;
-import org.eclipse.jdt.debug.eval.IAstEvaluationEngine;
-
-public class JavaEvaluationEngineManager implements IDebugEventSetListener {
-
-	/**
-	 * A mapping of maps that associates combinations of debug
-	 * targets and projects to evaluation engines.
-	 * 
-	 * The outer map associates debug
-	 * targets with a map. The inner maps map projects to
-	 * evaluation engines.
-	 * 
-	 */
-	HashMap fTargetMap= new HashMap();
-
-	public JavaEvaluationEngineManager() {
-		DebugPlugin.getDefault().addDebugEventListener(this);
-	}
-
-	/**
-	 * @see IDebugEventSetListener#handleDebugEvent(DebugEvent)
-	 * 
-	 * Removes debug targets from the engine map when they terminate,
-	 * and dispose of engines.
-	 */
-	public void handleDebugEvents(DebugEvent[] events) {
-		DebugEvent event;
-		for (int i= 0, numEvents= events.length; i < numEvents; i++) {
-			event= events[i];
-			if (event.getKind() == DebugEvent.TERMINATE && event.getSource() instanceof IJavaDebugTarget) {
-				HashMap map = (HashMap)fTargetMap.remove((IJavaDebugTarget)event.getSource());
-				if (map != null) {
-					Iterator iter = map.values().iterator();
-					while (iter.hasNext()) {
-						((IAstEvaluationEngine)iter.next()).dispose();
-					}
-					map.clear();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Returns an evaluation engine for the given project and debug target.
-	 * If an engine already exists for this project and target combination,
-	 * that same engine is returned. Otherwise, a new engine is created.
-	 */
-	public IAstEvaluationEngine getEvaluationEngine(IJavaProject project, IJavaDebugTarget target) {
-		IAstEvaluationEngine engine= null;
-		HashMap map= (HashMap)fTargetMap.get(target);
-		if (map == null) {
-			map= new HashMap();
-			fTargetMap.put(target, map);
-		}
-		engine= (IAstEvaluationEngine)map.get(project);
-		if (engine == null) {
-			engine= EvaluationManager.newAstEvaluationEngine(project, target);
-			map.put(project, engine);
-		}
-		return engine;
-	}
-	
-	/**
-	 * Disposes this evaluation engine manager.
-	 * When disposed, the manager disposes all engines
-	 * it is currently managing.
-	 * 
-	 * After this evaluation engine manager has been disposed, it
-	 * must not be reused.
-	 */
-	public void dispose() {
-		HashMap engines;
-		Iterator iter= fTargetMap.values().iterator();
-		while (iter.hasNext()) {
-			engines= ((HashMap)iter.next());
-			Iterator engineIter= engines.values().iterator();
-			while (engineIter.hasNext()) {
-				IAstEvaluationEngine engine = (IAstEvaluationEngine)engineIter.next();
-				engine.dispose();
-			}
-			engines.clear();
-		}
-		DebugPlugin.getDefault().removeDebugEventListener(this);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java
deleted file mode 100644
index bf9a92f..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaHotCodeReplaceListener.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.internal.ui.DelegatingModelPresentation;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaHotCodeReplaceListener;
-import org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookLauncher;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-public class JavaHotCodeReplaceListener implements IJavaHotCodeReplaceListener {
-
-	private ILabelProvider fLabelProvider= new DelegatingModelPresentation();
-
-	/**
-	 * @see IJavaHotCodeReplaceListener#hotCodeReplaceSucceeded(IJavaDebugTarget)
-	 */
-	public void hotCodeReplaceSucceeded(IJavaDebugTarget target) {
-	}
-
-	/**
-	 * @see IJavaHotCodeReplaceListener#hotCodeReplaceFailed(IJavaDebugTarget, DebugException)
-	 */
-	public void hotCodeReplaceFailed(final IJavaDebugTarget target, final DebugException exception) {
-		if ((exception != null &&!JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED)) ||
-			((exception == null) && !JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED))) {
-			return;
-		}
-		// do not report errors for snippet editor targets
-		// that do not support HCR. HCR is simulated by using
-		// a new class loader for each evaluation
-		ILaunch launch = target.getLaunch();
-		if (launch.getAttribute(ScrapbookLauncher.SCRAPBOOK_LAUNCH) != null) {
-			if (!target.supportsHotCodeReplace()) {
-					return;
-			}
-		}
-		final Display display= JDIDebugUIPlugin.getStandardDisplay();
-		if (display.isDisposed()) {
-			return;
-		}
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (display.isDisposed()) {
-					return;
-				}
-				Shell shell= JDIDebugUIPlugin.getActiveWorkbenchShell();
-				String vmName= fLabelProvider.getText(target);
-				IStatus status;
-				String preference;
-				String alertMessage;
-				if (exception == null) {
-					status= new Status(IStatus.WARNING, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, DebugUIMessages.getString("JDIDebugUIPlugin.The_target_VM_does_not_support_hot_code_replace_1"), null); //$NON-NLS-1$
-					preference= IJDIPreferencesConstants.PREF_ALERT_HCR_NOT_SUPPORTED;
-					alertMessage= DebugUIMessages.getString("JDIDebugUIPlugin.Always_alert_me_when_hot_code_replace_is_not_supported_1"); //$NON-NLS-1$
-				} else {
-					status= exception.getStatus();
-					preference= IJDIPreferencesConstants.PREF_ALERT_HCR_FAILED;
-					alertMessage= DebugUIMessages.getString("JDIDebugUIPlugin.Always_alert_me_of_hot_code_replace_failure_1"); //$NON-NLS-1$
-				}
-				ErrorDialogWithToggle dialog= new ErrorDialogWithToggle(shell, DebugUIMessages.getString("JDIDebugUIPlugin.Hot_code_replace_failed_1"), //$NON-NLS-1$
-					MessageFormat.format(DebugUIMessages.getString("JDIDebugUIPlugin.{0}_was_unable_to_replace_the_running_code_with_the_code_in_the_workspace._2"), //$NON-NLS-1$
-					new Object[] {vmName}), status, IStatus.WARNING | IStatus.ERROR | IStatus.INFO, preference,
-					alertMessage, JDIDebugUIPlugin.getDefault().getPreferenceStore()); //$NON-NLS-1$
-				dialog.open();
-			}
-		});
-	}
-	
-	/**
-	 * @see IJavaHotCodeReplaceListener#obsoleteMethods(IJavaDebugTarget)
-	 */
-	public void obsoleteMethods(final IJavaDebugTarget target) {
-		if (!JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS)) {
-			return;
-		}
-		final Display display= JDIDebugUIPlugin.getStandardDisplay();
-		if (display.isDisposed()) {
-			return;
-		}
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (display.isDisposed()) {
-					return;
-				}
-				Shell shell= JDIDebugUIPlugin.getActiveWorkbenchShell();
-				String vmName= fLabelProvider.getText(target);
-				IStatus status;
-				status= new Status(IStatus.WARNING, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.WARNING, DebugUIMessages.getString("JDIDebugUIPlugin.Stepping_may_be_hazardous_1"), null); //$NON-NLS-1$
-				ErrorDialogWithToggle dialog= new ErrorDialogWithToggle(shell, DebugUIMessages.getString("JDIDebugUIPlugin.Obsolete_methods_remain_1"), //$NON-NLS-1$
-					MessageFormat.format(DebugUIMessages.getString("JDIDebugUIPlugin.{0}_contains_obsolete_methods_1"), //$NON-NLS-1$
-					new Object[] {vmName}), status, IStatus.WARNING | IStatus.ERROR | IStatus.INFO, IJDIPreferencesConstants.PREF_ALERT_OBSOLETE_METHODS,
-					DebugUIMessages.getString("JDIDebugUIPlugin.Always_alert_me_of_obsolete_methods_1"), JDIDebugUIPlugin.getDefault().getPreferenceStore()); //$NON-NLS-1$
-				dialog.open();
-			}
-		});
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaModelListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaModelListener.java
deleted file mode 100644
index 915edc9..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaModelListener.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
-
-/**
- * Listens to Java model element changes and uninstalls breakpoints when the breakpoint
- * type's corresponding package fragment root is removed, closed, or removed from the classpath.
- */
-class JavaModelListener implements IElementChangedListener {
-	/**
-	 * @see IElementChangedListener#elementChanged(ElementChangedEvent)
-	 */
-	public void elementChanged(ElementChangedEvent e) {
-		final List removedRoots= new ArrayList();
-		getRemovedPackageFragmentRoots(e.getDelta(), removedRoots);
-		if (removedRoots.size() == 0) {
-			return;
-		}
-		IWorkspaceRunnable wr = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IBreakpoint[] breakpoints= DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(JDIDebugPlugin.getUniqueIdentifier());
-				IJavaBreakpoint breakpoint= null;
-				for (int i= 0, numBreakpoints= breakpoints.length; i < numBreakpoints; i++) {
-					if (!(breakpoints[i] instanceof IJavaBreakpoint)) {
-						continue;
-					}
-					breakpoint= (IJavaBreakpoint)breakpoints[i];
-					try {
-						IType type= BreakpointUtils.getType(breakpoint);
-						if (type != null) {
-							if (removedRoots.contains(type.getPackageFragment().getParent())) {
-								DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
-							}
-						}
-					} catch (CoreException x) {
-						JDIDebugUIPlugin.log(x);
-					}
-				}
-			}
-		};
-		fork(wr);
-	}
-	
-	/**
-	 * Recursively traverses the given java element delta looking for package
-	 * fragment roots which have been removed, closed, or removed from the classpath
-	 */
-	protected void getRemovedPackageFragmentRoots(IJavaElementDelta delta, List removedRoots) {
-		IJavaElement element= delta.getElement();
-		if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT) {
-			if ((delta.getKind() & IJavaElementDelta.REMOVED) != 0 || (delta.getFlags() & IJavaElementDelta.F_CLOSED) != 0 ||
-				(delta.getFlags() & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) {
-				removedRoots.add(delta.getElement());
-			}
-			return; // Stop traversal once a package fragment root is encountered.
-		}
-		IJavaElementDelta[] subdeltas= delta.getAffectedChildren();
-		for (int i= 0, numDeltas= subdeltas.length; i < numDeltas; i++) {
-			getRemovedPackageFragmentRoots(subdeltas[i], removedRoots);
-		}
-	}
-	
-	protected void fork(final IWorkspaceRunnable wRunnable) {
-		Runnable runnable= new Runnable() {
-			public void run() {
-				try {
-					ResourcesPlugin.getWorkspace().run(wRunnable, null);
-				} catch (CoreException ce) {
-					DebugPlugin.log(ce);
-				}
-			}
-		};
-		new Thread(runnable).start();
-	}	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameAdapterFactory.java
deleted file mode 100644
index 0485adb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStackFrameAdapterFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.ui.IActionFilter;
-
-public class JavaStackFrameAdapterFactory implements IAdapterFactory {
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType.isInstance(adaptableObject)) {
-			return adaptableObject;
-		}
-		if (adapterType == IActionFilter.class) {
-			if (adaptableObject instanceof IJavaStackFrame) {
-				return new DropToFrameActionFilter();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[] { IActionFilter.class };
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
deleted file mode 100644
index 2d2579f..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaStepFilterPreferencePage.java
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.debug.ui;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class JavaStepFilterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	
-	private static final String DEFAULT_NEW_FILTER_TEXT = ""; //$NON-NLS-1$
-
-	// Step filter widgets
-	private CheckboxTableViewer fFilterViewer;
-	private Table fFilterTable;
-	private Button fUseFiltersCheckbox;
-	private Button fAddPackageButton;
-	private Button fAddTypeButton;
-	private Button fRemoveFilterButton;
-	private Button fAddFilterButton;
-	private Button fFilterSyntheticButton;
-	private Button fFilterStaticButton;
-	private Button fFilterConstructorButton;
-	
-	private Button fEnableAllButton;
-	private Button fDisableAllButton;
-	
-	private Text fEditorText;
-	private String fInvalidEditorText= null;
-	private TableEditor fTableEditor;
-	private TableItem fNewTableItem;
-	private Filter fNewStepFilter;
-	private Label fTableLabel;
-	
-	private StepFilterContentProvider fStepFilterContentProvider;
-	
-	public JavaStepFilterPreferencePage() {
-		super();
-		setPreferenceStore(JDIDebugUIPlugin.getDefault().getPreferenceStore());
-		setDescription(DebugUIMessages.getString("JavaStepFilterPreferencePage.description")); //$NON-NLS-1$
-	}
-
-	protected Control createContents(Composite parent) {
-		WorkbenchHelp.setHelp(getControl(), IJavaDebugHelpContextIds.JAVA_STEP_FILTER_PREFERENCE_PAGE);
-		
-		//The main composite
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight=0;
-		layout.marginWidth=0;
-		composite.setLayout(layout);
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);	
-		
-		createStepFilterPreferences(composite);
-		
-		return composite;	
-	}
-
-	/**
-	 * @see IWorkbenchPreferencePage#init(IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-	/**
-	 * Set the default preferences for this page.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, "java.lang.ClassLoader"); //$NON-NLS-1$
-		store.setDefault(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, "com.ibm.*,com.sun.*,java.*,javax.*,org.omg.*,sun.*,sunw.*"); //$NON-NLS-1$
-		store.setDefault(IJDIPreferencesConstants.PREF_USE_FILTERS, true);
-	}
-	
-	/**
-	 * Creates composite control and sets the default layout data.
-	 *
-	 * @param parent  the parent of the new composite
-	 * @param numColumns  the number of columns for the new composite
-	 * @param labelText  the text label of the new composite
-	 * @return the newly-created composite
-	 */
-	private Composite createLabelledComposite(Composite parent, int numColumns, String labelText) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		
-		//GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		comp.setLayout(layout);
-		//GridData
-		GridData gd= new GridData();
-		gd.verticalAlignment = GridData.FILL;
-		gd.horizontalAlignment = GridData.FILL;
-		comp.setLayoutData(gd);
-		
-		//Label
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(labelText);
-		gd = new GridData();
-		gd.horizontalSpan = numColumns;
-		label.setLayoutData(gd);
-		return comp;
-	}
-	
-	/**
-	 * Create a group to contain the step filter related widgetry
-	 */
-	private void createStepFilterPreferences(Composite parent) {
-		// top level container
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-		
-		// use filters checkbox
-		fUseFiltersCheckbox = new Button(container, SWT.CHECK);
-		fUseFiltersCheckbox.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Use_&step_filters_7")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fUseFiltersCheckbox.setLayoutData(gd);	
-		fUseFiltersCheckbox.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				toggleStepFilterWidgetsEnabled(fUseFiltersCheckbox.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});	
-		
-		//table label
-		fTableLabel= new Label(container, SWT.NONE);
-		fTableLabel.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Defined_step_fi&lters__8")); //$NON-NLS-1$
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fTableLabel.setLayoutData(gd);
-		
-		// filter table
-		fFilterTable= new Table(container, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-		
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fFilterTable.setLayoutData(gd);
-		
-		TableLayout tableLayout= new TableLayout();
-		ColumnLayoutData[] columnLayoutData= new ColumnLayoutData[1];
-		columnLayoutData[0]= new ColumnWeightData(100);		
-		tableLayout.addColumnData(columnLayoutData[0]);
-		fFilterTable.setLayout(tableLayout);
-		new TableColumn(fFilterTable, SWT.NONE);
-		fFilterViewer = new CheckboxTableViewer(fFilterTable);
-		fTableEditor = new TableEditor(fFilterTable);
-		fFilterViewer.setLabelProvider(new FilterLabelProvider());
-		fFilterViewer.setSorter(new FilterViewerSorter());
-		fStepFilterContentProvider = new StepFilterContentProvider(fFilterViewer);
-		fFilterViewer.setContentProvider(fStepFilterContentProvider);
-		// input just needs to be non-null
-		fFilterViewer.setInput(this);
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		fFilterViewer.getTable().setLayoutData(gd);
-		fFilterViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Filter filter = (Filter)event.getElement();
-				fStepFilterContentProvider.toggleFilter(filter);
-			}
-		});
-		fFilterViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = event.getSelection();
-				if (selection.isEmpty()) {
-					fRemoveFilterButton.setEnabled(false);
-				} else {
-					fRemoveFilterButton.setEnabled(true);					
-				}
-			}
-		});		
-		
-		createStepFilterButtons(container);
-		createStepFilterCheckboxes(container);
-	}
-	
-	private void createStepFilterCheckboxes(Composite container) {
-		// filter synthetic checkbox
-		fFilterSyntheticButton = new Button(container, SWT.CHECK);
-		fFilterSyntheticButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Filter_s&ynthetic_methods_(requires_VM_support)_17")); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fFilterSyntheticButton.setLayoutData(gd);
-		
-		// filter static checkbox
-		fFilterStaticButton = new Button(container, SWT.CHECK);
-		fFilterStaticButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Filter_static_&initializers_18")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fFilterStaticButton.setLayoutData(gd);
-		
-		// filter constructor checkbox
-		fFilterConstructorButton = new Button(container, SWT.CHECK);
-		fFilterConstructorButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Filter_co&nstructors_19")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fFilterConstructorButton.setLayoutData(gd);
-		
-		fFilterSyntheticButton.setSelection(getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS));
-		fFilterStaticButton.setSelection(getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS));
-		fFilterConstructorButton.setSelection(getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS));
-		boolean enabled = getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_USE_FILTERS);
-		fUseFiltersCheckbox.setSelection(enabled);
-		toggleStepFilterWidgetsEnabled(enabled);
-	}
-	private void createStepFilterButtons(Composite container) {
-		// button container
-		Composite buttonContainer = new Composite(container, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-		GridLayout buttonLayout = new GridLayout();
-		buttonLayout.numColumns = 1;
-		buttonLayout.marginHeight = 0;
-		buttonLayout.marginWidth = 0;
-		buttonContainer.setLayout(buttonLayout);
-		
-		// Add filter button
-		fAddFilterButton = new Button(buttonContainer, SWT.PUSH);
-		fAddFilterButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_&Filter_9")); //$NON-NLS-1$
-		fAddFilterButton.setToolTipText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Key_in_the_name_of_a_new_step_filter_10")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		fAddFilterButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fAddFilterButton);
-		fAddFilterButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				editFilter();
-			}
-		});
-		
-		// Add type button
-		fAddTypeButton = new Button(buttonContainer, SWT.PUSH);
-		fAddTypeButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_&Type..._11")); //$NON-NLS-1$
-		fAddTypeButton.setToolTipText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Choose_a_Java_type_and_add_it_to_step_filters_12")); //$NON-NLS-1$
-		gd = getButtonGridData(fAddTypeButton);
-		fAddTypeButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fAddTypeButton);
-		fAddTypeButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addType();
-			}
-		});
-		
-		// Add package button
-		fAddPackageButton = new Button(buttonContainer, SWT.PUSH);
-		fAddPackageButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_&Package..._13")); //$NON-NLS-1$
-		fAddPackageButton.setToolTipText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Choose_a_package_and_add_it_to_step_filters_14")); //$NON-NLS-1$
-		gd = getButtonGridData(fAddPackageButton);
-		fAddPackageButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fAddPackageButton);
-		fAddPackageButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				addPackage();
-			}
-		});
-		
-		// Remove button
-		fRemoveFilterButton = new Button(buttonContainer, SWT.PUSH);
-		fRemoveFilterButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.&Remove_15")); //$NON-NLS-1$
-		fRemoveFilterButton.setToolTipText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Remove_all_selected_step_filters_16")); //$NON-NLS-1$
-		gd = getButtonGridData(fRemoveFilterButton);
-		fRemoveFilterButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fRemoveFilterButton);
-		fRemoveFilterButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				removeFilters();
-			}
-		});
-		fRemoveFilterButton.setEnabled(false);
-		
-		fEnableAllButton= new Button(buttonContainer, SWT.PUSH);
-		fEnableAllButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.&Enable_All_1")); //$NON-NLS-1$
-		fEnableAllButton.setToolTipText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Enables_all_step_filters_2")); //$NON-NLS-1$
-		gd = getButtonGridData(fEnableAllButton);
-		fEnableAllButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fEnableAllButton);
-		fEnableAllButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				checkAllFilters(true);
-			}
-		});
-
-		fDisableAllButton= new Button(buttonContainer, SWT.PUSH);
-		fDisableAllButton.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Disa&ble_All_3")); //$NON-NLS-1$
-		fDisableAllButton.setToolTipText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Disables_all_step_filters_4")); //$NON-NLS-1$
-		gd = getButtonGridData(fDisableAllButton);
-		fDisableAllButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(fDisableAllButton);
-		fDisableAllButton.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				checkAllFilters(false);
-			}
-		});
-		
-	}
-	private void toggleStepFilterWidgetsEnabled(boolean enabled) {
-		fFilterViewer.getTable().setEnabled(enabled);
-		fAddPackageButton.setEnabled(enabled);
-		fAddTypeButton.setEnabled(enabled);
-		fAddFilterButton.setEnabled(enabled);
-		fFilterSyntheticButton.setEnabled(enabled);
-		fFilterStaticButton.setEnabled(enabled);
-		fFilterConstructorButton.setEnabled(enabled);
-		if (!enabled) {
-			fRemoveFilterButton.setEnabled(enabled);
-		} else if (!fFilterViewer.getSelection().isEmpty()) {
-			fRemoveFilterButton.setEnabled(true);
-		}
-	}
-	
-	private GridData getButtonGridData(Button button) {
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		GC gc = new GC(button);
-		gc.setFont(button.getFont());
-		FontMetrics fontMetrics= gc.getFontMetrics();
-		gc.dispose();
-		int widthHint= Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint= Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		
-		gd.heightHint= Dialog.convertVerticalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_HEIGHT);
-		return gd;
-	}
-	
-	private void checkAllFilters(boolean check) {
-		
-		Object[] filters= fStepFilterContentProvider.getElements(null);
-		for (int i= 0; i != filters.length; i++) {
-			((Filter)filters[i]).setChecked(check);
-		}		
-			
-		fFilterViewer.setAllChecked(check);
-	}
-	
-	/**
-	 * Create a new filter in the table (with the default 'new filter' value),
-	 * then open up an in-place editor on it.
-	 */
-	private void editFilter() {
-		// if a previous edit is still in progress, finish it
-		if (fEditorText != null) {
-			validateChangeAndCleanup();
-		}
-		
-		fNewStepFilter = fStepFilterContentProvider.addFilter(DEFAULT_NEW_FILTER_TEXT, true);		
-		fNewTableItem = fFilterTable.getItem(0);
-		
-		// create & configure Text widget for editor
-		// Fix for bug 1766.  Border behavior on Windows & Linux for text
-		// fields is different.  On Linux, you always get a border, on Windows,
-		// you don't.  Specifying a border on Linux results in the characters
-		// getting pushed down so that only there very tops are visible.  Thus,
-		// we have to specify different style constants for the different platforms.
-		int textStyles = SWT.SINGLE | SWT.LEFT;
-		if (SWT.getPlatform().equals("win32")) {  //$NON-NLS-1$
-			textStyles |= SWT.BORDER;
-		}
-		fEditorText = new Text(fFilterTable, textStyles);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		fEditorText.setLayoutData(gd);
-		
-		// set the editor
-		fTableEditor.horizontalAlignment = SWT.LEFT;
-		fTableEditor.grabHorizontal = true;
-		fTableEditor.setEditor(fEditorText, fNewTableItem, 0);
-		
-		// get the editor ready to use
-		fEditorText.setText(fNewStepFilter.getName());
-		fEditorText.selectAll();
-		setEditorListeners(fEditorText);
-		fEditorText.setFocus();
-	}
-	
-	private void setEditorListeners(Text text) {
-		// CR means commit the changes, ESC means abort and don't commit
-		text.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent event) {				
-				if (event.character == SWT.CR) {
-					if (fInvalidEditorText != null) {
-						fEditorText.setText(fInvalidEditorText);
-						fInvalidEditorText= null;
-					} else {
-						validateChangeAndCleanup();
-					}
-				} else if (event.character == SWT.ESC) {
-					removeNewFilter();
-					cleanupEditor();
-				}
-			}
-		});
-		// Consider loss of focus on the editor to mean the same as CR
-		text.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent event) {
-				if (fInvalidEditorText != null) {
-					fEditorText.setText(fInvalidEditorText);
-					fInvalidEditorText= null;
-				} else {
-					validateChangeAndCleanup();
-				}
-			}
-		});
-		// Consume traversal events from the text widget so that CR doesn't 
-		// traverse away to dialog's default button.  Without this, hitting
-		// CR in the text field closes the entire dialog.
-		text.addListener(SWT.Traverse, new Listener() {
-			public void handleEvent(Event event) {
-				event.doit = false;
-			}
-		});
-	}
-	
-	private void validateChangeAndCleanup() {
-		String trimmedValue = fEditorText.getText().trim();
-		// if the new value is blank, remove the filter
-		if (trimmedValue.length() < 1) {
-			removeNewFilter();
-		}
-		// if it's invalid, beep and leave sitting in the editor
-		else if (!validateEditorInput(trimmedValue)) {
-			fInvalidEditorText= trimmedValue;
-			fEditorText.setText(DebugUIMessages.getString("JavaStepFilterPreferencePage.Invalid_step_filter._Return_to_continue;_escape_to_exit._1")); //$NON-NLS-1$
-			getShell().getDisplay().beep();			
-			return;
-		// otherwise, commit the new value if not a duplicate
-		} else {		
-			
-			Object[] filters= fStepFilterContentProvider.getElements(null);
-			for (int i = 0; i < filters.length; i++) {
-				Filter filter = (Filter)filters[i];
-				if (filter.getName().equals(trimmedValue)) {
-					removeNewFilter();
-					cleanupEditor();
-					return;
-				}	
-			}
-			fNewTableItem.setText(trimmedValue);
-			fNewStepFilter.setName(trimmedValue);
-			fFilterViewer.refresh();
-		}
-		cleanupEditor();
-	}
-	
-	/**
-	 * Cleanup all widgetry & resources used by the in-place editing
-	 */
-	private void cleanupEditor() {
-		if (fEditorText != null) {
-			fNewStepFilter = null;
-			fNewTableItem = null;
-			fTableEditor.setEditor(null, null, 0);	
-			fEditorText.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					fEditorText.dispose();
-					fEditorText = null;
-				}
-			});		
-		}
-	}
-	
-	private void removeNewFilter() {
-		fStepFilterContentProvider.removeFilters(new Object[] {fNewStepFilter});
-	}
-	
-	/**
-	 * A valid step filter is simply one that is a valid Java identifier.
-	 * and, as defined in the JDI spec, the regular expressions used for
-	 * step filtering must be limited to exact matches or patterns that
-	 * begin with '*' or end with '*'. Beyond this, a string cannot be validated
-	 * as corresponding to an existing type or package (and this is probably not
-	 * even desirable).  
-	 */
-	private boolean validateEditorInput(String trimmedValue) {
-		char firstChar= trimmedValue.charAt(0);
-		if (!Character.isJavaIdentifierStart(firstChar)) {
-			if (!(firstChar == '*')) {
-				return false;
-			}
-		}
-		int length= trimmedValue.length();
-		for (int i= 1; i < length; i++) {
-			char c= trimmedValue.charAt(i);
-			if (!Character.isJavaIdentifierPart(c)) {
-				if (c == '.' && i != (length - 1)) {
-					continue;
-				}
-				if (c == '*' && i == (length - 1)) {
-					continue;
-				}
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	private void addType() {
-		Shell shell= getShell();
-		SelectionDialog dialog= null;
-		try {
-			dialog= JavaUI.createTypeDialog(shell, new ProgressMonitorDialog(shell),
-				SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES, false);
-		} catch (JavaModelException jme) {
-			String title= DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_type_to_step_filters_20"); //$NON-NLS-1$
-			String message= DebugUIMessages.getString("JavaStepFilterPreferencePage.Could_not_open_type_selection_dialog_for_step_filters_21"); //$NON-NLS-1$
-			ExceptionHandler.handle(jme, title, message);
-			return;
-		}
-	
-		dialog.setTitle(DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_type_to_step_filters_20")); //$NON-NLS-1$
-		dialog.setMessage(DebugUIMessages.getString("JavaStepFilterPreferencePage.Select_a_type_to_filter_when_stepping_23")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID) {
-			return;
-		}
-		
-		Object[] types= dialog.getResult();
-		if (types != null && types.length > 0) {
-			IType type = (IType)types[0];
-			fStepFilterContentProvider.addFilter(type.getFullyQualifiedName(), true);
-		}		
-	}
-	
-	private void addPackage() {
-		Shell shell= getShell();
-		SelectionDialog dialog = null;
-		try {
-			dialog = JDIDebugUIPlugin.createAllPackagesDialog(shell, null, true);
-		} catch (JavaModelException jme) {
-			String title= DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_package_to_step_filters_24"); //$NON-NLS-1$
-			String message= DebugUIMessages.getString("JavaStepFilterPreferencePage.Could_not_open_package_selection_dialog_for_step_filters_25"); //$NON-NLS-1$
-			ExceptionHandler.handle(jme, title, message);
-			return;			
-		}
-	
-		dialog.setTitle(DebugUIMessages.getString("JavaStepFilterPreferencePage.Add_package_to_step_filters_24")); //$NON-NLS-1$
-		dialog.setMessage(DebugUIMessages.getString("JavaStepFilterPreferencePage.Select_a_package_to_filter_when_stepping_27")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID) {
-			return;
-		}
-		
-		Object[] packages= dialog.getResult();
-		if (packages != null && packages.length > 0) {
-			IJavaElement pkg = (IJavaElement)packages[0];
-			String filter = pkg.getElementName();
-			if (filter.length() < 1) {
-				filter = "(default package)" ; //$NON-NLS-1$
-			} else {
-				filter += ".*"; //$NON-NLS-1$
-			}
-			fStepFilterContentProvider.addFilter(filter, true);
-		}		
-	}
-	private void removeFilters() {
-		IStructuredSelection selection = (IStructuredSelection)fFilterViewer.getSelection();		
-		fStepFilterContentProvider.removeFilters(selection.toArray());
-	}
-	
-	/**
-	 * @see IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		fStepFilterContentProvider.saveFilters();
-		JDIDebugUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-	
-	/**
-	 * Sets the default preferences.
-	 * @see PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		setDefaultValues();
-		super.performDefaults();	
-	}
-	
-	private void setDefaultValues() {
-		fStepFilterContentProvider.setDefaults();
-	}
-	
-	/**
-	 * Returns a list of active step filters.
-	 * 
-	 * @return list
-	 */
-	protected List createActiveStepFiltersList() {
-		String[] strings = JavaDebugOptionsManager.parseList(getPreferenceStore().getString(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST));
-		return Arrays.asList(strings);
-	}
-	
-	/**
-	 * Returns a list of active step filters.
-	 * 
-	 * @return list
-	 */
-	protected List createInactiveStepFiltersList() {
-		String[] strings = JavaDebugOptionsManager.parseList(getPreferenceStore().getString(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST));
-		return Arrays.asList(strings);
-	}
-	
-	protected void updateActions() {
-		if (fEnableAllButton != null) {
-			boolean enabled= fFilterViewer.getTable().getItemCount() > 0;
-			fEnableAllButton.setEnabled(enabled);
-			fDisableAllButton.setEnabled(enabled);
-		}
-	}	
-	
-	/**
-	 * Content provider for the table.  Content consists of instances of StepFilter.
-	 */	
-	protected class StepFilterContentProvider implements IStructuredContentProvider {
-		
-		private CheckboxTableViewer fViewer;
-		private List fFilters;
-		
-		public StepFilterContentProvider(CheckboxTableViewer viewer) {
-			fViewer = viewer;
-			List active = createActiveStepFiltersList();
-			List inactive = createInactiveStepFiltersList();
-			populateFilters(active, inactive);
-			updateActions();
-		}
-		
-		public void setDefaults() {
-			fViewer.remove(fFilters.toArray());			
-			List active = createActiveStepFiltersList();
-			List inactive = createInactiveStepFiltersList();
-			populateFilters(active, inactive);		
-							
-			fFilterSyntheticButton.setSelection(getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS));
-			fFilterStaticButton.setSelection(getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS));
-			fFilterConstructorButton.setSelection(getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS));
-			boolean useStepFilters = getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_USE_FILTERS);
-			fUseFiltersCheckbox.setSelection(useStepFilters);
-			toggleStepFilterWidgetsEnabled(useStepFilters);
-		}
-		
-		protected void populateFilters(List activeList, List inactiveList) {
-			fFilters = new ArrayList(activeList.size() + inactiveList.size());
-			populateList(activeList, true);
-			populateList(inactiveList, false);
-		}
-		
-		protected void populateList(List list, boolean checked) {
-			Iterator iterator = list.iterator();
-			while (iterator.hasNext()) {
-				String name = (String)iterator.next();
-				addFilter(name, checked);
-			}			
-		}
-		
-		public Filter addFilter(String name, boolean checked) {
-			Filter filter = new Filter(name, checked);
-			if (!fFilters.contains(filter)) {
-				fFilters.add(filter);
-				fViewer.add(filter);
-				fViewer.setChecked(filter, checked);
-			}
-			updateActions();
-			return filter;
-		}
-		
-		public void saveFilters() {
-			
-			getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_USE_FILTERS, fUseFiltersCheckbox.getSelection());
-			getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_FILTER_CONSTRUCTORS, fFilterConstructorButton.getSelection());
-			getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_FILTER_STATIC_INITIALIZERS, fFilterStaticButton.getSelection());
-			getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_FILTER_SYNTHETICS, fFilterSyntheticButton.getSelection());
-							
-			List active = new ArrayList(fFilters.size());
-			List inactive = new ArrayList(fFilters.size());
-			Iterator iterator = fFilters.iterator();
-			while (iterator.hasNext()) {
-				Filter filter = (Filter)iterator.next();
-				String name = filter.getName();
-				if (filter.isChecked()) {
-					active.add(name);
-				} else {
-					inactive.add(name);
-				}
-			}
-			String pref = JavaDebugOptionsManager.serializeList((String[])active.toArray(new String[active.size()]));
-			getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, pref);
-			pref = JavaDebugOptionsManager.serializeList((String[])inactive.toArray(new String[inactive.size()]));
-			getPreferenceStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, pref);
-		}
-		
-		public void removeFilters(Object[] filters) {
-			for (int i = 0; i < filters.length; i++) {
-				Filter filter = (Filter)filters[i];
-				fFilters.remove(filter);
-			}
-			fViewer.remove(filters);
-			updateActions();
-		}
-		
-		public void toggleFilter(Filter filter) {
-			boolean newState = !filter.isChecked();
-			filter.setChecked(newState);
-			fViewer.setChecked(filter, newState);
-		}
-		
-		/**
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return fFilters.toArray();
-		}
-		
-		/**
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-		
-		/**
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}		
-	}
-	
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWordFinder.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWordFinder.java
deleted file mode 100644
index 94d34b3..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaWordFinder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.IRegion;

-import org.eclipse.jface.text.Region;

-

-public class JavaWordFinder {

-	

-	public static IRegion findWord(IDocument document, int offset) {

-		

-		int start= -1;

-		int end= -1;

-		

-		

-		try {

-			

-			int pos= offset;

-			char c;

-			

-			while (pos >= 0) {

-				c= document.getChar(pos);

-				if (!Character.isJavaIdentifierPart(c))

-					break;

-				--pos;

-			}

-			

-			start= pos;

-			

-			pos= offset;

-			int length= document.getLength();

-			

-			while (pos < length) {

-				c= document.getChar(pos);

-				if (!Character.isJavaIdentifierPart(c))

-					break;

-				++pos;

-			}

-			

-			end= pos;

-			

-		} catch (BadLocationException x) {

-		}

-		

-		if (start > -1 && end > -1) {

-			if (start == offset && end == offset)

-				return new Region(offset, 0);

-			else if (start == offset)

-				return new Region(start, end - start);

-			else

-				return new Region(start + 1, end - start - 1);

-		}

-		

-		return null;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java
deleted file mode 100644
index 6a3a039..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/LocalFileStorageEditorInput.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.jdt.launching.sourcelookup.LocalFileStorage;

-

-public class LocalFileStorageEditorInput extends StorageEditorInput {

-

-	/**

-	 * Constructs an editor input for the given storage

-	 */	

-	public LocalFileStorageEditorInput(LocalFileStorage storage) {

-		super(storage);

-	}

-	

-

-	/**

-	 * @see IEditorInput#exists()

-	 */

-	public boolean exists() {

-		return ((LocalFileStorage)getStorage()).getFile().exists();

-	}

-

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodActionFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodActionFilter.java
deleted file mode 100644
index 9b07410..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodActionFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.ui.IActionFilter;
-
-public class MethodActionFilter implements IActionFilter {
-
-	/**
-	 * @see org.eclipse.ui.IActionFilter#testAttribute(Object, String, String)
-	 */
-	public boolean testAttribute(Object target, String name, String value) {
-		if (name.equals("MethodActionFilter") //$NON-NLS-1$
-			&& value.equals("isBinaryMethod")) { //$NON-NLS-1$
-			if (target instanceof IMethod) {
-				IMethod method = (IMethod) target;
-				return method.isBinary();
-			}
-		}
-		return false;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodAdapterFactory.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodAdapterFactory.java
deleted file mode 100644
index 0203f74..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/MethodAdapterFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.ui.IActionFilter;
-
-public class MethodAdapterFactory implements IAdapterFactory {
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType.isInstance(adaptableObject)) {
-			return adaptableObject;
-		}
-		if (adapterType == IActionFilter.class) {
-			if (adaptableObject instanceof IMethod) {
-				return new MethodActionFilter();
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[] { IActionFilter.class };
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/PixelConverter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/PixelConverter.java
deleted file mode 100644
index 4143d62..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/PixelConverter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Control;
-
-public class PixelConverter {
-	
-	private FontMetrics fFontMetrics;
-	
-	public PixelConverter(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		fFontMetrics= gc.getFontMetrics();
-		gc.dispose();
-	}
-	
-	private FontMetrics fgFontMetrics;
-		
-	/**
-	 * @see DialogPage#convertHeightInCharsToPixels
-	 */
-	public int convertHeightInCharsToPixels(int chars) {
-		return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
-	}
-
-	/**
-	 * @see DialogPage#convertHorizontalDLUsToPixels
-	 */
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
-	}
-
-	/**
-	 * @see DialogPage#convertVerticalDLUsToPixels
-	 */
-	public int convertVerticalDLUsToPixels(int dlus) {
-		return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
-	}
-	
-	/**
-	 * @see DialogPage#convertWidthInCharsToPixels
-	 */
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
-	}	
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SWTUtil.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SWTUtil.java
deleted file mode 100644
index 76853f3..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SWTUtil.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.debug.ui;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DragSource;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Caret;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.util.Assert;
-
-/**
- * Utility class to simplify access to some SWT resources. 
- */
-public class SWTUtil {
-	
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display= Display.getCurrent();
-		if (display == null)
-			display= Display.getDefault();
-		return display;		
-	}
-	
-	/**
-	 * Returns the shell for the given widget. If the widget doesn't represent
-	 * a SWT object that manage a shell, <code>null</code> is returned.
-	 * 
-	 * @return the shell for the given widget
-	 */
-	public static Shell getShell(Widget widget) {
-		if (widget instanceof Control)
-			return ((Control)widget).getShell();
-		if (widget instanceof Caret)
-			return ((Caret)widget).getParent().getShell();
-		if (widget instanceof DragSource)
-			return ((DragSource)widget).getControl().getShell();
-		if (widget instanceof DropTarget)
-			return ((DropTarget)widget).getControl().getShell();
-		if (widget instanceof Menu)
-			return ((Menu)widget).getParent().getShell();
-		if (widget instanceof ScrollBar)
-			return ((ScrollBar)widget).getParent().getShell();
-							
-		return null;	
-	}
-
-
-	/**
-	 * Returns a width hint for a button control.
-	 */
-	public static int getButtonWidthHint(Button button) {
-		PixelConverter converter= new PixelConverter(button);
-		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-	}
-
-	/**
-	 * Returns a height hint for a button control.
-	 */		
-	public static int getButtonHeigthHint(Button button) {
-		PixelConverter converter= new PixelConverter(button);
-		return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-	}	
-
-	
-	/**
-	 * Sets width and height hint for the button control.
-	 * <b>Note:</b> This is a NOP if the button's layout data is not
-	 * an instance of <code>GridData</code>.
-	 * 
-	 * @param	the button for which to set the dimension hint
-	 */		
-	public static void setButtonDimensionHint(Button button) {
-		Assert.isNotNull(button);
-		Object gd= button.getLayoutData();
-		if (gd instanceof GridData) {
-			((GridData)gd).heightHint= getButtonHeigthHint(button);
-			((GridData)gd).widthHint= getButtonWidthHint(button);
-			((GridData)gd).horizontalAlignment = GridData.FILL;		 
-		}
-	}		
-	
-	
-	/**
-	 * Creates and returns a new push button with the given
-	 * label and/or image.
-	 * 
-	 * @param parent parent control
-	 * @param label button label or <code>null</code>
-	 * @param image image of <code>null</code>
-	 * 
-	 * @return a new push button
-	 */
-	public static Button createPushButton(Composite parent, String label, Image image) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		if (image != null) {
-			button.setImage(image);
-		}
-		if (label != null) {
-			button.setText(label);
-		}
-		GridData gd = new GridData();
-		button.setLayoutData(gd);	
-		SWTUtil.setButtonDimensionHint(button);
-		return button;	
-	}	
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java
deleted file mode 100644
index b3076cb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/StorageEditorInput.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.resources.IStorage;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.jdt.ui.ISharedImages;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.ui.IPersistableElement;

-import org.eclipse.ui.IStorageEditorInput;

-

-public abstract class StorageEditorInput extends PlatformObject implements IStorageEditorInput {

-

-	/**

-	 * Storage associated with this editor input

-	 */

-	private IStorage fStorage;

-	

-	/**

-	 * Constructs an editor input on the given storage

-	 */

-	public StorageEditorInput(IStorage storage) {

-		fStorage = storage;

-	}

-	

-	/**

-	 * @see IStorageEditorInput#getStorage()

-	 */

-	public IStorage getStorage() {

-		return fStorage;

-	}

-

-	/**

-	 * @see IEditorInput#getImageDescriptor()

-	 */

-	public ImageDescriptor getImageDescriptor() {

-		return JavaUI.getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJS_CUNIT);

-	}

-

-	/**

-	 * @see IEditorInput#getName()

-	 */

-	public String getName() {

-		return getStorage().getName();

-	}

-

-	/**

-	 * @see IEditorInput#getPersistable()

-	 */

-	public IPersistableElement getPersistable() {

-		return null;

-	}

-

-	/**

-	 * @see IEditorInput#getToolTipText()

-	 */

-	public String getToolTipText() {

-		return getStorage().getFullPath().toOSString();

-	}

-	

-	/**

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object object) {

-		return object instanceof StorageEditorInput &&

-		 getStorage().equals(((StorageEditorInput)object).getStorage());

-	}

-	

-	/**

-	 * @see java.lang.Object#hashCode()

-	 */

-	public int hashCode() {

-		return getStorage().hashCode();

-	}

-

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java
deleted file mode 100644
index 6936d89..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/SuspendTimeoutStatusHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Display;
-
-public class SuspendTimeoutStatusHandler implements IStatusHandler {
-
-	/**
-	 * @see IStatusHandler#handleStatus(IStatus, Object)
-	 */
-	public Object handleStatus(IStatus status, Object source) throws CoreException {
-		IJavaThread thread= (IJavaThread) source;
-		final ErrorDialog dialog= new ErrorDialog(JDIDebugUIPlugin.getActiveWorkbenchShell(), DebugUIMessages.getString("SuspendTimeoutHandler.suspend"), MessageFormat.format(DebugUIMessages.getString("SuspendTimeoutHandler.timeout_occurred"), new String[] {thread.getName()}), status, IStatus.WARNING | IStatus.ERROR | IStatus.INFO); //$NON-NLS-1$ //$NON-NLS-2$
-		Display display= JDIDebugUIPlugin.getStandardDisplay();
-		display.syncExec(new Runnable() {
-			public void run() {
-				dialog.open();
-			}
-		});
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java
deleted file mode 100644
index b05a08d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ZipEntryStorageEditorInput.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.jdt.launching.sourcelookup.ZipEntryStorage;

-

-public class ZipEntryStorageEditorInput extends StorageEditorInput {

-	

-	public ZipEntryStorageEditorInput(ZipEntryStorage storage) {

-		super(storage);

-	}

-	

-	/**

-	 * @see IEditorInput#exists()

-	 */

-	public boolean exists() {

-		return true;

-	}

-

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractBreakpointRulerAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractBreakpointRulerAction.java
deleted file mode 100644
index 05e4a2c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractBreakpointRulerAction.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.IUpdate;
-
-public abstract class AbstractBreakpointRulerAction extends Action implements IUpdate {
-
-	private IVerticalRulerInfo fInfo;
-
-	private ITextEditor fTextEditor;
-
-	private IBreakpoint fBreakpoint;
-
-	protected IBreakpoint determineBreakpoint() {
-		IBreakpoint[] breakpoints= DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(JDIDebugPlugin.getUniqueIdentifier());
-		for (int i= 0; i < breakpoints.length; i++) {
-			IBreakpoint breakpoint= breakpoints[i];
-			if (breakpoint instanceof IJavaLineBreakpoint) {
-				IJavaLineBreakpoint jBreakpoint= (IJavaLineBreakpoint)breakpoint;
-				try {
-					if (breakpointAtRulerLine(jBreakpoint)) {
-						return jBreakpoint;
-					}
-				} catch (CoreException ce) {
-					JDIDebugUIPlugin.log(ce);
-					continue;
-				}
-			}
-		}
-		return null;
-	}
-
-	protected IVerticalRulerInfo getInfo() {
-		return fInfo;
-	}
-
-	protected void setInfo(IVerticalRulerInfo info) {
-		fInfo = info;
-	}
-
-	protected ITextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	protected void setTextEditor(ITextEditor textEditor) {
-		fTextEditor = textEditor;
-	}
-
-	/** 
-	 * Returns the resource for which to create the marker, 
-	 * or <code>null</code> if there is no applicable resource.
-	 *
-	 * @return the resource for which to create the marker or <code>null</code>
-	 */
-	protected IResource getResource() {
-		IEditorInput input= fTextEditor.getEditorInput();
-		IResource resource= (IResource) input.getAdapter(IFile.class);
-		if (resource == null) {
-			resource= (IResource) input.getAdapter(IResource.class);
-		}	
-		return resource;
-	}
-
-	protected boolean breakpointAtRulerLine(IJavaLineBreakpoint jBreakpoint) throws CoreException {
-		AbstractMarkerAnnotationModel model = getAnnotationModel();
-		if (model != null) {
-			Position position= model.getMarkerPosition(jBreakpoint.getMarker());
-			if (position != null) {
-				IDocumentProvider provider= getTextEditor().getDocumentProvider();
-				IDocument doc=  provider.getDocument(getTextEditor().getEditorInput());
-				try {
-					int markerLineNumber= doc.getLineOfOffset(position.getOffset());
-					int rulerLine= getInfo().getLineOfLastMouseButtonActivity();
-					if (rulerLine == markerLineNumber) {
-						if (getTextEditor().isDirty()) {
-							return jBreakpoint.getLineNumber() == markerLineNumber + 1;
-						}
-						return true;
-					}
-				} catch (BadLocationException x) {
-					JDIDebugUIPlugin.log(x);
-				}
-			}
-		}
-		
-		return false;
-	}
-		
-	protected IBreakpoint getBreakpoint() {
-		return fBreakpoint;
-	}
-
-	protected void setBreakpoint(IBreakpoint breakpoint) {
-		fBreakpoint = breakpoint;
-	}
-	
-	/**
-	 * Returns the <code>AbstractMarkerAnnotationModel</code> of the editor's input.
-	 *
-	 * @return the marker annotation model
-	 */
-	protected AbstractMarkerAnnotationModel getAnnotationModel() {
-		IDocumentProvider provider= fTextEditor.getDocumentProvider();
-		IAnnotationModel model= provider.getAnnotationModel(getTextEditor().getEditorInput());
-		if (model instanceof AbstractMarkerAnnotationModel) {
-			return (AbstractMarkerAnnotationModel) model;
-		}
-		return null;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractManageBreakpointActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractManageBreakpointActionDelegate.java
deleted file mode 100644
index 9236d04..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AbstractManageBreakpointActionDelegate.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-
-public abstract class AbstractManageBreakpointActionDelegate extends ManageBreakpointActionDelegate implements IObjectActionDelegate {
-
-	private IMember fMember;
-	private IJavaBreakpoint fBreakpoint;
-	private IWorkbenchPart fTargetPart;
-	
-	/**
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		setTargetPart(targetPart);
-	}
-
-	protected IMember getMember() {
-		return fMember;
-	}
-
-	protected void setMember(IMember element) {
-		fMember = element;
-	}
-	
-	protected abstract IMember getMember(ISelection s);
-	
-	protected void updateForRun() {
-		IMember member= null;
-		IWorkbenchPage page= getPage();
-		if (page != null) {
-			ISelection selection= page.getSelection();
-			if (selection instanceof ITextSelection) {
-				member= getMember();
-				if (member != null) {
-					try {
-						ISourceRange sourceRange= member.getSourceRange();
-						ITextSelection textSelection= (ITextSelection)selection;
-						if (textSelection.getOffset() >= sourceRange.getOffset() && textSelection.getOffset() <= (sourceRange.getOffset() + sourceRange.getLength() - 1)) {
-							update();
-							return;
-						}
-					} catch(JavaModelException e) {
-						JDIDebugUIPlugin.log(e);
-					}	
-				}
-				member= ActionDelegateHelper.getDefault().getCurrentMember(selection);
-				
-			} else {
-				member= getMember(selection);
-				try {
-					if (member != null) {
-						IJavaProject project= member.getJavaProject();
-						if (!member.exists() || (project == null || !project.isOnClasspath(member))) {
-							member= null;
-						}
-					}
-				} catch (JavaModelException e) {
-					JDIDebugUIPlugin.log(e);
-					member= null;
-				}
-			}
-		}
-		
-		setMember(member);
-		update();
-	}
-	
-	protected IWorkbenchPage getPage() {
-		if (getWorkbenchWindow() != null) {
-			return getWorkbenchWindow().getActivePage();
-		} else if (getTargetPart() != null) {
-			return getTargetPart().getSite().getPage();
-		}
-		return null;
-	}
-	protected abstract IJavaBreakpoint getBreakpoint(IMember element);
-	
-	protected void update() {
-		if (enableForMember(getMember())) {
-			setBreakpoint(getBreakpoint(getMember()));
-		} else {
-			setBreakpoint(null);
-		}
-	}
-	
-	protected IJavaBreakpoint getBreakpoint() {
-		return fBreakpoint;
-	}
-
-	protected void setBreakpoint(IJavaBreakpoint breakpoint) {
-		fBreakpoint = breakpoint;
-	}
-	
-	protected abstract boolean enableForMember(IMember member);
-	
-	protected IWorkbenchPart getTargetPart() {
-		return fTargetPart;
-	}
-
-	protected void setTargetPart(IWorkbenchPart targetPart) {
-		fTargetPart = targetPart;
-		setEnabledState(null);
-	}
-	
-	protected void update(ISelection selection) {
-		setEnabledState(null);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AccessWatchpointToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AccessWatchpointToggleAction.java
deleted file mode 100644
index acc444e..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AccessWatchpointToggleAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaWatchpoint;

-

-public class AccessWatchpointToggleAction extends BreakpointToggleAction {

-

-	/**

-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)

-	 */

-	protected boolean getToggleState(IJavaBreakpoint watchpoint) throws CoreException {

-		return ((IJavaWatchpoint)watchpoint).isAccess();

-	}

-

-	/**

-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)

-	 */

-	public void doAction(IJavaBreakpoint watchpoint) throws CoreException {

-		((IJavaWatchpoint)watchpoint).setAccess(!((IJavaWatchpoint)watchpoint).isAccess());

-	}

-

-	/**

-	 * @see BreakpointToggleAction#isEnabledFor(Object)

-	 */

-	public boolean isEnabledFor(Object element) {

-		return element instanceof IJavaWatchpoint;

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java
deleted file mode 100644
index 0033e82..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionDelegateHelper.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-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.IMember;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor;
-import org.eclipse.jdt.ui.IWorkingCopyManager;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class ActionDelegateHelper implements IPartListener, IWindowListener {
-
-	private static ActionDelegateHelper fgDefault;
-	private IMember fMember= null;
-	private ITextEditor fTextEditor= null;
-	private ISelection fCurrentSelection= null;
-	private IWorkbenchWindow fCurrentWindow= null;
-	
-	public static ActionDelegateHelper getDefault() {
-		if (fgDefault == null) {
-			fgDefault= new ActionDelegateHelper();
-		} 
-		return fgDefault;
-	}
-	
-	private ActionDelegateHelper() {
-		fCurrentWindow= JDIDebugUIPlugin.getActiveWorkbenchWindow();
-		if (fCurrentWindow != null) {
-			fCurrentWindow.getWorkbench().addWindowListener(this);
-			fCurrentWindow.getPartService().addPartListener(this);
-			IWorkbenchPage page= fCurrentWindow.getActivePage();
-			if (page != null) {
-				IEditorPart part= page.getActiveEditor();
-				checkToSetTextEditor(part);
-			}
-		}
-	}
-	
-	/**
-	 * @see IPartListener#partActivated(IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		checkToSetTextEditor(part);
-	}
-
-	/**
-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-	}
-
-	/**
-	 * @see IPartListener#partClosed(IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part == getTextEditor()) {
-			cleanup();
-		}
-	}
-
-	/**
-	 * @see IPartListener#partDeactivated(IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {		
-	}
-
-	/**
-	 * @see IPartListener#partOpened(IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-	}
-
-	protected IMember getMember() {
-		return fMember;
-	}
-
-	protected void setMember(IMember member) {
-		fMember = member;
-	}
-	
-	protected void checkToSetTextEditor(IWorkbenchPart part) {
-		if (part instanceof ITextEditor) {
-			if (part instanceof JavaSnippetEditor) {
-				cleanup();
-			} else {
-				setTextEditor((ITextEditor)part);
-			}	
-		} 
-	}
-	
-	public IMember getCurrentMember(ISelection currentSelection) {
-		if (currentSelection == getCurrentSelection()) {
-			return getMember();
-		}
-		setCurrentSelection(currentSelection);
-		ITextEditor editor= getTextEditor();
-		if (editor == null) {
-			return null;
-		}
-		IEditorInput editorInput= editor.getEditorInput();
-		ISelectionProvider sp= editor.getSelectionProvider();
-		if (sp == null) {
-			return null;
-		}
-		ITextSelection selection= (ITextSelection)sp.getSelection();
-		IMember m= null;
-		try {
-			IClassFile classFile= (IClassFile)editorInput.getAdapter(IClassFile.class);
-			if (classFile != null) {
-				IJavaElement e= classFile.getElementAt(selection.getOffset());
-				if (e instanceof IMember) {
-					m= (IMember)e;
-				}
-			} else {
-				IWorkingCopyManager manager= JavaUI.getWorkingCopyManager();
-				ICompilationUnit unit= manager.getWorkingCopy(editorInput);
-				if (unit != null) {
-					synchronized (unit) {
-						unit.reconcile();
-					}
-					IJavaElement e = unit.getElementAt(selection.getOffset());
-					if (e instanceof IMember) {
-						m= (IMember)e;
-					}
-				}
-			}
-
-			if (m != null) {
-				IJavaProject project= m.getJavaProject();
-				if (!m.exists() || (project == null || !project.isOnClasspath(m))) {
-					m= null;
-				}
-			}
-		} catch (JavaModelException jme) {
-			JDIDebugUIPlugin.log(jme);
-		}
-		
-		setMember(m);
-		return m;
-	}
-	
-	protected ITextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	protected void setTextEditor(ITextEditor textEditor) {
-		fTextEditor = textEditor;
-	}
-	
-	protected ISelection getCurrentSelection() {
-		return fCurrentSelection;
-	}
-
-	protected void setCurrentSelection(ISelection currentSelection) {
-		fCurrentSelection = currentSelection;
-	}
-	
-	/**
-	 * @see IWindowListener#windowActivated(IWorkbenchWindow)
-	 */
-	public void windowActivated(IWorkbenchWindow window) {
-		if (fCurrentWindow != null) {
-			fCurrentWindow.getPartService().removePartListener(this);
-			cleanup();
-		}
-		fCurrentWindow= window;
-		fCurrentWindow.getPartService().addPartListener(this);
-		IWorkbenchPage page= window.getActivePage();
-		if (page != null) {
-			checkToSetTextEditor(page.getActiveEditor());
-		}
-	}
-
-	/**
-	 * @see IWindowListener#windowClosed(IWorkbenchWindow)
-	 */
-	public void windowClosed(IWorkbenchWindow window) {
-		if (fCurrentWindow == window) {
-			fCurrentWindow= null;
-			cleanup();
-		}
-	}
-
-	/**
-	 * @see IWindowListener#windowDeactivated(IWorkbenchWindow)
-	 */
-	public void windowDeactivated(IWorkbenchWindow window) {
-	}
-
-	/**
-	 * @see IWindowListener#windowOpened(IWorkbenchWindow)
-	 */
-	public void windowOpened(IWorkbenchWindow window) {
-	}
-	
-	protected void cleanup() {
-		setTextEditor(null);
-		setCurrentSelection(null);
-		setMember(null);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.java
deleted file mode 100644
index a838192..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-public class ActionMessages {

-

-	private static final String BUNDLE_NAME =

-		"org.eclipse.jdt.internal.debug.ui.actions.ActionMessages";//$NON-NLS-1$

-

-	private static final ResourceBundle RESOURCE_BUNDLE =

-		ResourceBundle.getBundle(BUNDLE_NAME);

-

-	private ActionMessages() {

-	}

-

-	public static String getString(String key) {

-		try {

-			return RESOURCE_BUNDLE.getString(key);

-		} catch (MissingResourceException e) {

-			return '!' + key + '!';

-		}

-	}

-	

-	public static ResourceBundle getResourceBundle() {

-		return RESOURCE_BUNDLE;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
deleted file mode 100644
index b7c495a..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ActionMessages.properties
+++ /dev/null
@@ -1,167 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial implementation

-######################################################################

-

-ManageBreakpointActionDelegate.error.message1=Exceptions occurred attempting to manage breakpoint

-ManageBreakpointActionDelegate.error.title1=Manage Breakpoint

-

-AddExceptionAction.error.message=An exception occurred while adding the breakpoint

-AddExceptionAction.error.title=Add Exception

-

-AddExceptionDialog.caught=&Caught

-AddExceptionDialog.error.notThrowable=The selected class is not a subclass of java.lang.Throwable

-AddExceptionDialog.message=Choose an E&xception (? = any character, * = any string)

-AddExceptionDialog.The_selected_class_has_an_existing_exception_breakpoint_1=The selected class has an existing exception breakpoint

-AddExceptionDialog.title=Add Java Exception Breakpoint

-AddExceptionDialog.uncaught=&Uncaught

-

-BreakpointAction.Breakpoint_configuration_1=Breakpoint configuration

-BreakpointAction.Exceptions_occurred_attempting_to_modify_breakpoint._2=Exceptions occurred attempting to modify breakpoint.

-

-BreakpointHitCountAction.&Enter_the_new_hit_count_for_the_breakpoint__3=&Enter the new hit count for the breakpoint:

-BreakpointHitCountAction.Enable_Hit_Count_1=Enable &Hit Count

-BreakpointHitCountAction.Exception_occurred_attempting_to_set_hit_count_1=Exception occurred attempting to set hit count

-BreakpointHitCountAction.Set_Breakpoint_Hit_Count_2=Set Breakpoint Hit Count

-BreakpointHitCountAction.Value_must_be_positive_integer=Hit count must be a positive integer

-

-BreakpointSuspendPolicy.Suspend_&Thread_2=&Suspend Thread

-BreakpointSuspendPolicy.Suspend_&VM_1=&Suspend VM

-

-DisplayAction.(evaluation_failed)_1=(evaluation failed)

-DisplayAction.(evaluation_failed)_Reason=Evaluation failed. Reason(s):\n{0}

-DisplayAction.no_result_value=(No explicit return value)

-DisplayAction.result_pattern={0} {1}

-DisplayAction.error.problem_append_pattern={0}\n\t\t{1}

-DisplayAction.toString_interrupted=(evaluation interrupted)

-DisplayAction.type_name_pattern=\ ({0})

-

-DropToFrameAction.Drop_to_Frame_1=Drop to Frame

-DropToFrameAction.Exceptions_occurred_attempting_to_drop_to_frame._2=Exceptions occurred attempting to drop to frame.

-

-EnableDisableBreakpointRulerAction.&Disable_Breakpoint_4=&Disable Breakpoint

-EnableDisableBreakpointRulerAction.&Enable_Breakpoint_1=&Enable Breakpoint

-EnableDisableBreakpointRulerAction.&Enable_Breakpoint_5=&Enable Breakpoint

-EnableDisableBreakpointRulerAction.Enabling/disabling_breakpoints_2=Enabling/disabling breakpoints

-EnableDisableBreakpointRulerAction.Exceptions_occurred_enabling_disabling_the_breakpoint_3=Exceptions occurred enabling disabling the breakpoint

-

-Evaluate.error.message.direct_exception=An exception occurred: {0}

-Evaluate.error.message.eval_adapter=No evaluation adapter

-Evaluate.error.message.exception.pattern={0} - {1}

-Evaluate.error.message.src_context=No Java source element context

-Evaluate.error.message.stack_frame_context=No stack frame context

-Evaluate.error.message.wrapped_exception=An exception occurred: {0}

-Evaluate.error.problem_append_pattern={0}\n{1}

-Evaluate.error.title.eval_problems=Error Evaluating

-EvaluateAction.Cannot_open_Display_view=Cannot open Display View

-

-ExceptionBreakpointFilterEditor.&Add_2=&Add

-ExceptionBreakpointFilterEditor.&Remove_8=&Remove

-ExceptionBreakpointFilterEditor.&Select_a_class_to_add_to_the_scope_of_the_breakpoint_20=&Select a class to add to the scope of the breakpoint

-ExceptionBreakpointFilterEditor.&Select_a_package_to_add_to_the_scope_of_the_breakpoint_15=&Select a package to add to the scope of the breakpoint

-ExceptionBreakpointFilterEditor.Add_&Class_4=Add &Class

-ExceptionBreakpointFilterEditor.Add_&Package_6=Add &Package

-ExceptionBreakpointFilterEditor.Add_Class_to_Scope_17=Add Class to Scope

-ExceptionBreakpointFilterEditor.Add_Package_to_Scope_14=Add Package to Scope

-ExceptionBreakpointFilterEditor.Choose_a_Java_Class_to_Add_It_to_the_Breakpoint_Scope_5=Choose a Java Class to Add It to the Breakpoint Scope

-ExceptionBreakpointFilterEditor.Choose_a_Package_to_Add_to_the_Breakpoint_Scope_7=Choose a Package to Add to the Breakpoint Scope

-ExceptionBreakpointFilterEditor.Could_not_open_class_selection_dialog_for_scope_definition_18=Could not open class selection dialog for scope definition

-ExceptionBreakpointFilterEditor.Could_not_open_package_selection_dialog_for_scope_definition_13=Could not open package selection dialog for scope definition

-ExceptionBreakpointFilterEditor.Invalid_expression._Return_to_continue;_escape_to_exit_11=Invalid expression. Return to continue; escape to exit

-ExceptionBreakpointFilterEditor.Key_in_the_name_of_a_new_scope_expression_3=Key in the name of a new scope expression

-ExceptionBreakpointFilterEditor.Re&strict_to_Selected_Location(s)__1=Re&strict to Selected Location(s):

-ExceptionBreakpointFilterEditor.Remove_all_selected_scoping_elements_9=Remove All Selected Scoping Elements

-

-InspectAction.Exception_occurred_inspecting_variable=Exception occurred inspecting variable.

-

-JavaBreakpointPreferencePage.&Caught_21=&Caught

-JavaBreakpointPreferencePage.&Enabled_22=&Enabled

-JavaBreakpointPreferencePage.&Modification_27=&Modification

-JavaBreakpointPreferencePage.&Uncaught_32=&Uncaught

-JavaBreakpointPreferencePage.Access_18=&Access

-JavaBreakpointPreferencePage.Condition_2=&Condition:

-JavaBreakpointPreferencePage.E&ntry_25=E&ntry

-JavaBreakpointPreferencePage.E&xit_26=E&xit

-JavaBreakpointPreferencePage.Enable_&Hit_Count_19=Enable &Hit Count

-JavaBreakpointPreferencePage.Enable_condition_1=E&nable Condition

-JavaBreakpointPreferencePage.H&it_Count__20=H&it Count:

-JavaBreakpointPreferencePage.Java_Exception_Breakpoint_Properties_8=Java Exception Breakpoint Properties

-JavaBreakpointPreferencePage.Java_Line_Breakpoint_Properties_16=Java Line Breakpoint Properties

-JavaBreakpointPreferencePage.Java_Method_Breakpoint_Properties_10=Java Method Breakpoint Properties

-JavaBreakpointPreferencePage.Java_Pattern_Breakpoint_Properties_14=Java Pattern Breakpoint Properties

-JavaBreakpointPreferencePage.Java_Watchpoint_Properties_12=Java Watchpoint Properties

-JavaBreakpointPreferencePage.Line_Number___5=Line Number: 

-JavaBreakpointPreferencePage.Suspend_&Thread_30=Suspend &Thread

-JavaBreakpointPreferencePage.Suspend_&VM_31=Suspend &VM

-JavaBreakpointPreferencePage.Suspend_Policy_29=Suspend Policy

-JavaBreakpointPreferencePage.Type___4=Type: 

-JavaBreakpointPreferencePage.Method=Method: 

-JavaBreakpointPreferencePage.Field=Field: 

-JavaBreakpointPreferencePage.Member=Member: 

-JavaBreakpointPreferencePage.Invalid_condition=Invalid condition

-

-JavaBreakpointPropertiesRulerAction.Breakpoint_&Properties_1=Breakpoint &Properties...

-

-ManageBreakpointRulerAction.add.label=Add &Breakpoint

-ManageBreakpointRulerAction.remove.label=Remove &Breakpoint

-ManageBreakpointRulerAction.error.adding.message1=Cannot add breakpoint

-ManageBreakpointRulerAction.error.removing.message1=Cannot remove breakpoint

-

-ManageMethodBreakpointAction.Problems_creating_breakpoint_7=Problems creating breakpoint

-ManageMethodBreakpointAction.Problems_removing_breakpoint_8=Problems removing breakpoint

-

-ManageWatchpointAction.Problems_adding_watchpoint_7=Problems adding watchpoint

-ManageWatchpointAction.Problems_removing_watchpoint_8=Problems removing watchpoint

-ManageWatchpointAction.The_selected_field_is_not_visible_in_the_currently_selected_debug_context._A_stack_frame_or_suspended_thread_which_contains_the_declaring_type_of_this_field_must_be_selected_1=The selected field is not visible in the currently selected debug context. A stack frame or suspended thread which contains the declaring type of this field must be selected

-

-OpenOnConsoleTypeAction.Choose_a_type_to_open_4=Choose a Type to Open

-OpenOnConsoleTypeAction.Error_opening_editor_5=Error opening editor

-OpenOnConsoleTypeAction.Error_parsing_console_document_7=Error parsing console document

-OpenOnConsoleTypeAction.Error_parsing_editor_document=Error parsing editor document

-OpenOnConsoleTypeAction.Error_searching_for_type_1=Error searching for type

-OpenOnConsoleTypeAction.Open_Type_3=Open Type

-

-RunToLine.error.message1=An exception occurred while attempting to run to line

-RunToLine.error.title1=Run to Line

-

-ThreadFilterViewer.Must_select_a_thread_in_selected_targets_2=Must select a thread in selected targets

-ThreadFilterViewer.Thread_filtering_1=&Restrict to Selected Thread(s)

-

-MoveDownAction.M&ove_Down_1=&Down

-MoveUpAction.Move_U&p_1=U&p

-RemoveAction.&Remove_1=&Remove

-

-AddProjectAction.Add_Project_1=Add Project&s...

-AddProjectAction.Project_Selection_2=Project Selection

-AddProjectAction.Choose_&project(s)_to_add__3=Choose &project(s) to add:

-

-AddJarAction.Add_&JARs_1=Add &JARs...

-AddJarAction.Selection_must_be_a_jar_or_zip_4=Selection must be a jar or zip

-AddJarAction.JAR_Selection_7=JAR Selection

-AddJarAction.Choose_jars_to_add__8=&Choose jars to add:

-

-AddExternalJar.Add_E&xternal_JARs_1=Add E&xternal JARs...

-AddExternalJar.Jar_Selection_3=Jar Selection

-

-AddFolderAction.Add_&Folders_1=Add &Folders

-AddFolderAction.Selection_must_be_a_folder_2=Selection must be a folder

-AddFolderAction.Folder_Selection_4=Folder Selection

-AddFolderAction.Choose_folders_to_add__5=&Choose folders to add:

-

-AddExternalFolderAction.Add_External_Folder_1=Add &External Folder

-AddExternalFolderAction.Folder_Selection_3=Folder Selection

-

-AddVariableAction.Add_Variables_1=Add Var&iables

-AddVariableAction.Variable_Selection_1=Variable Selection

-

-AttachSourceAction.Attachments_For_____{0}_____1=Attachments For \'\'{0}\'\'

-AttachSourceAction.Attac&h_Source..._2=Attac&h Source

-

-AddAdvancedAction.Ad&vanced..._1=&Advanced...

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java
deleted file mode 100644
index c7775fd..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddAdvancedAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathAdvancedDialog;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Opens a dialog to allow the user to choose among advanced actions.
- */
-public class AddAdvancedAction extends RuntimeClasspathAction {
-	
-	private IAction[] fActions;
-
-	public AddAdvancedAction(RuntimeClasspathViewer viewer, IAction[] actions) {
-		super(ActionMessages.getString("AddAdvancedAction.Ad&vanced..._1"), viewer); //$NON-NLS-1$
-		fActions = actions;
-	}	
-
-	/**
-	 * Prompts for a project to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-		Dialog dialog = new RuntimeClasspathAdvancedDialog(getShell(), fActions, getViewer());
-		dialog.open();			
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled();
-	}
-		
-	/**
-	 * @see RuntimeClasspathAction#setViewer(RuntimeClasspathViewer)
-	 */
-	public void setViewer(RuntimeClasspathViewer viewer) {
-		super.setViewer(viewer);
-		if (fActions != null) {
-			for (int i = 0; i < fActions.length; i++) {
-				if (fActions[i] instanceof RuntimeClasspathAction) {
-					((RuntimeClasspathAction)fActions[i]).setViewer(viewer);
-				}
-			}
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionAction.java
deleted file mode 100644
index b296873..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.core.IType;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;

-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.IViewActionDelegate;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.IWorkbenchWindowActionDelegate;

-

-public class AddExceptionAction implements IViewActionDelegate, IWorkbenchWindowActionDelegate {

-

-	public void run(IAction action) {		

-		Shell shell= JDIDebugUIPlugin.getActiveWorkbenchShell();

-		AddExceptionDialog dialog= new AddExceptionDialog(shell);

-		if (dialog.open() == dialog.OK) {

-			IType type= dialog.getType();

-			boolean checked= dialog.getExceptionType() == AddExceptionDialog.CHECKED_EXCEPTION;

-			boolean caught= dialog.isCaughtSelected();

-			boolean uncaught= dialog.isUncaughtSelected();

-			try {

-				Map attributes = new HashMap(10);

-				BreakpointUtils.addJavaBreakpointAttributes(attributes, type);

-				JDIDebugModel.createExceptionBreakpoint(BreakpointUtils.getBreakpointResource(type), type.getFullyQualifiedName(), caught, uncaught, checked, true, attributes);

-			} catch (CoreException exc) {

-				ExceptionHandler.handle(exc, ActionMessages.getString("AddExceptionAction.error.title"), ActionMessages.getString("AddExceptionAction.error.message")); //$NON-NLS-2$ //$NON-NLS-1$

-			}

-		}

-	}

-	

-	/**

-	 * @see IViewActionDelegate#init(IViewPart)

-	 */

-	public void init(IViewPart view) {

-	}

-

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-	}

-	

-	/**

-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()

-	 */

-	public void dispose() {

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)

-	 */

-	public void init(IWorkbenchWindow window) {

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionDialog.java
deleted file mode 100644
index 2d3effa..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExceptionDialog.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalFolderAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalFolderAction.java
deleted file mode 100644
index 40a140d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalFolderAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-
-/**
- * Adds an external folder to the runtime class path.
- */
-public class AddExternalFolderAction extends RuntimeClasspathAction {
-
-	public AddExternalFolderAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AddExternalFolderAction.Add_External_Folder_1"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts for a folder to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-							
-		String lastUsedPath= ""; //$NON-NLS-1$
-		if (lastUsedPath == null) {
-			lastUsedPath= ""; //$NON-NLS-1$
-		}
-		DirectoryDialog dialog= new DirectoryDialog(getShell(), SWT.MULTI);
-		dialog.setText(ActionMessages.getString("AddExternalFolderAction.Folder_Selection_3")); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String res= dialog.open();
-		if (res == null) {
-			return;
-		}
-			
-		IPath filterPath= new Path(dialog.getFilterPath());
-		IRuntimeClasspathEntry[] elems= new IRuntimeClasspathEntry[1];
-		IPath path= filterPath.append(res).makeAbsolute();	
-		elems[0]= JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-
-		//fDialogSettings.put(IUIConstants.DIALOGSTORE_LASTEXTJAR, filterPath.toOSString());
-		
-		getViewer().addEntries(elems);
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled();
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java
deleted file mode 100644
index e3b0ced..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddExternalJarAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-
-/**
- * Adds an external jar to the runtime class path.
- */
-public class AddExternalJarAction extends RuntimeClasspathAction {
-
-	public AddExternalJarAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AddExternalJar.Add_E&xternal_JARs_1"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts for a project to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-							
-		String lastUsedPath= ""; //$NON-NLS-1$
-		if (lastUsedPath == null) {
-			lastUsedPath= ""; //$NON-NLS-1$
-		}
-		FileDialog dialog= new FileDialog(getShell(), SWT.MULTI);
-		dialog.setText(ActionMessages.getString("AddExternalJar.Jar_Selection_3")); //$NON-NLS-1$
-		dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String res= dialog.open();
-		if (res == null) {
-			return;
-		}
-		String[] fileNames= dialog.getFileNames();
-		int nChosen= fileNames.length;
-			
-		IPath filterPath= new Path(dialog.getFilterPath());
-		IRuntimeClasspathEntry[] elems= new IRuntimeClasspathEntry[nChosen];
-		for (int i= 0; i < nChosen; i++) {
-			IPath path= filterPath.append(fileNames[i]).makeAbsolute();	
-			elems[i]= JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-		}
-		//fDialogSettings.put(IUIConstants.DIALOGSTORE_LASTEXTJAR, filterPath.toOSString());
-		
-		getViewer().addEntries(elems);
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled();
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
deleted file mode 100644
index 43158b8..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddFolderAction.java
+++ /dev/null
@@ -1,107 +0,0 @@
-	package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Adds an internal folder to the runtime class path.
- */
-public class AddFolderAction extends RuntimeClasspathAction {
-
-	public AddFolderAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AddFolderAction.Add_&Folders_1"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts for folder(s) to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-		
-		ISelectionStatusValidator validator= new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				for (int i= 0; i < selection.length; i++) {
-					if (!(selection[i] instanceof IContainer)) {
-						return new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, ActionMessages.getString("AddFolderAction.Selection_must_be_a_folder_2"), null); //$NON-NLS-1$
-					}
-					
-				}
-				return new Status(IStatus.OK, JDIDebugPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-			}			
-		};
-		ViewerFilter filter= new ObjectFilter(getSelectedFolders());
-		
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), lp, cp);
-		dialog.setValidator(validator);
-		dialog.setTitle(ActionMessages.getString("AddFolderAction.Folder_Selection_4")); //$NON-NLS-1$
-		dialog.setMessage(ActionMessages.getString("AddFolderAction.Choose_folders_to_add__5")); //$NON-NLS-1$
-		dialog.addFilter(filter);
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());	
-
-		if (dialog.open() == dialog.OK) {
-			Object[] elements= dialog.getResult();
-			IRuntimeClasspathEntry[] res= new IRuntimeClasspathEntry[elements.length];
-			for (int i= 0; i < res.length; i++) {
-				IResource elem= (IResource)elements[i];
-				res[i]= JavaRuntime.newArchiveRuntimeClasspathEntry(elem);
-			}
-			getViewer().addEntries(res);
-		}
-					
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled();
-	}
-	
-	/**
-	 * Returns a list of resources of currently selected jars
-	 */
-	protected List getSelectedFolders() {
-		List list = getEntiresAsList();
-		List jars = new ArrayList();
-		Iterator iter = list.iterator();
-		while (iter.hasNext()) {
-			IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry)iter.next();
-			if (entry.getType() == IRuntimeClasspathEntry.ARCHIVE) {
-				IResource res = entry.getResource();
-				if (res != null && res instanceof IContainer) {
-					jars.add(res);
-				}
-			}
-		}
-		return jars;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddJarAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddJarAction.java
deleted file mode 100644
index 9fb21d8..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddJarAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Adds an internal jar to the runtime class path.
- */
-public class AddJarAction extends RuntimeClasspathAction {
-
-	public AddJarAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AddJarAction.Add_&JARs_1"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts for a jar to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-		
-		ISelectionStatusValidator validator= new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				for (int i= 0; i < selection.length; i++) {
-					if (selection[i] instanceof IFile) {
-						IFile file = (IFile)selection[i];
-						String ext = file.getFileExtension();
-						if (ext.equalsIgnoreCase("jar") || ext.equalsIgnoreCase("zip")) { //$NON-NLS-1$ //$NON-NLS-2$
-							// OK
-						} else {
-							return new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, ActionMessages.getString("AddJarAction.Selection_must_be_a_jar_or_zip_4"), null); //$NON-NLS-1$
-						}
-					} else {
-						return new Status(IStatus.ERROR, JDIDebugPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, ActionMessages.getString("AddJarAction.Selection_must_be_a_jar_or_zip_4"), null); //$NON-NLS-1$
-					}
-					
-				}
-				return new Status(IStatus.OK, JDIDebugPlugin.getUniqueIdentifier(), 0, "", null); //$NON-NLS-1$
-			}			
-		};
-		ViewerFilter filter= new ObjectFilter(getSelectedJars());
-		
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), lp, cp);
-		dialog.setValidator(validator);
-		dialog.setTitle(ActionMessages.getString("AddJarAction.JAR_Selection_7")); //$NON-NLS-1$
-		dialog.setMessage(ActionMessages.getString("AddJarAction.Choose_jars_to_add__8")); //$NON-NLS-1$
-		dialog.addFilter(filter);
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());	
-
-		if (dialog.open() == dialog.OK) {
-			Object[] elements= dialog.getResult();
-			IRuntimeClasspathEntry[] res= new IRuntimeClasspathEntry[elements.length];
-			for (int i= 0; i < res.length; i++) {
-				IResource elem= (IResource)elements[i];
-				res[i]= JavaRuntime.newArchiveRuntimeClasspathEntry(elem);
-			}
-			getViewer().addEntries(res);
-		}
-					
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled();
-	}
-	
-	/**
-	 * Returns a list of resources of currently selected jars
-	 */
-	protected List getSelectedJars() {
-		List list = getEntiresAsList();
-		List jars = new ArrayList();
-		Iterator iter = list.iterator();
-		while (iter.hasNext()) {
-			IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry)iter.next();
-			if (entry.getType() == IRuntimeClasspathEntry.ARCHIVE) {
-				IResource res = entry.getResource();
-				if (res != null && res instanceof IFile) {
-					jars.add(res);
-				}
-			}
-		}
-		return jars;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java
deleted file mode 100644
index 773d9c6..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddProjectAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-/**
- * Adds a project to the runtime class path.
- */
-public class AddProjectAction extends RuntimeClasspathAction {
-
-	public AddProjectAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AddProjectAction.Add_Project_1"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts for a project to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-		List projects = getPossibleAdditions();
-		
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle(ActionMessages.getString("AddProjectAction.Project_Selection_2")); //$NON-NLS-1$
-		dialog.setMessage(ActionMessages.getString("AddProjectAction.Choose_&project(s)_to_add__3")); //$NON-NLS-1$
-		dialog.setElements(projects.toArray());
-		dialog.setMultipleSelection(true);
-		
-		if (dialog.open() == dialog.OK) {			
-			Object[] selections = dialog.getResult();
-			IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[selections.length];
-			for (int i = 0; i < selections.length; i++) {
-				entries[i] = JavaRuntime.newProjectRuntimeClasspathEntry((IJavaProject)selections[i]);
-			}
-			getViewer().addEntries(entries);
-		}				
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled() && !getPossibleAdditions().isEmpty();
-	}
-	
-	/**
-	 * Returns the possible projects that can be added
-	 */
-	protected List getPossibleAdditions() {
-		IJavaProject[] projects;
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			projects= JavaCore.create(root).getJavaProjects();
-		} catch (JavaModelException e) {
-			JDIDebugUIPlugin.log(e);
-			projects= new IJavaProject[0];
-		}
-		List remaining = new ArrayList();
-		for (int i = 0; i < projects.length; i++) {
-			remaining.add(projects[i]);
-		}
-		List alreadySelected = new ArrayList();
-		IRuntimeClasspathEntry[] entries = getViewer().getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i].getType() == IRuntimeClasspathEntry.PROJECT) {
-				IResource res = root.findMember(entries[i].getPath());
-				IJavaProject jp = (IJavaProject)JavaCore.create(res);
-				alreadySelected.add(jp);
-			}
-		}
-		remaining.removeAll(alreadySelected);
-		return remaining;		
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddVariableAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddVariableAction.java
deleted file mode 100644
index 1bbccc3..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AddVariableAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.NewVariableEntryDialog;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Adds a variable to the runtime class path.
- */
-public class AddVariableAction extends RuntimeClasspathAction {
-
-	public AddVariableAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AddVariableAction.Add_Variables_1"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts for variables to add.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-		
-		NewVariableEntryDialog dialog = new NewVariableEntryDialog(getShell(), ActionMessages.getString("AddVariableAction.Variable_Selection_1"), null); //$NON-NLS-1$
-		
-		if (dialog.open() == dialog.OK) {			
-			IPath[] paths = dialog.getResult();
-			IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[paths.length];
-			for (int i = 0; i < paths.length; i++) {
-				entries[i] = JavaRuntime.newVariableRuntimeClasspathEntry(paths[i]);
-			}
-			getViewer().addEntries(entries);
-		}				
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled();
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java
deleted file mode 100644
index 8aacf67..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/AttachSourceAction.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.internal.debug.ui.launcher.SourceAttachmentBlock;
-import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
-import org.eclipse.jdt.internal.ui.dialogs.StatusDialog;
-import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Attach source to an archive or variable.
- */
-public class AttachSourceAction extends RuntimeClasspathAction {
-	
-	private IRuntimeClasspathEntry fEntry;
-
-	// a dialog to set the source attachment properties
-	private class SourceAttachmentDialog extends StatusDialog implements IStatusChangeListener {
-		
-		private SourceAttachmentBlock fSourceAttachmentBlock;
-				
-		public SourceAttachmentDialog(Shell parent, IRuntimeClasspathEntry entry) {
-			super(parent);
-			setTitle(MessageFormat.format(ActionMessages.getString("AttachSourceAction.Attachments_For_____{0}_____1"),new String[] {entry.getPath().toString()})); //$NON-NLS-1$
-			fSourceAttachmentBlock= new SourceAttachmentBlock(ResourcesPlugin.getWorkspace().getRoot(), this, entry);
-		}
-		
-		/*
-		 * @see Windows#configureShell
-		 */
-		protected void configureShell(Shell newShell) {
-			super.configureShell(newShell);
-			WorkbenchHelp.setHelp(newShell, IJavaHelpContextIds.SOURCE_ATTACHMENT_DIALOG);
-		}		
-				
-		protected Control createDialogArea(Composite parent) {
-			Composite composite= (Composite)super.createDialogArea(parent);
-						
-			Control inner= fSourceAttachmentBlock.createControl(composite);
-			inner.setLayoutData(new GridData(GridData.FILL_BOTH));
-			return composite;
-		}
-		
-		public void statusChanged(IStatus status) {
-			updateStatus(status);
-		}
-		
-		public IPath getSourceAttachmentPath() {
-			return fSourceAttachmentBlock.getSourceAttachmentPath();
-		}
-		
-		public IPath getSourceAttachmentRootPath() {
-			return fSourceAttachmentBlock.getSourceAttachmentRootPath();
-		}
-				
-	}
-	
-	public AttachSourceAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("AttachSourceAction.Attac&h_Source..._2"), viewer); //$NON-NLS-1$
-	}	
-
-	/**
-	 * Prompts source attachment.
-	 * 
-	 * @see IAction#run()
-	 */	
-	public void run() {
-		SourceAttachmentDialog dialog = new SourceAttachmentDialog(getShell(), fEntry);
-		int res = dialog.open();
-		if (res == Dialog.OK) {
-			fEntry.setSourceAttachmentPath(dialog.getSourceAttachmentPath());
-			fEntry.setSourceAttachmentRootPath(dialog.getSourceAttachmentRootPath());
-			getViewer().refresh(fEntry);
-		}
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		if (getViewer().isEnabled() && selection.size() == 1) {
-			fEntry = (IRuntimeClasspathEntry)selection.getFirstElement();
-			int type = fEntry.getType();
-			return type == IRuntimeClasspathEntry.VARIABLE || type == IRuntimeClasspathEntry.ARCHIVE;
-		} else {
-			return false;
-		} 
-	}
-	
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java
deleted file mode 100644
index 3bd68c9..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointHitCountAction.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.Iterator;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.IInputValidator;

-import org.eclipse.jface.dialogs.InputDialog;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-

-public class BreakpointHitCountAction extends ObjectActionDelegate {

-

-	private static final String INITIAL_VALUE= "1"; //$NON-NLS-1$

-

-	/**

-	 * A dialog that sets the focus to the text area.

-	 */

-	class HitCountDialog extends InputDialog {

-		

-		private Button fEnabledButton;

-		private boolean fHitCountEnabled;

-		

-		protected  HitCountDialog(Shell parentShell,

-									String dialogTitle,

-									String dialogMessage,

-									String initialValue,

-									IInputValidator validator) {

-			super(parentShell, dialogTitle, dialogMessage, initialValue, validator);

-		}

-		

-		/**

-		 * @see Window#close()

-		 */

-		public boolean close() {

-			setHitCountEnabled(getEnabledButton().getSelection());

-			return super.close();

-		}

-		/**

-		 * @see Dialog#createDialogArea(Composite)

-		 */

-		protected Control createDialogArea(Composite parent) {

-			Composite area= (Composite)super.createDialogArea(parent);

-			Button b= new Button(area, SWT.CHECK);

-			GridData data = new GridData(

-				GridData.GRAB_HORIZONTAL |

-				GridData.HORIZONTAL_ALIGN_FILL);

-			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);;

-			b.setLayoutData(data);

-			b.setFont(parent.getFont());

-			b.setText(ActionMessages.getString("BreakpointHitCountAction.Enable_Hit_Count_1")); //$NON-NLS-1$

-			b.setSelection(true);

-			b.addSelectionListener(new SelectionListener() {

-				public void widgetSelected(SelectionEvent e) {

-					boolean enabled= getEnabledButton().getSelection();

-					getText().setEnabled(enabled);

-					if (enabled) {

-						validateInput();

-					} else {

-						getOkButton().setEnabled(true);

-						getErrorMessageLabel().setText(""); //$NON-NLS-1$

-					}

-				}

-				

-				public void widgetDefaultSelected(SelectionEvent e) {

-				}

-			});

-			setEnabledButton(b);

-			return area;

-		}

-

-		protected Button getEnabledButton() {

-			return fEnabledButton;

-		}

-

-		protected void setEnabledButton(Button enabledButton) {

-			fEnabledButton = enabledButton;

-		}

-

-		protected boolean isHitCountEnabled() {

-			return fHitCountEnabled;

-		}

-

-		protected void setHitCountEnabled(boolean hitCountEnabled) {

-			fHitCountEnabled = hitCountEnabled;

-		}

-	}

-

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		IStructuredSelection selection= getCurrentSelection();

-		if (selection == null) {

-			return;

-		}

-		Iterator enum= selection.iterator();

-		if (!enum.hasNext()) {

-			return;

-		}

-

-		while (enum.hasNext()) {

-			IJavaBreakpoint breakpoint= (IJavaBreakpoint)enum.next();

-			try {

-				int oldHitCount= breakpoint.getHitCount();

-				int newHitCount= hitCountDialog(breakpoint);

-				if (newHitCount != -1) {					

-					if (oldHitCount == newHitCount && newHitCount == 0) {

-						return;

-					}

-					breakpoint.setHitCount(newHitCount);

-				}

-			} catch (CoreException ce) {

-				JDIDebugUIPlugin.errorDialog(ActionMessages.getString("BreakpointHitCountAction.Exception_occurred_attempting_to_set_hit_count_1"), ce); //$NON-NLS-1$

-			}

-		}

-	}

-	

-	protected int hitCountDialog(IJavaBreakpoint breakpoint) {

-		String title= ActionMessages.getString("BreakpointHitCountAction.Set_Breakpoint_Hit_Count_2"); //$NON-NLS-1$

-		String message= ActionMessages.getString("BreakpointHitCountAction.&Enter_the_new_hit_count_for_the_breakpoint__3"); //$NON-NLS-1$

-		IInputValidator validator= new IInputValidator() {

-			int hitCount= -1;

-			public String isValid(String value) {

-				try {

-					hitCount= Integer.valueOf(value.trim()).intValue();

-				} catch (NumberFormatException nfe) {

-					hitCount= -1;

-				}

-				if (hitCount < 1) {

-					return ActionMessages.getString("BreakpointHitCountAction.Value_must_be_positive_integer"); //$NON-NLS-1$

-				}

-				//no error

-				return null;

-			}

-		};

-

-		int currentHitCount= 0;

-		try {

-			currentHitCount = breakpoint.getHitCount();

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		String initialValue;

-		if (currentHitCount > 0) {

-			initialValue= Integer.toString(currentHitCount);

-		} else {

-			initialValue= INITIAL_VALUE;

-		}

-		Shell activeShell= JDIDebugUIPlugin.getActiveWorkbenchShell();

-		HitCountDialog dialog= new HitCountDialog(activeShell, title, message, initialValue, validator);

-		if (dialog.open() != dialog.OK) {

-			return -1;

-		}

-		if (dialog.isHitCountEnabled()) {

-			return Integer.parseInt(dialog.getValue().trim());

-		} else {

-			return 0;

-		}

-	}

-

-	protected boolean isEnabledFor(Object element) {

-		return element instanceof IJavaBreakpoint;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifier.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifier.java
deleted file mode 100644
index 8fd686d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointLocationVerifier.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jdt.core.ToolFactory;

-import org.eclipse.jdt.core.compiler.IScanner;

-import org.eclipse.jdt.core.compiler.ITerminalSymbols;

-import org.eclipse.jdt.core.compiler.InvalidInputException;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-

-public class BreakpointLocationVerifier {

-

-	/**

-	 * Returns the line number closest to the given line number that represents a

-	 * valid location for a breakpoint in the given document, or -1 if a valid location

-	 * cannot be found.

-	 */

-	public int getValidBreakpointLocation(IDocument doc, int lineNumber) {

-

-		IScanner scanner = ToolFactory.createScanner(false, false, false, false);

-		boolean found = false;

-		int start = 0, length = 0, token = 0, lastToken = 0;

-

-		while (!found) {

-			try {

-				start = doc.getLineOffset(lineNumber);

-				length = doc.getLineLength(lineNumber);

-				char[] txt = doc.get(start, length).toCharArray();

-				scanner.setSource(txt);

-				token = scanner.getNextToken();

-				if (token == ITerminalSymbols.TokenNameEQUAL) {

-					break;

-				}

-				lastToken = 0;

-

-				while (token != ITerminalSymbols.TokenNameEOF) {

-					if (token == ITerminalSymbols.TokenNameERROR) {

-						lineNumber++;

-						break;

-					}

-					if (token == ITerminalSymbols.TokenNameIdentifier) {

-						if (lastToken == ITerminalSymbols.TokenNameIdentifier

-							|| isPrimitiveTypeToken(lastToken)

-							|| lastToken == ITerminalSymbols.TokenNameRBRACKET) {

-							//var declaration..is there initialization 

-							//OR method parameters on a line all by themselves

-							lastToken = token;

-							token = scanner.getNextToken();

-							if (token == ITerminalSymbols.TokenNameEQUAL) {

-								found = true;

-								break;

-							}

-						}

-						if (lastToken == ITerminalSymbols.TokenNameMULTIPLY) {

-							//internal comment line starting with '*'

-							break;

-						}

-					} else if (isNonIdentifierValidToken(token)) {

-						found = true;

-						break;

-					} else if (

-						lastToken == ITerminalSymbols.TokenNameIdentifier

-							&& token != ITerminalSymbols.TokenNameLBRACKET) {

-						found = true;

-						break;

-					} else if (

-						lastToken == ITerminalSymbols.TokenNameLBRACKET

-							&& token == ITerminalSymbols.TokenNameRBRACKET) {

-						//var declaration..is there initialization

-						lastToken = token;

-						token = scanner.getNextToken();

-						if (token == ITerminalSymbols.TokenNameSEMICOLON) {

-							//no init

-							break;

-						} else if (token == ITerminalSymbols.TokenNameEQUAL) {

-							found = true;

-							break;

-						}

-

-						continue;

-					}

-

-					lastToken = token;

-					token = scanner.getNextToken();

-				}

-				if (!found) {

-					lineNumber++;

-				}

-			} catch (BadLocationException ble) {

-				return -1;

-			} catch (InvalidInputException ie) {

-				//start of a comment "/**" or "/*"

-				lineNumber++;

-			}

-		}

-		// add 1 to the line number - Document is 0 based, JDI is 1 based

-		return lineNumber + 1;

-	}

-

-	protected boolean isPrimitiveTypeToken(int token) {

-		switch (token) {

-			case ITerminalSymbols.TokenNameboolean :

-			case ITerminalSymbols.TokenNamebyte :

-			case ITerminalSymbols.TokenNamechar :

-			case ITerminalSymbols.TokenNamedouble :

-			case ITerminalSymbols.TokenNamefloat :

-			case ITerminalSymbols.TokenNameint :

-			case ITerminalSymbols.TokenNamelong :

-			case ITerminalSymbols.TokenNameshort :

-				return true;

-			default :

-				return false;

-		}

-	}

-

-	protected boolean isNonIdentifierValidToken(int token) {

-		switch (token) {

-			case ITerminalSymbols.TokenNamebreak :

-			case ITerminalSymbols.TokenNamecontinue :

-			case ITerminalSymbols.TokenNamereturn :

-			case ITerminalSymbols.TokenNamethis :

-			case ITerminalSymbols.TokenNamesuper :

-				return true;

-			default :

-				return false;

-		}

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointSuspendPolicyToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointSuspendPolicyToggleAction.java
deleted file mode 100644
index 61fc568..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointSuspendPolicyToggleAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
- 
-/**
- * Toggles whether a breakpoint suspends a VM or only
- * the event thread.
- */
-public class BreakpointSuspendPolicyToggleAction extends BreakpointToggleAction {
-
-	/**
-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)
-	 */
-	public void doAction(IJavaBreakpoint breakpoint) throws CoreException {
-		if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_THREAD) {
-			breakpoint.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-		} else {
-			breakpoint.setSuspendPolicy(IJavaBreakpoint.SUSPEND_THREAD);
-		}
-	}
-
-	/**
-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)
-	 */
-	protected boolean getToggleState(IJavaBreakpoint breakpoint) throws CoreException {
-		return false;
-	}
-
-	/**
-	 * @see BreakpointToggleAction#isEnabledFor(Object)
-	 */
-	public boolean isEnabledFor(Object element) {
-		return element instanceof IJavaBreakpoint;
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		super.selectionChanged(action, selection);
-		if (action.isEnabled()) {
-			IJavaBreakpoint bp = (IJavaBreakpoint)((IStructuredSelection)selection).getFirstElement();
-			update(action, bp);
-		}
-	}
-	
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void update(IAction action, IJavaBreakpoint breakpoint) {
-		try {
-			if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_THREAD) {
-				action.setText(ActionMessages.getString("BreakpointSuspendPolicy.Suspend_&VM_1")); //$NON-NLS-1$
-			} else {
-				action.setText(ActionMessages.getString("BreakpointSuspendPolicy.Suspend_&Thread_2")); //$NON-NLS-1$
-			}
-		} catch (CoreException e) {
-			 JDIDebugUIPlugin.log(e);
-		}
-	}	
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
deleted file mode 100644
index b6e316c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/BreakpointToggleAction.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.Iterator;

-

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IMarkerDelta;

-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.IJavaBreakpoint;

-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-

-public abstract class BreakpointToggleAction implements IObjectActionDelegate, IBreakpointListener, IPartListener {

-	

-	private IStructuredSelection fSelection;

-	private IAction fAction;

-	private IWorkbenchPart fPart;

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		IStructuredSelection selection= getStructuredSelection();

-		Iterator enum= selection.iterator();

-		while (enum.hasNext()) {

-			try {

-				IJavaBreakpoint breakpoint= (IJavaBreakpoint) enum.next();

-				doAction(breakpoint);

-			} catch (CoreException e) {

-				String title= ActionMessages.getString("BreakpointAction.Breakpoint_configuration_1"); //$NON-NLS-1$

-				String message= ActionMessages.getString("BreakpointAction.Exceptions_occurred_attempting_to_modify_breakpoint._2"); //$NON-NLS-1$

-				ExceptionHandler.handle(e, title, message);

-			}			

-		}

-	}

-

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		setAction(action);

-		if (selection.isEmpty()) {

-			setStructuredSelection(null);

-			return;

-		}

-		if (selection instanceof IStructuredSelection) {

-			setStructuredSelection((IStructuredSelection)selection);

-			boolean enabled= getStructuredSelection().size() == 1 

-				&& isEnabledFor(getStructuredSelection().getFirstElement());

-			action.setEnabled(enabled);

-			if (enabled) {

-				IBreakpoint breakpoint= (IBreakpoint)getStructuredSelection().getFirstElement();

-				if (breakpoint instanceof IJavaBreakpoint) {

-					try {

-						action.setChecked(getToggleState((IJavaBreakpoint) breakpoint));

-					} catch (CoreException e) {

-						JDIDebugUIPlugin.log(e);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Toggle the state of this action

-	 */

-	public abstract void doAction(IJavaBreakpoint breakpoint) throws CoreException;

-	

-	/**

-	 * Returns whether this action is currently toggled on

-	 */

-	protected abstract boolean getToggleState(IJavaBreakpoint breakpoint) throws CoreException;

-	

-	/**

-	 * Get the current selection

-	 */

-	protected IStructuredSelection getStructuredSelection() {

-		return fSelection;

-	}

-	

-	protected void setStructuredSelection(IStructuredSelection selection) {

-		fSelection= selection;

-	}

-	

-	public abstract boolean isEnabledFor(Object element);

-

-	/**

-	 * Get the breakpoint manager for the debug plugin

-	 */

-	protected IBreakpointManager getBreakpointManager() {

-		return DebugPlugin.getDefault().getBreakpointManager();		

-	}

-	

-	/**

-	 * Get the breakpoint associated with the given marker

-	 */

-	protected IBreakpoint getBreakpoint(IMarker marker) {

-		return getBreakpointManager().getBreakpoint(marker);

-	}

-

-	protected IAction getAction() {

-		return fAction;

-	}

-

-	protected void setAction(IAction action) {

-		fAction = action;

-	}

-	

-	/**

-	 * @see IBreakpointListener#breakpointAdded(IBreakpoint)

-	 */

-	public void breakpointAdded(IBreakpoint breakpoint) {

-	}

-

-	/**

-	 * @see IBreakpointListener#breakpointChanged(IBreakpoint, IMarkerDelta)

-	 */

-	public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {

-		if (getAction() != null) {

-			IStructuredSelection selection= getStructuredSelection();

-			if (selection != null) {

-				IBreakpoint selectedBreakpoint= (IBreakpoint)selection.getFirstElement();

-				if (selectedBreakpoint.equals(breakpoint)) {

-					selectionChanged(getAction(), selection);

-				}

-			}			

-		}

-	}

-

-	/**

-	 * @see IBreakpointListener#breakpointRemoved(IBreakpoint, IMarkerDelta)

-	 */

-	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {

-	}

-	

-	protected IWorkbenchPart getPart() {

-		return fPart;

-	}

-

-	protected void setPart(IWorkbenchPart part) {

-		fPart = part;

-	}

-	

-	/**

-	 * @see IPartListener#partActivated(IWorkbenchPart)

-	 */

-	public void partActivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)

-	 */

-	public void partBroughtToTop(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partClosed(IWorkbenchPart)

-	 */

-	public void partClosed(IWorkbenchPart part) {

-		if (part == getPart()) {

-			getBreakpointManager().removeBreakpointListener(this);

-			part.getSite().getPage().removePartListener(this);

-		}

-	}

-

-	/**

-	 * @see IPartListener#partDeactivated(IWorkbenchPart)

-	 */

-	public void partDeactivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partOpened(IWorkbenchPart)

-	 */

-	public void partOpened(IWorkbenchPart part) {

-	}

-	

-	/**

-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-		IWorkbenchPart oldPart= getPart();

-		if (oldPart != null) {

-			getPart().getSite().getPage().removePartListener(this);			

-		}	

-		

-		getBreakpointManager().addBreakpointListener(this);

-		setPart(targetPart);

-		targetPart.getSite().getPage().addPartListener(this);	

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java
deleted file mode 100644
index 2296a17..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DisplayAction.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.text.MessageFormat;

-

-import org.eclipse.debug.core.DebugException;

-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.core.dom.Message;

-import org.eclipse.jdt.debug.core.IJavaType;

-import org.eclipse.jdt.debug.core.IJavaValue;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-import org.eclipse.jdt.debug.eval.IEvaluationResult;

-import org.eclipse.jdt.internal.debug.ui.display.IDataDisplay;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * Displays the result of an evaluation in the display view

- */

-public class DisplayAction extends EvaluateAction implements IValueDetailListener {

-	

-	private Object fLock= new Object();

-	

-	/**

-	 * The debug model presentation used for computing toString

-	 */

-	private IDebugModelPresentation fPresentation= DebugUITools.newDebugModelPresentation(JDIDebugModel.getPluginIdentifier());

-	/**

-	 * The result of a toString evaluation returned asynchronously by the

-	 * debug model.

-	 */

-	private String fResult;

-	

-	/**

-	 * Reports errors to the user via the normal means (@see EvaluateAction#reportErrors(IEvaluationResult))

-	 * and displays a failed evaluation message in the display view.

-	 */

-	protected void reportErrors(IEvaluationResult result) {

-		String message= getErrorMessage(result);

-		IDataDisplay dataDisplay= getDataDisplay();

-		if (dataDisplay != null) {

-			if (message.length() != 0) {

-				dataDisplay.displayExpressionValue(MessageFormat.format(ActionMessages.getString("DisplayAction.(evaluation_failed)_Reason"), new String[] {message})); //$NON-NLS-1$

-			} else {

-				dataDisplay.displayExpressionValue(ActionMessages.getString("DisplayAction.(evaluation_failed)_1")); //$NON-NLS-1$

-			}

-		}

-	}

-	

-	protected String getErrorMessage(Message[] errors) {

-		String message= ""; //$NON-NLS-1$

-		for (int i= 0; i < errors.length; i++) {

-			Message error= errors[i];

-			//more than a warning

-			String msg= error.getMessage();

-			if (i == 0) {

-				message= "\t\t" + msg; //$NON-NLS-1$

-			} else {

-				message= MessageFormat.format(ActionMessages.getString("DisplayAction.error.problem_append_pattern"), new Object[] { message, msg }); //$NON-NLS-1$

-			}

-		}

-		return message;

-	}

-	

-	/**

-	 * @see EvaluateAction#displayResult(IEvaluationResult)

-	 */

-	protected void displayResult(IEvaluationResult result) {

-		IJavaValue value= result.getValue();

-		String resultString= " "; //$NON-NLS-1$

-		IDataDisplay dataDisplay= getDataDisplay();

-		try {

-			String sig= null;

-			IJavaType type= value.getJavaType();

-			if (type != null) {

-				sig= type.getSignature();

-			}

-			if ("V".equals(sig)) { //$NON-NLS-1$

-				resultString= ActionMessages.getString("DisplayAction.no_result_value"); //$NON-NLS-1$

-			} else {

-				if (sig != null) {

-					resultString= MessageFormat.format(ActionMessages.getString("DisplayAction.type_name_pattern"), new Object[] { value.getReferenceTypeName() }); //$NON-NLS-1$

-				}

-				resultString= MessageFormat.format(ActionMessages.getString("DisplayAction.result_pattern"), new Object[] { resultString, evaluateToString(value) }); //$NON-NLS-1$

-			}

-		} catch(DebugException x) {

-			dataDisplay.displayExpressionValue(getExceptionMessage(x));

-		}

-		

-		if (dataDisplay != null) {

-			dataDisplay.displayExpressionValue(resultString);

-		}

-	}

-	

-	/**

-	 * Returns the result of evaluating 'toString' on the given

-	 * value.

-	 * 

-	 * @param value object or primitive data type the 'toString'

-	 *  is required for

-	 * @param thread the thread in which to evaluate 'toString'

-	 * @return the result of evaluating toString

-	 * @exception DebugException if an exception occurs during the

-	 *  evaluation.

-	 */

-	protected String evaluateToString(IJavaValue value) throws DebugException {

-		fResult= null;

-		fPresentation.computeDetail(value, this);

-		synchronized (fLock) {

-			if (fResult == null) {

-				try {

-					fLock.wait(20000);

-				} catch (InterruptedException e) {

-					return ActionMessages.getString("DisplayAction.toString_interrupted"); //$NON-NLS-1$

-				}

-			}

-		}

-		return fResult;

-	}

-	

-	/**

-	 * @see IValueDetailListener#detailComputed(IValue, String)

-	 */

-	public void detailComputed(IValue value, final String result) {

-		fResult= result;

-		synchronized (fLock) {

-			fLock.notifyAll();

-		}

-	}

-	

-	protected void run() {

-		IWorkbenchPart part= getTargetPart();

-		if (part instanceof JavaSnippetEditor) {

-			((JavaSnippetEditor)part).evalSelection(JavaSnippetEditor.RESULT_DISPLAY);

-			return;

-		}

-		super.run();	

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DropToFrameAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DropToFrameAction.java
deleted file mode 100644
index 3449553..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/DropToFrameAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.Iterator;

-

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.jdt.debug.core.IJavaStackFrame;

-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-public class DropToFrameAction extends ObjectActionDelegate {

-

-	protected boolean isEnabledFor(Object element) {

-		IJavaStackFrame frame= (IJavaStackFrame)element;

-		return frame != null && frame.isSuspended() && frame.supportsDropToFrame();

-	}

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		IStructuredSelection selection= getCurrentSelection();

-		if (selection == null) {

-			return;

-		}

-		Iterator enum= selection.iterator();

-		

-		while (enum.hasNext()) {

-			IJavaStackFrame frame= (IJavaStackFrame)enum.next();

-			try {

-				frame.dropToFrame();

-			} catch (DebugException de) {

-				String title= ActionMessages.getString("DropToFrameAction.Drop_to_Frame_1"); //$NON-NLS-1$

-				String message= ActionMessages.getString("DropToFrameAction.Exceptions_occurred_attempting_to_drop_to_frame._2"); //$NON-NLS-1$

-				ExceptionHandler.handle(de, title, message);

-			}

-		}

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerAction.java
deleted file mode 100644
index c13a71c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class EnableDisableBreakpointRulerAction extends AbstractBreakpointRulerAction {
-	
-	/**
-	 * Creates the action to enable/disable breakpoints
-	 */
-	public EnableDisableBreakpointRulerAction(ITextEditor editor, IVerticalRulerInfo info) {
-		setInfo(info);
-		setTextEditor(editor);
-		setText(ActionMessages.getString("EnableDisableBreakpointRulerAction.&Enable_Breakpoint_1")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see Action#run()
-	 */
-	public void run() {
-		if (getBreakpoint() != null) {
-			try {
-				getBreakpoint().setEnabled(!getBreakpoint().isEnabled());
-			} catch (CoreException e) {
-				ErrorDialog.openError(getTextEditor().getEditorSite().getShell(), ActionMessages.getString("EnableDisableBreakpointRulerAction.Enabling/disabling_breakpoints_2"), ActionMessages.getString("EnableDisableBreakpointRulerAction.Exceptions_occurred_enabling_disabling_the_breakpoint_3"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	/**
-	 * @see IUpdate#update()
-	 */
-	public void update() {
-		setBreakpoint(determineBreakpoint());
-		if (getBreakpoint() == null) {
-			setEnabled(false);
-			return;
-		}
-		setEnabled(true);
-		try {
-			boolean enabled= getBreakpoint().isEnabled();
-			setText(enabled ? ActionMessages.getString("EnableDisableBreakpointRulerAction.&Disable_Breakpoint_4") : ActionMessages.getString("EnableDisableBreakpointRulerAction.&Enable_Breakpoint_5")); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
deleted file mode 100644
index 4735f9d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class EnableDisableBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-	
-	/**
-	 * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo)
-	 */
-	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		return new EnableDisableBreakpointRulerAction(editor, rulerInfo);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EntryToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EntryToggleAction.java
deleted file mode 100644
index 911b3f5..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EntryToggleAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;

-

-public class EntryToggleAction extends BreakpointToggleAction {

-

-	/**

-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)

-	 */

-	protected boolean getToggleState(IJavaBreakpoint breakpoint) throws CoreException {

-		return ((IJavaMethodBreakpoint)breakpoint).isEntry();

-	}

-

-	/**

-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)

-	 */

-	public void doAction(IJavaBreakpoint breakpoint) throws CoreException {

-		((IJavaMethodBreakpoint)breakpoint).setEntry(!((IJavaMethodBreakpoint)breakpoint).isEntry());

-	}

-

-	/**

-	 * @see BreakpointToggleAction#isEnabledFor(Object)

-	 */

-	public boolean isEnabledFor(Object element) {

-		return element instanceof IJavaMethodBreakpoint;

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
deleted file mode 100644
index 79ecc33..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/EvaluateAction.java
+++ /dev/null
@@ -1,673 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.text.MessageFormat;

-import java.util.Iterator;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.debug.core.DebugEvent;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.ILaunch;

-import org.eclipse.debug.core.model.ISourceLocator;

-import org.eclipse.debug.core.model.IStackFrame;

-import org.eclipse.debug.core.model.IThread;

-import org.eclipse.debug.core.model.IValue;

-import org.eclipse.debug.ui.DebugUITools;

-import org.eclipse.debug.ui.IDebugModelPresentation;

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.debug.ui.IDebugView;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.dom.Message;

-import org.eclipse.jdt.debug.core.IJavaArray;

-import org.eclipse.jdt.debug.core.IJavaDebugTarget;

-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.IJavaValue;

-import org.eclipse.jdt.debug.core.IJavaVariable;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-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.ui.IJavaDebugUIConstants;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.debug.ui.display.DataDisplay;

-import org.eclipse.jdt.internal.debug.ui.display.IDataDisplay;

-import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.ISnippetStateChangedListener;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookLauncher;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.jface.text.ITextViewer;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.IEditorActionDelegate;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IViewActionDelegate;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.IWorkbenchWindowActionDelegate;

-import org.eclipse.ui.PartInitException;

-

-import com.sun.jdi.InvocationException;

-import com.sun.jdi.ObjectReference;

-

-

-/**

- * Action to do simple code evaluation. The evaluation

- * is done in the UI thread and the expression and result are

- * displayed using the IDataDisplay.

- */

-public abstract class EvaluateAction implements IEvaluationListener, IWorkbenchWindowActionDelegate, IObjectActionDelegate, IEditorActionDelegate, IPartListener, IViewActionDelegate, ISnippetStateChangedListener {

-

-	private IAction fAction;

-	private IWorkbenchPart fTargetPart;

-	private IEditorPart fTargetEditor;

-	private IWorkbenchWindow fWindow;

-	private Object fSelection;

-	/**

-	 * Used in evaluationTimedOut

-	 */

-	private boolean fKeepWaiting;

-	

-	/**

-	 * Used to resolve editor input for selected stack frame

-	 */

-	private IDebugModelPresentation fPresentation;

-			

-	public EvaluateAction() {

-		super();

-	}

-	

-	/**

-	 * Returns the 'object' context for this evaluation,

-	 * or <code>null</code> if none. If the evaluation is being performed

-	 * in the context of the variables view/inspector. Then

-	 * perform the evaluation in the context of the

-	 * selected value.

-	 * 

-	 * @return Java object or <code>null</code>

-	 */

-	protected IJavaObject getObjectContext() {

-		IWorkbenchPage page= JDIDebugUIPlugin.getDefault().getActivePage();

-		if (page != null) {

-			IWorkbenchPart activePart= page.getActivePart();

-			if (activePart != null) {

-				IDebugView a = (IDebugView)activePart.getAdapter(IDebugView.class);

-				if (a != null) {

-					if (a.getViewer() != null) {

-						ISelection s = a.getViewer().getSelection();

-						if (s instanceof IStructuredSelection) {

-							IStructuredSelection structuredSelection = (IStructuredSelection)s;

-							if (structuredSelection.size() == 1) {

-								Object selection= structuredSelection.getFirstElement();

-								if (selection instanceof IJavaVariable) {

-									IJavaVariable var = (IJavaVariable)selection;

-									// if 'this' is selected, use stack frame context

-									try {

-										if (!var.getName().equals("this")) { //$NON-NLS-1$

-											IValue value= var.getValue();

-											if (value instanceof IJavaObject && !(value instanceof IJavaArray)) {

-												return (IJavaObject)value;

-											}

-										} 

-									} catch (DebugException e) {

-										JDIDebugUIPlugin.log(e);

-									}

-								} else if (selection instanceof JavaInspectExpression) {

-									IValue value= ((JavaInspectExpression)selection).getValue();

-									if (value instanceof IJavaObject && !(value instanceof IJavaArray)) {

-										return (IJavaObject)value;

-									}

-								}

-							}

-						}

-					}

-				}

-			}

-		}

-		return null;		

-	}

-	

-	/**

-	 * Finds the currently selected stack frame in the UI.

-	 * Stack frames from a scrapbook launch are ignored.

-	 */

-	protected IStackFrame getStackFrameContext() {

-		IAdaptable context = DebugUITools.getDebugContext();

-		if (context != null) {

-			if (context instanceof IStackFrame) {

-				IStackFrame frame= (IStackFrame)context;

-				if (frame.getLaunch().getAttribute(ScrapbookLauncher.SCRAPBOOK_LAUNCH) == null) {

-					return frame;

-				}

-			}

-			if (context instanceof IThread) {

-				try {

-					IThread thread= (IThread)context;

-					if (thread.getLaunch().getAttribute(ScrapbookLauncher.SCRAPBOOK_LAUNCH) == null) {

-						return thread.getTopStackFrame();

-					}

-				} catch (DebugException e) {

-					JDIDebugUIPlugin.log(e);

-				}

-			}

-		}

-		return null;

-	}

-	

-	/**

-	 * @see IEvaluationListener#evaluationComplete(IEvaluationResult)

-	 */

-	public void evaluationComplete(final IEvaluationResult result) {

-		final IJavaValue value= result.getValue();

-		if (result.hasErrors() || value != null) {

-			final Display display= JDIDebugUIPlugin.getStandardDisplay();

-			if (display.isDisposed()) {

-				return;

-			}

-			display.asyncExec(new Runnable() {

-				public void run() {

-					if (display.isDisposed()) {

-						return;

-					}

-					if (result.hasErrors()) {

-						reportErrors(result);

-					} else if (value != null) {

-						displayResult(result);

-					}

-				}

-			});

-		}

-	}

-	

-	/**

-	 * Display the given evaluation result.

-	 */

-	abstract protected void displayResult(IEvaluationResult result);	

-	

-	protected void run() {		

-		// eval in context of object or stack frame

-		IJavaObject object = getObjectContext();		

-		IStackFrame stackFrame= getStackFrameContext();

-		if (stackFrame == null) {

-			reportError(ActionMessages.getString("Evaluate.error.message.stack_frame_context")); //$NON-NLS-1$

-			return;

-		}

-		

-		IJavaStackFrame jFrame = null;

-		if (stackFrame != null) {

-			jFrame = (IJavaStackFrame) stackFrame.getAdapter(IJavaStackFrame.class);

-		}

-

-		if (jFrame != null) {

-			IJavaElement javaElement= getJavaElement(stackFrame);

-			if (javaElement != null) {

-				IJavaProject project = javaElement.getJavaProject();

-				IEvaluationEngine engine = null;

-				try {

-					Object selection= getSelectedObject();

-					if (!(selection instanceof String)) {

-						return;

-					}

-					String expression= (String)selection;

-					

-					IDataDisplay dataDisplay= getDataDisplay();

-					if (dataDisplay != null) {

-						dataDisplay.displayExpression(expression);

-					}

-					

-					engine = JDIDebugUIPlugin.getDefault().getEvaluationEngine(project, (IJavaDebugTarget)jFrame.getDebugTarget());

-					if (object == null) {

-						engine.evaluate(expression, jFrame, this, DebugEvent.EVALUATION, true);

-					} else {

-						engine.evaluate(expression, object, (IJavaThread)jFrame.getThread(), this, DebugEvent.EVALUATION, true);

-					}

-					

-				} catch (CoreException e) {

-					reportError(getExceptionMessage(e));

-				}

-			} else {

-				reportError(ActionMessages.getString("Evaluate.error.message.src_context")); //$NON-NLS-1$

-			}

-		} else {

-			reportError(ActionMessages.getString("Evaluate.error.message.eval_adapter")); //$NON-NLS-1$

-		}

-	}

-		

-	protected IJavaElement getJavaElement(IStackFrame stackFrame) {

-		

-		// Get the corresponding element.

-		ILaunch launch = stackFrame.getLaunch();

-		if (launch == null) {

-			return null;

-		}

-		ISourceLocator locator= launch.getSourceLocator();

-		if (locator == null)

-			return null;

-		

-		Object sourceElement = locator.getSourceElement(stackFrame);

-		if (sourceElement instanceof IJavaElement) {

-			return (IJavaElement) sourceElement;

-		}			

-		return null;

-	}

-	

-	/**

-	 * Updates the enabled state of the action that this is a

-	 * delegate for.

-	 */

-	protected void update() {

-		IAction action= getAction();

-		if (action != null) {

-			boolean enabled = false;

-			resolveSelectedObject();

-			Object selection = getSelectedObject();

-			if (selection != null) {

-				if (selection instanceof IStructuredSelection) {

-					//valid selection from the tree viewer in the variables view

-					//for inspect

-					enabled= true;

-				} else {

-					if (getTargetPart() instanceof JavaSnippetEditor) {

-						enabled= true;

-					} else {

-						enabled = getStackFrameContext() != null;

-					}

-				}

-			}

-			action.setEnabled(enabled);

-		}

-	}

-	

-	/**

-	 * Resolves the selected object in the target part, or <code>null</code>

-	 * if there is no selection.

-	 */

-	protected void resolveSelectedObject() {

-		Object selectedObject= null;

-		ISelection selection= getTargetSelection();

-		if (selection instanceof ITextSelection) {

-			String text= ((ITextSelection)selection).getText();

-			if (textHasContent(text)) {

-				selectedObject= text;

-			}

-		} else if (selection instanceof IStructuredSelection) {

-			if (!selection.isEmpty()) {

-				if (getTargetPart().getSite().getId().equals(IDebugUIConstants.ID_DEBUG_VIEW)) {

-					//work on the editor selection

-					setTargetPart(getTargetPart().getSite().getPage().getActiveEditor());

-					selection= getTargetSelection();

-					if (selection instanceof ITextSelection) {

-						String text= ((ITextSelection)selection).getText();

-						if (textHasContent(text)) {

-							selectedObject= text;

-						}

-					}

-				} else {

-					IStructuredSelection ss= (IStructuredSelection)selection;

-					Iterator elements = ss.iterator();

-					while (elements.hasNext()) {

-						if (!(elements.next() instanceof IJavaVariable)) {

-							setSelectedObject(null);

-							return;

-						}

-					}

-					selectedObject= ss;

-				}			

-			}

-		}

-		setSelectedObject(selectedObject);

-	}

-	

-	protected ISelection getTargetSelection() {

-		IWorkbenchPart part = getTargetPart();

-		if (part != null) {

-			ISelectionProvider provider = part.getSite().getSelectionProvider();

-			if (provider != null) {

-				return provider.getSelection();

-			}

-		}

-		return null;

-	}

-	

-	/**

-	 * Resolve an editor input from the source element of the stack frame

-	 * argument, and return whether it's equal to the editor input for the

-	 * editor that owns this action.

-	 */

-	protected boolean compareToEditorInput(IStackFrame stackFrame) {

-		ILaunch launch = stackFrame.getLaunch();

-		if (launch == null) {

-			return false;

-		}

-		ISourceLocator locator= launch.getSourceLocator();

-		if (locator == null) {

-			return false;

-		}

-		Object sourceElement = locator.getSourceElement(stackFrame);

-		if (sourceElement == null) {

-			return false;

-		}

-		IEditorInput sfEditorInput= getDebugModelPresentation().getEditorInput(sourceElement);

-		if (getTargetPart() instanceof IEditorPart) {

-			return ((IEditorPart)getTargetPart()).getEditorInput().equals(sfEditorInput);

-		}

-		return false;

-	}

-	

-	protected Shell getShell() {

-		if (getTargetPart() != null) {

-			return getTargetPart().getSite().getShell();

-		} else {

-			return JDIDebugUIPlugin.getActiveWorkbenchShell();

-		}

-	}

-	

-	protected IDataDisplay getDataDisplay() {

-		IDataDisplay display;

-		IWorkbenchPart part= getTargetPart();

-		if (part != null) {

-			display= (IDataDisplay)part.getAdapter(IDataDisplay.class);

-			if (display != null) {

-				return display;

-			}

-		}

-		IWorkbenchPage page= JDIDebugUIPlugin.getDefault().getActivePage();

-		if (page != null) {

-			IWorkbenchPart activePart= page.getActivePart();

-			if (activePart != null) {

-				display= (IDataDisplay)activePart.getAdapter(IDataDisplay.class);

-				if (display != null) {

-					return display;

-				}	

-				ITextViewer viewer = (ITextViewer)activePart.getAdapter(ITextViewer.class);

-				if (viewer != null) {

-					return new DataDisplay(viewer);

-				}

-			}

-			IViewPart view = page.findView(IJavaDebugUIConstants.ID_DISPLAY_VIEW);;

-			if (view == null) {

-				try {

-					view= page.showView(IJavaDebugUIConstants.ID_DISPLAY_VIEW);

-				} catch (PartInitException e) {

-					JDIDebugUIPlugin.errorDialog(ActionMessages.getString("EvaluateAction.Cannot_open_Display_view"), e); //$NON-NLS-1$

-				} finally {

-					page.activate(activePart);

-				}

-			}

-			if (view != null) {

-				page.bringToTop(view);

-				return (IDataDisplay)view.getAdapter(IDataDisplay.class);

-			}			

-		}

-		

-		return null;		

-	}	

-	

-	protected boolean textHasContent(String text) {

-		if (text != null) {

-			int length= text.length();

-			if (length > 0) {

-				for (int i= 0; i < length; i++) {

-					if (Character.isLetterOrDigit(text.charAt(i))) {

-						return true;

-					}

-				}

-			}

-		}

-		return false;

-	}

-	

-	protected void reportError(String message) {

-		Status status= new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, message, null);

-		ErrorDialog.openError(getShell(), ActionMessages.getString("Evaluate.error.title.eval_problems"), null, status); //$NON-NLS-1$

-	}

-	

-	protected String getExceptionMessage(Throwable exception) {

-		if (exception instanceof CoreException) {

-			CoreException ce = (CoreException)exception;

-			Throwable throwable= ce.getStatus().getException();

-			if (throwable instanceof com.sun.jdi.InvocationException) {

-				return getInvocationExceptionMessage((com.sun.jdi.InvocationException)throwable);

-			} else if (throwable instanceof CoreException) {

-				// Traverse nested CoreExceptions

-				return getExceptionMessage(throwable);

-			}

-			return ce.getStatus().getMessage();

-		}

-		String message= MessageFormat.format(ActionMessages.getString("Evaluate.error.message.direct_exception"), new Object[] { exception.getClass() }); //$NON-NLS-1$

-		if (exception.getMessage() != null) {

-			message= MessageFormat.format(ActionMessages.getString("Evaluate.error.message.exception.pattern"), new Object[] { message, exception.getMessage() }); //$NON-NLS-1$

-		}

-		return message;

-	}

-

-	/**

-	 * Returns a message for the exception wrapped in an invocation exception

-	 */

-	protected String getInvocationExceptionMessage(com.sun.jdi.InvocationException exception) {

-			InvocationException ie= (InvocationException) exception;

-			ObjectReference ref= ie.exception();

-			return MessageFormat.format(ActionMessages.getString("Evaluate.error.message.wrapped_exception"), new Object[] { ref.referenceType().name() }); //$NON-NLS-1$

-	}

-	

-	protected void reportErrors(IEvaluationResult result) {

-		String message= getErrorMessage(result);

-		if (message.length() != 0) {

-			reportError(message);

-		}

-	}

-	

-	protected String getErrorMessage(IEvaluationResult result) {

-		Message[] errors= result.getErrors();

-		if (errors.length == 0) {

-			return getExceptionMessage(result.getException());

-		} else {

-			return getErrorMessage(errors);

-		}

-	}

-	

-	protected String getErrorMessage(Message[] errors) {

-		String message= ""; //$NON-NLS-1$

-		for (int i= 0; i < errors.length; i++) {

-			Message error= errors[i];

-			//more than a warning

-			String msg= error.getMessage();

-			if (i == 0) {

-				message= msg;

-			} else {

-				message= MessageFormat.format(ActionMessages.getString("Evaluate.error.problem_append_pattern"), new Object[] { message, msg }); //$NON-NLS-1$

-			}

-		}

-		return message;

-	}

-	

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		run();

-	}

-

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		setAction(action);

-		update();

-	}	

-

-	/**

-	 * @see IWorkbenchWindowActionDelegate#dispose()

-	 */

-	public void dispose() {

-		disposeDebugModelPresentation();

-		IWorkbenchWindow win = getWindow();

-		if (win != null) {

-			win.getPartService().removePartListener(this);

-		}

-	}

-

-	/**

-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)

-	 */

-	public void init(IWorkbenchWindow window) {

-		setWindow(window);

-		IWorkbenchPage page= window.getActivePage();

-		if (page != null) {

-			setTargetPart(page.getActivePart());

-		}

-		window.getPartService().addPartListener(this);

-		update();

-	}

-

-	protected IAction getAction() {

-		return fAction;

-	}

-

-	protected void setAction(IAction action) {

-		fAction = action;

-	}

-	

-	/**

-	 * Returns a debug model presentation (creating one

-	 * if neccesary).

-	 * 

-	 * @return debug model presentation

-	 */

-	protected IDebugModelPresentation getDebugModelPresentation() {

-		if (fPresentation == null) {

-			fPresentation = DebugUITools.newDebugModelPresentation(JDIDebugModel.getPluginIdentifier());

-		}

-		return fPresentation;

-	}

-	

-	/** 

-	 * Disposes this action's debug model presentation, if

-	 * one was created.

-	 */

-	protected void disposeDebugModelPresentation() {

-		if (fPresentation != null) {

-			fPresentation.dispose();

-		}

-	}

-

-	/**

-	 * @see IEditorActionDelegate#setActiveEditor(IAction, IEditorPart)

-	 */

-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {

-		setAction(action);

-		setTargetPart(targetEditor);

-		update();

-	}

-

-	/**

-	 * @see IPartListener#partActivated(IWorkbenchPart)

-	 */

-	public void partActivated(IWorkbenchPart part) {

-		setTargetPart(part);

-	}

-

-	/**

-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)

-	 */

-	public void partBroughtToTop(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partClosed(IWorkbenchPart)

-	 */

-	public void partClosed(IWorkbenchPart part) {

-		if (part == getTargetPart()) {

-			setTargetPart(null);

-		}

-	}

-

-	/**

-	 * @see IPartListener#partDeactivated(IWorkbenchPart)

-	 */

-	public void partDeactivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partOpened(IWorkbenchPart)

-	 */

-	public void partOpened(IWorkbenchPart part) {

-	}

-	

-	/**

-	 * @see IViewActionDelegate#init(IViewPart)

-	 */

-	public void init(IViewPart view) {

-		setTargetPart(view);

-	}

-

-	protected IWorkbenchPart getTargetPart() {

-		return fTargetPart;

-	}

-

-	protected void setTargetPart(IWorkbenchPart part) {

-		if (fTargetPart instanceof JavaSnippetEditor) {

-			((JavaSnippetEditor)fTargetPart).removeSnippetStateChangedListener(this);

-		}

-		fTargetPart = part;

-		if (part instanceof JavaSnippetEditor) {

-			((JavaSnippetEditor)part).addSnippetStateChangedListener(this);

-		}

-	}

-

-	protected IWorkbenchWindow getWindow() {

-		return fWindow;

-	}

-

-	protected void setWindow(IWorkbenchWindow window) {

-		fWindow = window;

-	}

-	

-	/**

-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-		setAction(action);

-		setTargetPart(targetPart);

-		update();

-	}

-	

-	protected Object getSelectedObject() {

-		return fSelection;

-	}

-	

-	protected void setSelectedObject(Object selection) {

-		fSelection = selection;

-	}

-	

-	/**

-	 * @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)

-	 */

-	public void snippetStateChanged(JavaSnippetEditor editor) {

-		if (editor != null && !editor.isEvaluating()) {

-			update();

-		} else {

-			getAction().setEnabled(false);

-		}

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionBreakpointFilterEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionBreakpointFilterEditor.java
deleted file mode 100644
index ab72712..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionBreakpointFilterEditor.java
+++ /dev/null
@@ -1,586 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */ 
- 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;
-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;
-import org.eclipse.jdt.internal.debug.ui.Filter;
-import org.eclipse.jdt.internal.debug.ui.FilterLabelProvider;
-import org.eclipse.jdt.internal.debug.ui.FilterViewerSorter;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-public class ExceptionBreakpointFilterEditor extends FieldEditor {
-
-	private IJavaExceptionBreakpoint fBreakpoint;
-	private Button fAddFilterButton;
-	private Button fAddPackageButton;
-	private Button fAddTypeButton;
-	private Button fRemoveFilterButton;
-	private Text fEditorText;
-	private String fInvalidEditorText= null;
-	private TableEditor fTableEditor;
-	private TableItem fNewTableItem;
-	private Filter fNewFilter;
-	private Label fTableLabel;
-	private TableViewer fFilterViewer;
-	private Table fFilterTable;
-	private Composite fOuter;
-	
-	private FilterContentProvider fFilterContentProvider;
-	
-	/**
-	 * Content provider for the table.  Content consists of instances of Filter.
-	 */	
-	protected class FilterContentProvider implements IStructuredContentProvider {
-		
-		private TableViewer fViewer;
-		private List fFilters;
-		
-		public FilterContentProvider(TableViewer viewer) {
-			fViewer = viewer;
-			populateFilters();
-		}
-		
-		protected void populateFilters() {
-			String[] filters= null;
-			try {
-				filters = fBreakpoint.getFilters();
-			} catch (CoreException ce) {
-				JDIDebugUIPlugin.log(ce);
-				filters= new String[]{};
-			}
-			fFilters= new ArrayList(1);
-			for (int i = 0; i < filters.length; i++) {
-				String name = filters[i];
-				addFilter(name);
-			}
-		}
-		
-		public Filter addFilter(String name) {
-			Filter filter = new Filter(name, false);
-			if (!fFilters.contains(filter)) {
-				fFilters.add(filter);
-				fViewer.add(filter);
-			}
-			return filter;
-		}
-		
-		
-		public void removeFilters(Object[] filters) {
-			for (int i = 0; i < filters.length; i++) {
-				Filter filter = (Filter)filters[i];
-				fFilters.remove(filter);
-			}
-			fViewer.remove(filters);
-		}
-		
-		/**
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return fFilters.toArray();
-		}
-		
-		/**
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-		
-		/**
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}		
-	}
-	
-	public ExceptionBreakpointFilterEditor(Composite parent, IJavaExceptionBreakpoint breakpoint) {
-		fBreakpoint= breakpoint;
-		init(JavaBreakpointPreferenceStore.EXCEPTION_FILTER, ActionMessages.getString("ExceptionBreakpointFilterEditor.Re&strict_to_Selected_Location(s)__1")); //$NON-NLS-1$
-		createControl(parent);
-	}
-	
-	/**
-	 * @see FieldEditor#adjustForNumColumns(int)
-	 */
-	protected void adjustForNumColumns(int numColumns) {
-		((GridData) fOuter.getLayoutData()).horizontalSpan = numColumns;
-	}
-
-	/**
-	 * @see FieldEditor#doFillIntoGrid(Composite, int)
-	 */
-	protected void doFillIntoGrid(Composite parent, int numColumns) {	
-		// top level container
-		fOuter = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		
-		fOuter.setLayout(layout);
-		GridData gd = new GridData();
-		gd.verticalAlignment = GridData.FILL;
-		gd.horizontalAlignment = GridData.FILL;
-		fOuter.setLayoutData(gd);
-		
-		gd = new GridData();
-		gd.horizontalSpan = numColumns;
-		getLabelControl(fOuter).setLayoutData(gd);
-		
-		// filter table
-		fFilterTable= new Table(fOuter, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-		
-		TableLayout tableLayout= new TableLayout();
-		ColumnLayoutData[] columnLayoutData= new ColumnLayoutData[1];
-		columnLayoutData[0]= new ColumnWeightData(100);		
-		tableLayout.addColumnData(columnLayoutData[0]);
-		fFilterTable.setLayout(tableLayout);
-		new TableColumn(fFilterTable, SWT.NONE);
-
-		fFilterViewer = new TableViewer(fFilterTable);
-		fTableEditor = new TableEditor(fFilterTable);
-		fFilterViewer.setLabelProvider(new FilterLabelProvider());
-		fFilterViewer.setSorter(new FilterViewerSorter());
-		fFilterContentProvider = new FilterContentProvider(fFilterViewer);
-		fFilterViewer.setContentProvider(fFilterContentProvider);
-		// input just needs to be non-null
-		fFilterViewer.setInput(this);
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gd.widthHint = 100;
-		fFilterViewer.getTable().setLayoutData(gd);
-		fFilterViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = event.getSelection();
-				if (selection.isEmpty()) {
-					fRemoveFilterButton.setEnabled(false);
-				} else {
-					fRemoveFilterButton.setEnabled(true);					
-				}
-			}
-		});		
-		
-		createFilterButtons(fOuter);
-	}
-
-	private void createFilterButtons(Composite container) {
-		// button container
-		Composite buttonContainer = new Composite(container, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-		GridLayout buttonLayout = new GridLayout();
-		buttonLayout.numColumns = 1;
-		buttonLayout.marginHeight = 0;
-		buttonLayout.marginWidth = 0;
-		buttonContainer.setLayout(buttonLayout);
-		
-		// Add filter button
-		fAddFilterButton = new Button(buttonContainer, SWT.PUSH);
-		fAddFilterButton.setText(ActionMessages.getString("ExceptionBreakpointFilterEditor.&Add_2")); //$NON-NLS-1$
-		fAddFilterButton.setToolTipText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Key_in_the_name_of_a_new_scope_expression_3")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		fAddFilterButton.setLayoutData(gd);
-		fAddFilterButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				editFilter();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		
-		// Add type button
-		fAddTypeButton = new Button(buttonContainer, SWT.PUSH);
-		fAddTypeButton.setText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Add_&Class_4")); //$NON-NLS-1$
-		fAddTypeButton.setToolTipText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Choose_a_Java_Class_to_Add_It_to_the_Breakpoint_Scope_5")); //$NON-NLS-1$
-		gd = getButtonGridData(fAddTypeButton);
-		fAddTypeButton.setLayoutData(gd);
-		fAddTypeButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				addType();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		
-		// Add package button
-		fAddPackageButton = new Button(buttonContainer, SWT.PUSH);
-		fAddPackageButton.setText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Add_&Package_6")); //$NON-NLS-1$
-		fAddPackageButton.setToolTipText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Choose_a_Package_to_Add_to_the_Breakpoint_Scope_7")); //$NON-NLS-1$
-		gd = getButtonGridData(fAddPackageButton);
-		fAddPackageButton.setLayoutData(gd);
-		fAddPackageButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				addPackage();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		
-		// Remove button
-		fRemoveFilterButton = new Button(buttonContainer, SWT.PUSH);
-		fRemoveFilterButton.setText(ActionMessages.getString("ExceptionBreakpointFilterEditor.&Remove_8")); //$NON-NLS-1$
-		fRemoveFilterButton.setToolTipText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Remove_all_selected_scoping_elements_9")); //$NON-NLS-1$
-		gd = getButtonGridData(fRemoveFilterButton);
-		fRemoveFilterButton.setLayoutData(gd);
-		fRemoveFilterButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				removeFilters();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		fRemoveFilterButton.setEnabled(false);
-		
-	}
-	
-	private GridData getButtonGridData(Button button) {
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		GC gc = new GC(button);
-		gc.setFont(button.getFont());
-		FontMetrics fontMetrics= gc.getFontMetrics();
-		gc.dispose();
-		int widthHint= Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint= Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		
-		gd.heightHint= Dialog.convertVerticalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_HEIGHT);
-		return gd;
-	}
-	
-	/**
-	 * Create a new filter in the table (with the default 'new filter' value),
-	 * then open up an in-place editor on it.
-	 */
-	private void editFilter() {
-		// if a previous edit is still in progress, finish it
-		if (fEditorText != null) {
-			validateChangeAndCleanup();
-		}
-		
-		fNewFilter = fFilterContentProvider.addFilter("");		 //$NON-NLS-1$
-		fNewTableItem = fFilterTable.getItem(0);
-		
-		// create & configure Text widget for editor
-		// Fix for bug 1766.  Border behavior on Windows & Linux for text
-		// fields is different.  On Linux, you always get a border, on Windows,
-		// you don't.  Specifying a border on Linux results in the characters
-		// getting pushed down so that only there very tops are visible.  Thus,
-		// we have to specify different style constants for the different platforms.
-		int textStyles = SWT.SINGLE | SWT.LEFT;
-		if (SWT.getPlatform().equals("win32")) {  //$NON-NLS-1$
-			textStyles |= SWT.BORDER;
-		}
-		fEditorText = new Text(fFilterTable, textStyles);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		fEditorText.setLayoutData(gd);
-		
-		// set the editor
-		fTableEditor.horizontalAlignment = SWT.LEFT;
-		fTableEditor.grabHorizontal = true;
-		fTableEditor.setEditor(fEditorText, fNewTableItem, 0);
-		
-		// get the editor ready to use
-		fEditorText.setText(fNewFilter.getName());
-		fEditorText.selectAll();
-		setEditorListeners(fEditorText);
-		fEditorText.setFocus();
-	}
-	
-	private void setEditorListeners(Text text) {
-		// CR means commit the changes, ESC means abort and don't commit
-		text.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent event) {				
-				if (event.character == SWT.CR) {
-					if (fInvalidEditorText != null) {
-						fEditorText.setText(fInvalidEditorText);
-						fInvalidEditorText= null;
-					} else {
-						validateChangeAndCleanup();
-					}
-				} else if (event.character == SWT.ESC) {
-					removeNewFilter();
-					cleanupEditor();
-				}
-			}
-		});
-		// Consider loss of focus on the editor to mean the same as CR
-		text.addFocusListener(new FocusAdapter() {
-			public void focusLost(FocusEvent event) {
-				if (fInvalidEditorText != null) {
-					fEditorText.setText(fInvalidEditorText);
-					fInvalidEditorText= null;
-				} else {
-					validateChangeAndCleanup();
-				}
-			}
-		});
-		// Consume traversal events from the text widget so that CR doesn't 
-		// traverse away to dialog's default button.  Without this, hitting
-		// CR in the text field closes the entire dialog.
-		text.addListener(SWT.Traverse, new Listener() {
-			public void handleEvent(Event event) {
-				event.doit = false;
-			}
-		});
-	}
-	
-	private void validateChangeAndCleanup() {
-		String trimmedValue = fEditorText.getText().trim();
-		// if the new value is blank, remove the filter
-		if (trimmedValue.length() < 1) {
-			removeNewFilter();
-		}
-		// if it's invalid, beep and leave sitting in the editor
-		else if (!validateEditorInput(trimmedValue)) {
-			fInvalidEditorText= trimmedValue;
-			fEditorText.setText(ActionMessages.getString("ExceptionBreakpointFilterEditor.Invalid_expression._Return_to_continue;_escape_to_exit_11")); //$NON-NLS-1$
-			fEditorText.getDisplay().beep();			
-			return;
-		// otherwise, commit the new value if not a duplicate
-		} else {		
-			Object[] filters= fFilterContentProvider.getElements(null);
-			for (int i = 0; i < filters.length; i++) {
-				Filter filter = (Filter)filters[i];
-				if (filter.getName().equals(trimmedValue)) {
-					removeNewFilter();
-					cleanupEditor();
-					return;
-				}	
-			}
-			fNewTableItem.setText(trimmedValue);
-			fNewFilter.setName(trimmedValue);
-			fFilterViewer.refresh();
-		}
-		cleanupEditor();
-	}
-	
-	/**
-	 * A valid filter is simply one that is a valid Java identifier.
-	 * and, as defined in the JDI spec, the regular expressions used for
-	 * scoping must be limited to exact matches or patterns that
-	 * begin with '*' or end with '*'. Beyond this, a string cannot be validated
-	 * as corresponding to an existing type or package (and this is probably not
-	 * even desirable).  
-	 */
-	private boolean validateEditorInput(String trimmedValue) {
-		char firstChar= trimmedValue.charAt(0);
-		if (!Character.isJavaIdentifierStart(firstChar)) {
-			if (!(firstChar == '*')) {
-				return false;
-			}
-		}
-		int length= trimmedValue.length();
-		for (int i= 1; i < length; i++) {
-			char c= trimmedValue.charAt(i);
-			if (!Character.isJavaIdentifierPart(c)) {
-				if (c == '.' && i != (length - 1)) {
-					continue;
-				}
-				if (c == '*' && i == (length - 1)) {
-					continue;
-				}
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Cleanup all widgetry & resources used by the in-place editing
-	 */
-	private void cleanupEditor() {
-		if (fEditorText != null) {
-			fNewFilter = null;
-			fNewTableItem = null;
-			fTableEditor.setEditor(null, null, 0);			
-			fEditorText.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					fEditorText.dispose();
-					fEditorText = null;
-				}
-			});		
-		}
-	}
-	
-	private void removeFilters() {
-		IStructuredSelection selection = (IStructuredSelection)fFilterViewer.getSelection();		
-		fFilterContentProvider.removeFilters(selection.toArray());
-	}
-	
-	private void removeNewFilter() {
-		fFilterContentProvider.removeFilters(new Object[] {fNewFilter});
-	}
-	
-	private void addPackage() {
-		Shell shell= fAddPackageButton.getDisplay().getActiveShell();
-		SelectionDialog dialog = null;
-		try {
-			dialog = JDIDebugUIPlugin.createAllPackagesDialog(shell, null, true);
-		} catch (JavaModelException jme) {
-			String title= ActionMessages.getString("ExceptionBreakpointFilterEditor.Add_Package_to_Scope_14"); //$NON-NLS-1$
-			String message= ActionMessages.getString("ExceptionBreakpointFilterEditor.Could_not_open_package_selection_dialog_for_scope_definition_13");  //$NON-NLS-1$
-			ExceptionHandler.handle(jme, title, message);
-			return;			
-		}
-	
-		dialog.setTitle(ActionMessages.getString("ExceptionBreakpointFilterEditor.Add_Package_to_Scope_14"));  //$NON-NLS-1$
-		dialog.setMessage(ActionMessages.getString("ExceptionBreakpointFilterEditor.&Select_a_package_to_add_to_the_scope_of_the_breakpoint_15")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID) {
-			return;
-		}
-		Object[] packages= dialog.getResult();
-		if (packages != null && packages.length > 0) {
-			IJavaElement pkg = (IJavaElement)packages[0];
-			String filter = pkg.getElementName();
-			if (filter.length() < 1) {
-				filter = "(default package)";  //$NON-NLS-1$
-			} else {
-				filter += ".*"; //$NON-NLS-1$
-			}
-			fFilterContentProvider.addFilter(filter);
-		}		
-	}
-				
-	private void addType() {
-		Shell shell= fAddTypeButton.getDisplay().getActiveShell();
-		SelectionDialog dialog= null;
-		try {
-			dialog= JavaUI.createTypeDialog(shell, new ProgressMonitorDialog(shell),
-				SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES, false);
-		} catch (JavaModelException jme) {
-			String title= ActionMessages.getString("ExceptionBreakpointFilterEditor.Add_Class_to_Scope_17"); //$NON-NLS-1$
-			String message= ActionMessages.getString("ExceptionBreakpointFilterEditor.Could_not_open_class_selection_dialog_for_scope_definition_18"); //$NON-NLS-1$
-			ExceptionHandler.handle(jme, title, message);
-			return;
-		}
-	
-		dialog.setTitle(ActionMessages.getString("ExceptionBreakpointFilterEditor.Add_Class_to_Scope_17")); //$NON-NLS-1$
-		dialog.setMessage(ActionMessages.getString("ExceptionBreakpointFilterEditor.&Select_a_class_to_add_to_the_scope_of_the_breakpoint_20")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID) {
-			return;
-		}
-		
-		Object[] types= dialog.getResult();
-		if (types != null && types.length > 0) {
-			IType type = (IType)types[0];
-			fFilterContentProvider.addFilter(type.getFullyQualifiedName());
-		}		
-	}
-	
-	/**
-	 * Creates composite control and sets the default layout data.
-	 *
-	 * @param parent  the parent of the new composite
-	 * @param numColumns  the number of columns for the new composite
-	 * @param labelText  the text label of the new composite
-	 * @return the newly-created composite
-	 */
-	private Composite createLabelledComposite(Composite parent, int numColumns, String labelText) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		
-		//GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		comp.setLayout(layout);
-
-		//GridData
-		GridData gd= new GridData();
-		gd.verticalAlignment = GridData.FILL;
-		gd.horizontalAlignment = GridData.FILL;
-		comp.setLayoutData(gd);
-		
-		//Label
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(labelText);
-		gd = new GridData();
-		gd.horizontalSpan = numColumns;
-		label.setLayoutData(gd);
-
-		return comp;
-	}
-	
-	/**
-	 * @see FieldEditor#doLoad()
-	 */
-	protected void doLoad() {
-	}
-
-	/**
-	 * @see FieldEditor#doLoadDefault()
-	 */
-	protected void doLoadDefault() {
-	}
-
-	/**
-	 * @see FieldEditor#doStore()
-	 */
-	protected void doStore() {
-		Object[] filters= fFilterContentProvider.getElements(null);
-		String[] stringFilters= new String[filters.length];
-		for (int i = 0; i < filters.length; i++) {
-			Filter filter = (Filter)filters[i];
-			stringFilters[i]= filter.getName();
-		}
-		try {
-			fBreakpoint.setFilters(stringFilters, true);
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-	}
-
-	/**
-	 * @see FieldEditor#getNumberOfControls()
-	 */
-	public int getNumberOfControls() {
-		return 2;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionCaughtToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionCaughtToggleAction.java
deleted file mode 100644
index 972dec7..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionCaughtToggleAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;

-

-/**

- * Toggles the caught state of an exception breakpoint

- */

-public class ExceptionCaughtToggleAction extends BreakpointToggleAction {

-

-	/**

-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)

-	 */

-	protected boolean getToggleState(IJavaBreakpoint breakpoint) throws CoreException {

-		//will only be called after isEnabledFor so cast is safe

-		IJavaExceptionBreakpoint exception= (IJavaExceptionBreakpoint)breakpoint;

-		return exception.isCaught();

-	}

-

-	/**

-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)

-	 */

-	public void doAction(IJavaBreakpoint breakpoint) throws CoreException {

-		//will only be called after isEnabledFor so cast is safe

-		IJavaExceptionBreakpoint exception= (IJavaExceptionBreakpoint)breakpoint;

-		exception.setCaught(!exception.isCaught());

-	}

-	

-	public boolean isEnabledFor(Object element) {

-		return element instanceof IJavaExceptionBreakpoint;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionUncaughtToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionUncaughtToggleAction.java
deleted file mode 100644
index 0e65b59..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExceptionUncaughtToggleAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaExceptionBreakpoint;

-

-/**

- * Toggles the uncaught state of an exception breakpoint

- */

-public class ExceptionUncaughtToggleAction extends BreakpointToggleAction {

-

-	/**

-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)

-	 */

-	protected boolean getToggleState(IJavaBreakpoint breakpoint) throws CoreException {

-		//will only be called after isEnabledFor so cast is safe

-		IJavaExceptionBreakpoint exception= (IJavaExceptionBreakpoint)breakpoint;

-		return exception.isUncaught();

-	}

-

-	/**

-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)

-	 */

-	public void doAction(IJavaBreakpoint breakpoint) throws CoreException {

-		//will only be called after isEnabledFor so cast is safe

-		IJavaExceptionBreakpoint exception= (IJavaExceptionBreakpoint)breakpoint;

-		exception.setUncaught(!exception.isUncaught());

-	}

-	

-	public boolean isEnabledFor(Object element) {

-		return element instanceof IJavaExceptionBreakpoint;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExitToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExitToggleAction.java
deleted file mode 100644
index d3ca519..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ExitToggleAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;

-

-public class ExitToggleAction extends BreakpointToggleAction {

-

-	/**

-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)

-	 */

-	protected boolean getToggleState(IJavaBreakpoint breakpoint) throws CoreException {

-		return ((IJavaMethodBreakpoint)breakpoint).isExit();

-	}

-

-	/**

-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)

-	 */

-	public void doAction(IJavaBreakpoint breakpoint) throws CoreException {

-		((IJavaMethodBreakpoint)breakpoint).setExit(!((IJavaMethodBreakpoint)breakpoint).isExit());

-	}

-

-	/**

-	 * @see BreakpointToggleAction#isEnabledFor(Object)

-	 */

-	public boolean isEnabledFor(Object element) {

-		return element instanceof IJavaMethodBreakpoint;

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java
deleted file mode 100644
index ca12f82..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/InspectAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.Iterator;

-

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.DebugPlugin;

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.jdt.debug.core.IJavaValue;

-import org.eclipse.jdt.debug.core.IJavaVariable;

-import org.eclipse.jdt.debug.eval.IEvaluationResult;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.debug.ui.display.IDataDisplay;

-import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;

-import org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * Places the result of an evaluation in the debug expression view.

- */

-public class InspectAction extends EvaluateAction {

-	

-	/**

-	 * @see EvaluateAction#displayResult(IEvaluationResult)

-	 */

-	protected void displayResult(IEvaluationResult result) {

-		IJavaValue value= result.getValue();

-		showExpressionView();

-		JavaInspectExpression exp = new JavaInspectExpression(result.getSnippet().trim(), value);

-		DebugPlugin.getDefault().getExpressionManager().addExpression(exp);

-	}

-	

-	/**

-	 * Make the expression view visible or open one

-	 * if required.

-	 */

-	protected void showExpressionView() {

-		IWorkbenchPage page = JDIDebugUIPlugin.getDefault().getActivePage();

-		if (page != null) {

-			IViewPart part = page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);

-			if (part == null) {

-				try {

-					page.showView(IDebugUIConstants.ID_EXPRESSION_VIEW);

-				} catch (PartInitException e) {

-					reportError(e.getStatus().getMessage());

-				}

-			} else {

-				page.bringToTop(part);

-			}

-		}

-	}

-

-	/**

-	 * @see EvaluateAction#getDataDisplay()

-	 */

-	protected IDataDisplay getDataDisplay() {

-		return null;

-	}

-	

-	protected void run() {

-		IWorkbenchPart part= getTargetPart();

-		if (part instanceof JavaSnippetEditor) {

-			((JavaSnippetEditor)part).evalSelection(JavaSnippetEditor.RESULT_INSPECT);

-			return;

-		}

-		

-		Object selection= getSelectedObject();

-		if (!(selection instanceof IStructuredSelection)) {

-			super.run();

-			return;

-		}

-		

-		//inspecting from the context of the variables view

-		Iterator variables = ((IStructuredSelection)selection).iterator();

-		while (variables.hasNext()) {

-			IJavaVariable var = (IJavaVariable)variables.next();

-			try {

-				JavaInspectExpression expr = new JavaInspectExpression(var.getName(), (IJavaValue)var.getValue());

-				DebugPlugin.getDefault().getExpressionManager().addExpression(expr);

-			} catch (DebugException e) {

-				JDIDebugUIPlugin.errorDialog(ActionMessages.getString("InspectAction.Exception_occurred_inspecting_variable"), e); //$NON-NLS-1$

-			}

-		}

-	

-		if (part.getSite().getId().equals("IDebugUIConstants.ID_EXPRESSION_VIEW")) { //$NON-NLS-1$

-			return;

-		}

-		IWorkbenchPage page = part.getSite().getPage();

-		if (page != null) {

-			part = page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);

-			if (part != null) {

-				page.activate(part);

-			}

-		}

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferencePage.java
deleted file mode 100644
index 932074c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferencePage.java
+++ /dev/null
@@ -1,544 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
- 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-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.IJavaWatchpoint;
-import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * The preference page that is used to present the properties of a breakpoint as 
- * preferences.  A JavaBreakpointPreferenceStore is used to interface between this
- * page and the breakpoint.
- * @see JavaBreakpointPropertiesDialog
- * @see JavaBreakpointPreferenceStore
- */
-public class JavaBreakpointPreferencePage extends FieldEditorPreferencePage {
-
-	class BreakpointIntegerFieldEditor extends IntegerFieldEditor {
-		public BreakpointIntegerFieldEditor(String name, String labelText, Composite parent) {
-			super(name, labelText, parent);
-			setErrorMessage(ActionMessages.getString("BreakpointHitCountAction.Value_must_be_positive_integer"));//$NON-NLS-1$
-		}
-
-		/**
-		 * @see IntegerFieldEditor#checkState()
-		 */
-		protected boolean checkState() {
-			Text control= getTextControl();
-			if (!control.isEnabled()) {
-				clearErrorMessage();
-				return true;
-			}
-			return super.checkState();
-		}
-		
-		/**
-		 * Overrode here to be package visible.
-		 */
-		protected void refreshValidState() {
-			super.refreshValidState();
-		}
-		
-		/**
-		 * Only store if the text control is enabled
-		 * @see FieldEditor#doStore()
-		 */
-		protected void doStore() {
-			Text text = getTextControl();
-			if (text.isEnabled()) {
-				super.doStore();
-			}
-		}
-		/**
- 		 * Clears the error message from the message line if the error
- 		 * message is the error message from this field editor.
-		 */
-		protected void clearErrorMessage() {
-			if (getPreferencePage() != null) {
-				String message= getPreferencePage().getErrorMessage();
-				if (message != null) {
-					if(getErrorMessage().equals(message)) {
-						super.clearErrorMessage();
-					}
-					
-				} else {
-					super.clearErrorMessage();
-				}
-			}
-		}
-	}
-
-	class BreakpointStringFieldEditor extends StringFieldEditor {
-		public BreakpointStringFieldEditor(String name,	String labelText, Composite parent) {
-			super(name, labelText, parent);
-		}
-
-		/**
-		 * @see StringFieldEditor#checkState()
-		 */
-		protected boolean checkState() {
-			Text control= getTextControl();
-			if (!control.isEnabled()) {
-				clearErrorMessage();
-				return true;
-			}
-			return super.checkState();
-		}
-		
-		protected void doStore() {
-			Text text = getTextControl();
-			if (text.isEnabled()) {
-				super.doStore();
-			}
-		}
-
-		/**
-		 * @see FieldEditor#refreshValidState()
-		 */
-		protected void refreshValidState() {
-			super.refreshValidState();
-		}
-		
-		/**
- 		 * Clears the error message from the message line if the error
- 		 * message is the error message from this field editor.
-		 */
-		protected void clearErrorMessage() {
-			if (getPreferencePage() != null) {
-				String message= getPreferencePage().getErrorMessage();
-				if (message != null) {
-					if(getErrorMessage().equals(message)) {
-						super.clearErrorMessage();
-					}
-					
-				} else {
-					super.clearErrorMessage();
-				}
-			}
-		}
-	}
-	
-	class LabelFieldEditor extends FieldEditor {
-
-		private Label fTitleLabel;
-		private Label fValueLabel;
-		private Composite fBasicComposite;
-		private String fValue;
-		private String fTitle;
-
-		public LabelFieldEditor(Composite parent, String title, String value) {
-			fValue = value;
-			fTitle = title;
-			this.createControl(parent);
-		}
-
-		protected void adjustForNumColumns(int numColumns) {
-			((GridData) fBasicComposite.getLayoutData()).horizontalSpan = numColumns;
-		}
-
-		protected void doFillIntoGrid(Composite parent, int numColumns) {
-			fBasicComposite = new Composite(parent, SWT.NULL);
-			GridLayout layout = new GridLayout();
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			layout.numColumns = 2;
-			fBasicComposite.setLayout(layout);
-			GridData data = new GridData();
-			data.verticalAlignment = GridData.FILL;
-			data.horizontalAlignment = GridData.FILL;
-			fBasicComposite.setLayoutData(data);
-
-			fTitleLabel = new Label(fBasicComposite, SWT.NONE);
-			fTitleLabel.setText(fTitle);
-			GridData gd = new GridData();
-			gd.verticalAlignment = SWT.TOP;
-			fTitleLabel.setLayoutData(gd);
-
-			fValueLabel = new Label(fBasicComposite, SWT.WRAP);
-			fValueLabel.setText(fValue);
-			gd = new GridData();
-			fValueLabel.setLayoutData(gd);
-		}
-
-		public int getNumberOfControls() {
-			return 1;
-		}
-
-		/**
-		 * The label field editor is only used to present a text label
-		 * on a preference page.
-		 */
-		protected void doLoad() {
-		}
-		protected void doLoadDefault() {
-		}
-		protected void doStore() {
-		}
-	}
-
-	private Text fHitCountTextControl;
-	private BooleanFieldEditor fHitCountEnabler;
-	private BreakpointIntegerFieldEditor fHitCount;
-	
-	private Text fConditionTextControl;
-	private BooleanFieldEditor fConditionEnabler;
-	private BreakpointStringFieldEditor fCondition;
-
-	private IJavaBreakpoint fBreakpoint;
-	protected static final String VM_SUSPEND_POLICY = "VM"; //$NON-NLS-1$
-	protected static final String THREAD_SUSPEND_POLICY = "THREAD"; //$NON-NLS-1$
-
-	protected JavaElementLabelProvider fJavaLabelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-	
-	protected JavaBreakpointPreferencePage(IJavaBreakpoint breakpoint) {
-		super(GRID);
-		setBreakpoint(breakpoint);
-	}
-
-	/**
-	 * Initializes all field editors.
-	 */
-	protected void initialize() {
-		super.initialize();
-		fHitCountEnabler.setPropertyChangeListener(new IPropertyChangeListener() {
-			/**
-			 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-			 */
-			public void propertyChange(PropertyChangeEvent event) {
-				boolean enabled = fHitCountEnabler.getBooleanValue();
-				fHitCountTextControl.setEnabled(enabled);
-				fHitCount.refreshValidState();
-				if (fHitCount.isValid() && fCondition != null) {
-					fCondition.refreshValidState();
-				}
-				checkState();
-			}
-		});
-		if (fConditionEnabler == null) {
-			return;
-		}
-		fConditionEnabler.setPropertyChangeListener(new IPropertyChangeListener() {
-			/**
-			 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-			 */
-			public void propertyChange(PropertyChangeEvent event) {
-				boolean enabled = fConditionEnabler.getBooleanValue();
-				fConditionTextControl.setEnabled(enabled);
-				fCondition.refreshValidState();
-				if (fCondition.isValid() && fHitCount != null) {
-					fHitCount.refreshValidState();
-				}
-				checkState();
-			}
-		});	
-	}
-
-	/**
-	 * @see FieldEditorPreferencePage#createFieldEditors()
-	 */
-	protected void createFieldEditors() {
-		IJavaBreakpoint breakpoint = getBreakpoint();
-		try {
-			String typeName = breakpoint.getTypeName();
-			if (typeName != null) {
-				addField(createLabelEditor(getFieldEditorParent(), ActionMessages.getString("JavaBreakpointPreferencePage.Type___4"), typeName)); //$NON-NLS-1$
-			}
-			createTypeSpecificLabelFieldEditors(breakpoint);
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-
-		if (breakpoint instanceof ILineBreakpoint) {
-			ILineBreakpoint lBreakpoint = (ILineBreakpoint) breakpoint;
-			StringBuffer lineNumber = new StringBuffer(4);
-			try {
-				int lNumber = lBreakpoint.getLineNumber();
-				if (lNumber > 0) {
-					lineNumber.append(lNumber);
-				}
-			} catch (CoreException ce) {
-				JDIDebugUIPlugin.log(ce);
-			}
-			if (lineNumber.length() > 0) {
-				addField(
-					createLabelEditor(
-						getFieldEditorParent(),
-						ActionMessages.getString("JavaBreakpointPreferencePage.Line_Number___5"), //$NON-NLS-1$
-						lineNumber.toString()));
-			}
-		}
-		IPreferenceStore store= getPreferenceStore();
-		
-		try {
-			store.setValue(JavaBreakpointPreferenceStore.ENABLED, breakpoint.isEnabled());
-			int hitCount = breakpoint.getHitCount();
-			if (hitCount > 0) {
-				store.setValue(JavaBreakpointPreferenceStore.HIT_COUNT, hitCount);
-				store.setValue(JavaBreakpointPreferenceStore.HIT_COUNT_ENABLED, true);
-			} else {
-				store.setValue(JavaBreakpointPreferenceStore.HIT_COUNT_ENABLED, false);
-			}
-
-			String policy = ""; //$NON-NLS-1$
-			if (breakpoint.getSuspendPolicy() == IJavaBreakpoint.SUSPEND_THREAD) {
-				policy = THREAD_SUSPEND_POLICY;
-			} else {
-				policy = VM_SUSPEND_POLICY;
-			}
-			store.setValue(JavaBreakpointPreferenceStore.SUSPEND_POLICY, policy);
-			addField(createEnabledEditor(getFieldEditorParent()));
-			createHitCountEditor(getFieldEditorParent());
-			addField(createSuspendPolicyEditor(getFieldEditorParent()));
-			createTypeSpecificFieldEditors();
-			addField(createThreadFilterViewer(getFieldEditorParent()));
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-	}
-
-	protected void createTypeSpecificLabelFieldEditors(IJavaBreakpoint breakpoint) throws CoreException {
-		if (breakpoint instanceof IJavaLineBreakpoint) {
-			IMember member= BreakpointUtils.getMember((IJavaLineBreakpoint)breakpoint);
-			if (member == null) {
-				return;
-			}
-			String label= ActionMessages.getString("JavaBreakpointPreferencePage.Member");//$NON-NLS-1$
-			String memberName= fJavaLabelProvider.getText(member);
-			if (breakpoint instanceof IJavaMethodBreakpoint) {
-				label= ActionMessages.getString("JavaBreakpointPreferencePage.Method");//$NON-NLS-1$
-			} else if (breakpoint instanceof IJavaWatchpoint) {
-				label= ActionMessages.getString("JavaBreakpointPreferencePage.Field");//$NON-NLS-1$
-			}
-			addField(createLabelEditor(getFieldEditorParent(), label, memberName)); 
-		}
-	}
-	
-	protected FieldEditor createThreadFilterViewer(Composite parent) {
-		return new ThreadFilterViewer(parent, getBreakpoint());
-	}
-	
-	protected FieldEditor createFilterEditor(Composite parent) {
-		return new ExceptionBreakpointFilterEditor(parent, (IJavaExceptionBreakpoint)getBreakpoint());
-	}
-
-	protected void createTypeSpecificFieldEditors() throws CoreException {
-		IJavaBreakpoint breakpoint= getBreakpoint();
-		IPreferenceStore store= getPreferenceStore();
-		if (breakpoint instanceof IJavaExceptionBreakpoint) {
-			IJavaExceptionBreakpoint jeBreakpoint = (IJavaExceptionBreakpoint) breakpoint;
-			setTitle(ActionMessages.getString("JavaBreakpointPreferencePage.Java_Exception_Breakpoint_Properties_8")); //$NON-NLS-1$
-			store.setValue(
-				JavaBreakpointPreferenceStore.UNCAUGHT, jeBreakpoint.isUncaught());
-			store.setValue(JavaBreakpointPreferenceStore.CAUGHT, jeBreakpoint.isCaught());
-			addField(createUncaughtEditor(getFieldEditorParent()));
-			addField(createCaughtEditor(getFieldEditorParent()));
-			addField(createFilterEditor(getFieldEditorParent()));
-		} else if (breakpoint instanceof IJavaLineBreakpoint) {
-			IJavaLineBreakpoint lineBreakpoint= (IJavaLineBreakpoint)breakpoint;
-			if (lineBreakpoint.supportsCondition()) {
-				createConditionEditor(getFieldEditorParent());
-				String condition= lineBreakpoint.getCondition();
-				if (condition == null) {
-					condition = ""; //$NON-NLS-1$
-				}
-				store.setValue(JavaBreakpointPreferenceStore.CONDITION, condition);
-				if (lineBreakpoint.isConditionEnabled()) {
-					store.setValue(JavaBreakpointPreferenceStore.CONDITION_ENABLED, true);
-				} else {
-					store.setValue(JavaBreakpointPreferenceStore.CONDITION_ENABLED, false);				
-				}
-			}
-			if (breakpoint instanceof IJavaMethodBreakpoint) {
-				IJavaMethodBreakpoint jmBreakpoint = (IJavaMethodBreakpoint) breakpoint;
-				setTitle(ActionMessages.getString("JavaBreakpointPreferencePage.Java_Method_Breakpoint_Properties_10")); //$NON-NLS-1$
-				store.setValue(
-					JavaBreakpointPreferenceStore.METHOD_ENTRY, jmBreakpoint.isEntry());
-				store.setValue(
-					JavaBreakpointPreferenceStore.METHOD_EXIT, jmBreakpoint.isExit());
-				addField(createMethodEntryEditor(getFieldEditorParent()));
-				addField(createMethodExitEditor(getFieldEditorParent()));
-			} else if (breakpoint instanceof IJavaWatchpoint) {
-				IJavaWatchpoint jWatchpoint = (IJavaWatchpoint) breakpoint;
-				setTitle(ActionMessages.getString("JavaBreakpointPreferencePage.Java_Watchpoint_Properties_12")); //$NON-NLS-1$
-				store.setValue(JavaBreakpointPreferenceStore.ACCESS, jWatchpoint.isAccess());
-				store.setValue(
-					JavaBreakpointPreferenceStore.MODIFICATION, jWatchpoint.isModification());
-				addField(createAccessEditor(getFieldEditorParent()));
-				addField(createModificationEditor(getFieldEditorParent()));
-			} else if (breakpoint instanceof IJavaPatternBreakpoint) {
-				setTitle(ActionMessages.getString("JavaBreakpointPreferencePage.Java_Pattern_Breakpoint_Properties_14")); //$NON-NLS-1$
-			} else {
-			 	setTitle(ActionMessages.getString("JavaBreakpointPreferencePage.Java_Line_Breakpoint_Properties_16")); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	/**
-	 * @see PreferencePage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createContents(parent);
-		setControl(getFieldEditorParent());
-	}
-
-	protected FieldEditor createAccessEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.ACCESS, ActionMessages.getString("JavaBreakpointPreferencePage.Access_18"), parent); //$NON-NLS-1$
-		return bfe;
-	}
-	
-	protected void createHitCountEditor(Composite parent) {
-		fHitCountEnabler =
-			new BooleanFieldEditor(
-				JavaBreakpointPreferenceStore.HIT_COUNT_ENABLED,
-				ActionMessages.getString("JavaBreakpointPreferencePage.Enable_&Hit_Count_19"), //$NON-NLS-1$
-				parent);
-		addField(fHitCountEnabler);
-
-		fHitCount =
-			new BreakpointIntegerFieldEditor(
-				JavaBreakpointPreferenceStore.HIT_COUNT,
-				ActionMessages.getString("JavaBreakpointPreferencePage.H&it_Count__20"), //$NON-NLS-1$
-				parent);
-		fHitCount.setValidRange(1, Integer.MAX_VALUE);
-		fHitCountTextControl = fHitCount.getTextControl(parent);
-		try {
-			fHitCountTextControl.setEnabled(getBreakpoint().getHitCount() > 0);
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}
-		addField(fHitCount);
-	}
-
-	protected void createConditionEditor(Composite parent) {
-		fConditionEnabler= new BooleanFieldEditor(JavaBreakpointPreferenceStore.CONDITION_ENABLED, ActionMessages.getString("JavaBreakpointPreferencePage.Enable_condition_1"), parent); //$NON-NLS-1$
-		addField(fConditionEnabler);
-
-		fCondition =
-			new BreakpointStringFieldEditor(JavaBreakpointPreferenceStore.CONDITION, ActionMessages.getString("JavaBreakpointPreferencePage.Condition_2"), parent); //$NON-NLS-1$
-		fConditionTextControl= fCondition.getTextControl(parent);
-		try {
-			fConditionTextControl.setEnabled(((IJavaLineBreakpoint)getBreakpoint()).isConditionEnabled());
-		} catch (CoreException ce) {
-		}
-		fCondition.setEmptyStringAllowed(false);
-		fCondition.setErrorMessage(ActionMessages.getString("JavaBreakpointPreferencePage.Invalid_condition")); //$NON-NLS-1$
-		addField(fCondition);
-		
-	}
-	
-	protected FieldEditor createLabelEditor(
-		Composite parent,
-		String title,
-		String value) {
-		return new LabelFieldEditor(parent, title, value);
-	}
-	
-	protected IJavaBreakpoint getBreakpoint() {
-		return fBreakpoint;
-	}
-
-	protected void setBreakpoint(IJavaBreakpoint breakpoint) {
-		fBreakpoint = breakpoint;
-	}
-	
-	protected FieldEditor createCaughtEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.CAUGHT, ActionMessages.getString("JavaBreakpointPreferencePage.&Caught_21"), parent); //$NON-NLS-1$
-		return bfe;
-	}
-
-	protected FieldEditor createEnabledEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.ENABLED, ActionMessages.getString("JavaBreakpointPreferencePage.&Enabled_22"),parent); //$NON-NLS-1$
-		return bfe;
-	}
-
-	protected FieldEditor createMethodEntryEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.METHOD_ENTRY, ActionMessages.getString("JavaBreakpointPreferencePage.E&ntry_25"), parent); //$NON-NLS-1$
-		return bfe;
-	}
-
-	protected FieldEditor createMethodExitEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.METHOD_EXIT, ActionMessages.getString("JavaBreakpointPreferencePage.E&xit_26"), parent); //$NON-NLS-1$
-		return bfe;
-	}
-
-	protected FieldEditor createModificationEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.MODIFICATION, ActionMessages.getString("JavaBreakpointPreferencePage.&Modification_27"), parent); //$NON-NLS-1$
-		return bfe;
-	}
-
-
-	protected FieldEditor createSuspendPolicyEditor(Composite parent) {	
-		RadioGroupFieldEditor editor= new RadioGroupFieldEditor(
- 			JavaBreakpointPreferenceStore.SUSPEND_POLICY, ActionMessages.getString("JavaBreakpointPreferencePage.Suspend_Policy_29"), 1, //$NON-NLS-1$
- 			new String[][] {
- 				{ActionMessages.getString("JavaBreakpointPreferencePage.Suspend_&Thread_30"), THREAD_SUSPEND_POLICY}, //$NON-NLS-1$
- 				{ActionMessages.getString("JavaBreakpointPreferencePage.Suspend_&VM_31"), VM_SUSPEND_POLICY} //$NON-NLS-1$
- 			},
-           parent);	
-
-		return editor;
-	}
-
-	protected FieldEditor createUncaughtEditor(Composite parent) {	
-		BooleanFieldEditor bfe= new BooleanFieldEditor(JavaBreakpointPreferenceStore.UNCAUGHT, ActionMessages.getString("JavaBreakpointPreferencePage.&Uncaught_32"), parent); //$NON-NLS-1$
-		return bfe;
-	}
-	
-	/**
- 	 * The preference page implementation of this <code>IPreferencePage</code>
-	 * (and <code>IPropertyChangeListener</code>) method intercepts <code>IS_VALID</code> 
-     * events but passes other events on to its superclass.
-     */
-	public void propertyChange(PropertyChangeEvent event) {
-
-		if (event.getProperty().equals(FieldEditor.IS_VALID)) {
-			boolean newValue = ((Boolean) event.getNewValue()).booleanValue();
-			// If the new value is true then we must check all field editors.
-			// If it is false, then the page is invalid in any case.
-			if (newValue) {
-				if (fHitCount != null && event.getSource() != fHitCount) {
-					fHitCount.refreshValidState();
-				} 
-				if (fCondition != null && event.getSource() != fCondition) {
-					fCondition.refreshValidState();
-				}
-				checkState();
-			} else {
-				super.propertyChange(event);
-			}
-
-		} else {
-			super.propertyChange(event);
-		}
-}
-
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferenceStore.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferenceStore.java
deleted file mode 100644
index e2c28fb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPreferenceStore.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
- 
-import java.util.HashMap;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.ListenerList;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * A preference store that presents the state of the properties
- * of a Java breakpoint. Default settings are not supported.
- */
-public class JavaBreakpointPreferenceStore implements IPreferenceStore {
-	
-	protected final static String ENABLED= "ENABLED"; //$NON-NLS-1$
-	protected final static String HIT_COUNT= "HIT_COUNT"; //$NON-NLS-1$
-	protected final static String HIT_COUNT_ENABLED= "HIT_COUNT_ENABLED"; //$NON-NLS-1$
-	protected final static String SUSPEND_POLICY= "SUSPEND_POLICY"; //$NON-NLS-1$
-	protected final static String METHOD_EXIT= "METHOD_EXIT"; //$NON-NLS-1$
-	protected final static String METHOD_ENTRY= "METHOD_ENTRY"; //$NON-NLS-1$
-	protected final static String CAUGHT= "CAUGHT"; //$NON-NLS-1$
-	protected final static String UNCAUGHT= "UNCAUGHT"; //$NON-NLS-1$
-	protected final static String ACCESS= "ACCESS"; //$NON-NLS-1$
-	protected final static String MODIFICATION= "MODIFICATION"; //$NON-NLS-1$
-	protected final static String THREAD_FILTER= "THREAD_FILTER"; //$NON-NLS-1$
-	protected final static String EXCEPTION_FILTER= "EXCEPTION_FILTER"; //$NON-NLS-1$
-	protected final static String CONDITION= "CONDITION"; //$NON-NLS-1$
-	protected final static String CONDITION_ENABLED= "CONDITION_ENABLED"; //$NON-NLS-1$
-
-	protected HashMap fProperties;
-	private boolean fIsDirty= false; 
-	private ListenerList fListeners;
-	
-	protected JavaBreakpointPreferenceStore() {
-		fProperties= new HashMap(9);
-		fListeners= new ListenerList();
-	}
-	/**
-	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
-	 */
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		fListeners.add(listener);
-	}
-
-	/**
-	 * @see IPreferenceStore#contains(String)
-	 */
-	public boolean contains(String name) {
-		return fProperties.containsKey(name);
-	}
-
-	/**
-	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
-	 */
-	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
-		Object[] listeners = fListeners.getListeners();
-		// Do we need to fire an event.
-		if (listeners.length > 0 && (oldValue == null || !oldValue.equals(newValue))) {
-			PropertyChangeEvent pe = new PropertyChangeEvent(this, name, oldValue, newValue);
-			for (int i = 0; i < listeners.length; ++i) {
-				IPropertyChangeListener l = (IPropertyChangeListener) listeners[i];
-				l.propertyChange(pe);
-			}
-		}
-	}
-
-	/**
-	 * @see IPreferenceStore#getBoolean(String)
-	 */
-	public boolean getBoolean(String name) {
-		Object b= fProperties.get(name);
-		if (b instanceof Boolean) {
-			return ((Boolean)b).booleanValue();
-		}
-		return false;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDefaultBoolean(String)
-	 */
-	public boolean getDefaultBoolean(String name) {
-		return false;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDefaultDouble(String)
-	 */
-	public double getDefaultDouble(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDefaultFloat(String)
-	 */
-	public float getDefaultFloat(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDefaultInt(String)
-	 */
-	public int getDefaultInt(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDefaultLong(String)
-	 */
-	public long getDefaultLong(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDefaultString(String)
-	 */
-	public String getDefaultString(String name) {
-		return null;
-	}
-
-	/**
-	 * @see IPreferenceStore#getDouble(String)
-	 */
-	public double getDouble(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getFloat(String)
-	 */
-	public float getFloat(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getInt(String)
-	 */
-	public int getInt(String name) {
-		Object i= fProperties.get(name);
-		if (i instanceof Integer) {
-			return ((Integer)i).intValue();
-		}
-		return 1;
-	}
-
-	/**
-	 * @see IPreferenceStore#getLong(String)
-	 */
-	public long getLong(String name) {
-		return 0;
-	}
-
-	/**
-	 * @see IPreferenceStore#getString(String)
-	 */
-	public String getString(String name) {
-		Object str= fProperties.get(name);
-		if (str instanceof String) {
-			return (String)str;
-		}
-		return null;
-	}
-
-	/**
-	 * @see IPreferenceStore#isDefault(String)
-	 */
-	public boolean isDefault(String name) {
-		return false;
-	}
-
-	/**
-	 * @see IPreferenceStore#needsSaving()
-	 */
-	public boolean needsSaving() {
-		return fIsDirty;
-	}
-
-	/**
-	 * @see IPreferenceStore#putValue(String, String)
-	 */
-	public void putValue(String name, String newValue) {
-		Object oldValue= fProperties.get(name);
-		if (oldValue == null || !oldValue.equals(newValue)) {
-			fProperties.put(name, newValue);
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
-	 */
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		fListeners.remove(listener);
-	}
-
-	/**
-	 * @see IPreferenceStore#setDefault(String, boolean)
-	 */
-	public void setDefault(String name, boolean value) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setDefault(String, double)
-	 */
-	public void setDefault(String name, double value) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setDefault(String, float)
-	 */
-	public void setDefault(String name, float value) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setDefault(String, int)
-	 */
-	public void setDefault(String name, int value) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setDefault(String, long)
-	 */
-	public void setDefault(String name, long value) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setDefault(String, String)
-	 */
-	public void setDefault(String name, String defaultObject) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setToDefault(String)
-	 */
-	public void setToDefault(String name) {
-	}
-
-	/**
-	 * @see IPreferenceStore#setValue(String, boolean)
-	 */
-	public void setValue(String name, boolean newValue) {
-		boolean oldValue= getBoolean(name);
-		if (oldValue != newValue) {
-			fProperties.put(name,new Boolean(newValue));
-			setDirty(true);
-			firePropertyChangeEvent(name, new Boolean(oldValue), new Boolean(newValue));
-		}
-	}
-
-	/**
-	 * @see IPreferenceStore#setValue(String, double)
-	 */
-	public void setValue(String name, double value) {
-		//breakpoints do not currently have any double properties
-	}
-
-	/**
-	 * @see IPreferenceStore#setValue(String, float)
-	 */
-	public void setValue(String name, float value) {
-		//breakpoints do not currently have any float properties
-	}
-
-	/**
-	 * @see IPreferenceStore#setValue(String, int)
-	 */
-	public void setValue(String name, int newValue) {
-		int oldValue= getInt(name);
-		if (oldValue != newValue) {
-			fProperties.put(name,new Integer(newValue));
-			setDirty(true);
-			firePropertyChangeEvent(name, new Integer(oldValue), new Integer(newValue));
-		}
-	}
-
-	/**
-	 * @see IPreferenceStore#setValue(String, long)
-	 */
-	public void setValue(String name, long value) {
-		//breakpoints do not currently have any long properties
-	}
-
-	/**
-	 * @see IPreferenceStore#setValue(String, String)
-	 */
-	public void setValue(String name, String newValue) {
-		Object oldValue= fProperties.get(name);
-		if (oldValue == null || !oldValue.equals(newValue)) {
-			fProperties.put(name, newValue);
-			setDirty(true);
-			firePropertyChangeEvent(name, oldValue, newValue);
-		}
-	}
-
-	protected void setDirty(boolean isDirty) {
-		fIsDirty = isDirty;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java
deleted file mode 100644
index 00ae05b..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2002.

- * All Rights Reserved.

- */

- 

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IObjectActionDelegate;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * Presents a custom properties dialog to configure

- * the attibutes of a Java Breakpoint.

- */

-public class JavaBreakpointPropertiesAction implements IObjectActionDelegate {

-	

-	private IWorkbenchPart fPart;

-	private IJavaBreakpoint fBreakpoint;

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		Dialog d= 

-			new JavaBreakpointPropertiesDialog(getActivePart().getSite().getShell(), getBreakpoint());

-		d.open();

-	}

-

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (selection instanceof IStructuredSelection) {

-			IStructuredSelection ss= (IStructuredSelection)selection;

-			if (ss.isEmpty() || ss.size() > 1) {

-				return;

-			}

-			Object element= ss.getFirstElement();

-			if (element instanceof IJavaBreakpoint) {

-				setBreakpoint((IJavaBreakpoint)element);

-			}

-		}

-	}

-	

-	protected IWorkbenchPart getActivePart() {

-		return fPart;

-	}

-

-	protected void setActivePart(IWorkbenchPart part) {

-		fPart = part;

-	}

-	

-	protected IJavaBreakpoint getBreakpoint() {

-		return fBreakpoint;

-	}

-

-	protected void setBreakpoint(IJavaBreakpoint breakpoint) {

-		fBreakpoint = breakpoint;

-	}

-	/**

-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

-		setActivePart(targetPart);

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesDialog.java
deleted file mode 100644
index 3d97612..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesDialog.java
+++ /dev/null
@@ -1,506 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-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.IJavaWatchpoint;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferencePageContainer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceColors;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Shell;
-
-public class JavaBreakpointPropertiesDialog extends Dialog implements IPreferencePageContainer {
-
-	/**
-	 * Layout for the page container.
-	 *
-	 * @see JavaBreakpointPropertiesDialog#createPageContainer(Composite, int)
-	 */
-	private class PageLayout extends Layout {
-		public void layout(Composite composite, boolean force) {
-			Rectangle rect = composite.getClientArea();
-			Control [] children = composite.getChildren();
-			for (int i= 0; i < children.length; i++) {
-				children[i].setSize(rect.width, rect.height);
-			}
-		}
-		public Point computeSize(Composite composite, int wHint, int hHint, boolean force) {
-			if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-				return new Point(wHint, hHint);
-			int x= fMinimumPageSize.x;
-			int y= fMinimumPageSize.y;
-			
-			Control[] children= composite.getChildren();
-			for (int i= 0; i < children.length; i++) {
-				Point size= children[i].computeSize(SWT.DEFAULT, SWT.DEFAULT, force);
-				x= Math.max(x, size.x);
-				y= Math.max(y, size.y);
-			}				
-			if (wHint != SWT.DEFAULT) x = wHint;
-			if (hHint != SWT.DEFAULT) y = hHint;
-			return new Point(x, y);
-		}	
-	}
-
-	private Composite fTitleArea;
-	private Label fTitleImage;
-	private CLabel fMessageLabel;
-	
-	private String fMessage;
-	private Color fNormalMsgAreaBackground;
-	private Image fErrorMsgImage;
-
-	
-	private JavaBreakpointPreferencePage fPage;
-	
-	private Button fOkButton;
-	
-	/**
-	 * Must declare our own images as the JFaceResource images will not be created unless
-	 * a property/preference dialog has been shown
-	 */
-	protected static final String PREF_DLG_TITLE_IMG = "breakpoint_preference_dialog_title_image";//$NON-NLS-1$
-	protected static final String PREF_DLG_IMG_TITLE_ERROR = "breakpoint_preference_dialog_title_error_image";//$NON-NLS-1$
-	static {
-		ImageRegistry reg = JDIDebugUIPlugin.getDefault().getImageRegistry();
-		reg.put(PREF_DLG_TITLE_IMG, ImageDescriptor.createFromFile(PreferenceDialog.class, "images/pref_dialog_title.gif"));//$NON-NLS-1$
-		reg.put(PREF_DLG_IMG_TITLE_ERROR, ImageDescriptor.createFromFile(Dialog.class, "images/message_error.gif"));//$NON-NLS-1$
-	}
-	
-	/**
-	 * The Composite in which a page is shown.
-	 */
-	private Composite fPageContainer;
-
-	/**
-	 * The minimum page size; 200 by 200 by default.
-	 *
-	 * @see #setMinimumPageSize(Point)
-	 */
-	private Point fMinimumPageSize = new Point(200,200);
-	
-	/**
-	 * The breakpoint that this dialog is operating on
-	 */
-	private IJavaBreakpoint fBreakpoint;
-		
-	/**
-	 * The "fake" preference store used to interface between
-	 * the breakpoint and the breakpoint preference page.
-	 */
-	private JavaBreakpointPreferenceStore fJavaBreakpointPreferenceStore;
-	
-	protected JavaBreakpointPropertiesDialog(Shell parentShell, IJavaBreakpoint breakpoint) {
-		super(parentShell);
-		setBreakpoint(breakpoint);
-		fJavaBreakpointPreferenceStore= new JavaBreakpointPreferenceStore();
-	}
-
-	/**
-	 * @see Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		final List changedProperties= new ArrayList(5);
-		getPreferenceStore().addPropertyChangeListener( new IPropertyChangeListener() {
-			/**
-			 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-			 */
-			public void propertyChange(PropertyChangeEvent event) {
-				changedProperties.add(event.getProperty());
-			}
-		});
-		fPage.performOk();
-		setBreakpointProperties(changedProperties);
-		super.okPressed();
-	}
-	
-	/**
-	 * All of the properties that the user has changed via the dialog
-	 * are written through to the breakpoint.
-	 */
-	protected void setBreakpointProperties(final List changedProperties) {
-		IWorkspaceRunnable wr= new IWorkspaceRunnable() {
-			
-		public void run(IProgressMonitor monitor) throws CoreException {
-				
-		boolean newEnabled= false;
-		IJavaBreakpoint breakpoint= getBreakpoint();
-		Iterator changed= changedProperties.iterator();
-		while (changed.hasNext()) {
-			String property = (String) changed.next();
-			switch (property.charAt(0)) {
-				case 'A': //access
-					IJavaWatchpoint jWatchpoint= (IJavaWatchpoint)breakpoint;
-					jWatchpoint.setAccess(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.ACCESS));
-					break;
-				case 'C': //caught or condition
-					switch (property.charAt(property.length() - 1)) {
-						case 'T': // caught
-							IJavaExceptionBreakpoint jeBreakpoint= (IJavaExceptionBreakpoint)breakpoint;
-							jeBreakpoint.setCaught(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.CAUGHT));
-							break;
-						case 'N': // condition
-							IJavaLineBreakpoint lineBreakpoint= (IJavaLineBreakpoint)breakpoint;
-							lineBreakpoint.setCondition(getPreferenceStore().getString(JavaBreakpointPreferenceStore.CONDITION));
-							break;
-						case 'D': // condition_enabled
-							lineBreakpoint= (IJavaLineBreakpoint)breakpoint;
-							lineBreakpoint.setConditionEnabled(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.CONDITION_ENABLED));
-							break;
-					}
-					break;
-				case 'E'://enabled
-					newEnabled= true;
-					break;
-				case 'H':
-					if (property.charAt(property.length() - 1) == 'T') {
-						//hitcount
-						breakpoint.setHitCount(getPreferenceStore().getInt(JavaBreakpointPreferenceStore.HIT_COUNT));
-					} else {
-						if (getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.HIT_COUNT_ENABLED)) {
-							 if (!changedProperties.contains(JavaBreakpointPreferenceStore.HIT_COUNT)) {
-								//enabled the hit count but did not change the hit count value
-								breakpoint.setHitCount(getPreferenceStore().getInt(JavaBreakpointPreferenceStore.HIT_COUNT));
-							}
-						} else {
-							//disable the hitCount
-							breakpoint.setHitCount(0);	
-						}
-					}
-					break;
-				case 'M':
-					char lastChar= property.charAt(property.length() - 1);
-					if (lastChar == 'T') {
-						//exit
-						IJavaMethodBreakpoint jmBreakpoint= (IJavaMethodBreakpoint)breakpoint;
-						jmBreakpoint.setExit(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.METHOD_EXIT));
-					} else if (lastChar == 'Y') {
-						//entry
-						IJavaMethodBreakpoint jmBreakpoint= (IJavaMethodBreakpoint)breakpoint;
-						jmBreakpoint.setEntry(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.METHOD_ENTRY));
-					} else {
-						jWatchpoint= (IJavaWatchpoint)breakpoint;
-						jWatchpoint.setModification(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.MODIFICATION));
-					}
-					break;
-				case 'S':
-					String value= getPreferenceStore().getString(JavaBreakpointPreferenceStore.SUSPEND_POLICY);
-					if (value.equals(JavaBreakpointPreferencePage.VM_SUSPEND_POLICY)) {
-						breakpoint.setSuspendPolicy(IJavaBreakpoint.SUSPEND_VM);
-					} else {
-						breakpoint.setSuspendPolicy(IJavaBreakpoint.SUSPEND_THREAD);
-					}
-					break;
-				case 'U':
-					IJavaExceptionBreakpoint jeBreakpoint= (IJavaExceptionBreakpoint)breakpoint;
-					jeBreakpoint.setUncaught(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.UNCAUGHT));
-					break;
-			}
-			
-		}
-		if (newEnabled) {
-			//some of the other attributes auto enable the breakpoint
-			//ensure that the breakpoint is set as the user specified
-			breakpoint.setEnabled(getPreferenceStore().getBoolean(JavaBreakpointPreferenceStore.ENABLED));
-		}
-		}};
-		
-		try {
-			ResourcesPlugin.getWorkspace().run(wr, null);
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);
-		}	
-	}
-	/**
-	 * Sets the title for this dialog.
-	 * @param title the title.
-	 */
-	public void setTitle(String title) {
-		Shell shell= getShell();
-		if ((shell != null) && !shell.isDisposed()) {
-			shell.setText(title);
-		}
-	}
-	
-	/**
-	 * @see Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		GridData gd;
-		Composite composite = (Composite)super.createDialogArea(parent);
-		((GridLayout) composite.getLayout()).numColumns = 1;
-		
-		// Build the title area and separator line
-		Composite titleComposite = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.verticalSpacing = 0;
-		layout.horizontalSpacing = 0;
-		titleComposite.setLayout(layout);
-		titleComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		createTitleArea(titleComposite);
-	
-		Label titleBarSeparator = new Label(titleComposite, SWT.HORIZONTAL | SWT.SEPARATOR);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		titleBarSeparator.setLayoutData(gd);
-	
-		// Build the Page container
-		fPageContainer = createPageContainer(composite, 2);
-		fPageContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-		fPageContainer.setFont(parent.getFont());
-
-		fPage= new JavaBreakpointPreferencePage(getBreakpoint());
-		fPage.setContainer(this);
-		fPage.createControl(fPageContainer);
-			
-		// Build the separator line
-		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		separator.setLayoutData(gd);
-	
-		return composite;
-	}
-	
-	/**
-	 * Creates the dialog's title area.
-	 *
-	 * @param parent the SWT parent for the title area composite
-	 * @return the created title area composite
-	 */
-	private Composite createTitleArea(Composite parent) {
-		// Create the title area which will contain
-		// a title, message, and image.
-		fTitleArea = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.verticalSpacing = 0;
-		layout.horizontalSpacing = 0;
-		layout.numColumns = 2;
-		
-		// Get the colors for the title area
-		Display display = parent.getDisplay();
-		Color bg = JFaceColors.getBannerBackground(display);
-		Color fg = JFaceColors.getBannerForeground(display);
-		
-		GridData layoutData = new GridData(GridData.FILL_BOTH);
-		fTitleArea.setLayout(layout);
-		fTitleArea.setLayoutData(layoutData);
-		fTitleArea.setBackground(bg);
-	
-		// Message label
-		fMessageLabel = new CLabel(fTitleArea, SWT.LEFT);
-		fMessageLabel.setBackground(bg);
-		fMessageLabel.setForeground(fg);
-		fMessageLabel.setText(" ");//$NON-NLS-1$
-		fMessageLabel.setFont(JFaceResources.getBannerFont());
-		
-		final IPropertyChangeListener fontListener = new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if(JFaceResources.BANNER_FONT.equals(event.getProperty()) ||
-					JFaceResources.DIALOG_FONT.equals(event.getProperty())) {
-					updateMessage();
-				}
-			}
-		};
-		
-		fMessageLabel.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				JFaceResources.getFontRegistry().removeListener(fontListener);
-			}
-		});
-		
-		JFaceResources.getFontRegistry().addListener(fontListener);
-				
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		fMessageLabel.setLayoutData(gd);
-	
-		// Title image
-		fTitleImage = new Label(fTitleArea, SWT.LEFT);
-		fTitleImage.setBackground(bg);
-		fTitleImage.setImage(JDIDebugUIPlugin.getDefault().getImageRegistry().get(PREF_DLG_TITLE_IMG));
-		gd = new GridData(); 
-		gd.horizontalAlignment = gd.END;
-		fTitleImage.setLayoutData(gd);
-	
-		return fTitleArea;
-	}
-
-	/**
-	 * Creates the inner page container.
-	 */
-	private Composite createPageContainer(Composite parent, int numColumns) {
-		Composite result = new Composite(parent, SWT.NULL);
-		result.setLayout(new PageLayout());
-		return result;
-	}
-
-	/**
-	 * Sets the minimum page size.
-	 *
-	 * @param size the page size encoded as
-	 *   <code>new Point(width,height)</code>
-	 * @see #setMinimumPageSize(int,int)
-	 */
-	public void setMinimumPageSize(Point size) {
-		fMinimumPageSize.x = size.x;
-		fMinimumPageSize.y = size.y;
-	}
-	
-	/**
-	 * Display the given error message. The currently displayed message
-	 * is saved and will be redisplayed when the error message is set
-	 * to <code>null</code>.
-	 *
-	 * @param errorMessage the errorMessage to display or <code>null</code>
-	 */
-	public void setErrorMessage(String errorMessage) {
-		if (errorMessage == null) {
-			if (fMessageLabel.getImage() != null) {
-				// we were previously showing an error
-				fMessageLabel.setBackground(fNormalMsgAreaBackground);
-				fMessageLabel.setImage(null);
-				fTitleImage.setImage(JDIDebugUIPlugin.getDefault().getImageRegistry().get(PREF_DLG_TITLE_IMG));
-				fTitleArea.layout(true);
-			}
-	
-			// show the message
-			setMessage(fMessage);
-	
-		} else {
-			fMessageLabel.setText(errorMessage);
-			if (fMessageLabel.getImage() == null) {
-				// we were not previously showing an error
-							
-				// lazy initialize the error background color and image
-				if (fErrorMsgImage == null) {
-					fErrorMsgImage = JDIDebugUIPlugin.getDefault().getImageRegistry().get(PREF_DLG_IMG_TITLE_ERROR);
-				}
-	
-				// show the error	
-				fNormalMsgAreaBackground = fMessageLabel.getBackground();
-				fMessageLabel.setBackground(JFaceColors.getErrorBackground(fMessageLabel.getDisplay()));
-				fMessageLabel.setImage(fErrorMsgImage);
-				fTitleImage.setImage(null);
-				fTitleArea.layout(true);
-			}
-		}
-	}
-	/**
-	 * Set the message text. If the message line currently displays an error,
-	 * the message is stored and will be shown after a call to clearErrorMessage
-	 */
-	public void setMessage(String newMessage) {
-		fMessage = newMessage;
-		if (fMessage == null) {
-			fMessage = "";//$NON-NLS-1$
-		}
-		if (fMessageLabel.getImage() == null) {
-			// we are not showing an error
-			fMessageLabel.setText(fMessage);
-		}
-	}
-	
-	/**
-	 * @see IPreferencePageContainer#updateMessage()
-	 */
-	public void updateMessage() {
-		String pageMessage = fPage.getMessage();
-		String pageErrorMessage = fPage.getErrorMessage();
-
-		// Adjust the font
-		if (pageMessage == null && pageErrorMessage == null)
-			fMessageLabel.setFont(JFaceResources.getBannerFont());
-		else
-			fMessageLabel.setFont(JFaceResources.getDialogFont());
-
-		// Set the message and error message	
-		if (pageMessage == null) {
-			setMessage(fPage.getTitle());
-		} else {
-			setMessage(pageMessage);
-		}
-		setErrorMessage(pageErrorMessage);
-	}
-	
-	protected IJavaBreakpoint getBreakpoint() {
-		return fBreakpoint;
-	}
-
-	protected void setBreakpoint(IJavaBreakpoint breakpoint) {
-		fBreakpoint = breakpoint;
-	}
-	
-	/**
-	 * @see IPreferencePageContainer#getPreferenceStore()
-	 */
-	public IPreferenceStore getPreferenceStore() {
-		return fJavaBreakpointPreferenceStore;
-	}
-
-	/**
-	 * @see IPreferencePageContainer#updateButtons()
-	 */
-	public void updateButtons() {
-		if (fOkButton != null) {
-			fOkButton.setEnabled(fPage.isValid());
-		}
-	}
-
-	/**
-	 * @see IPreferencePageContainer#updateTitle()
-	 */
-	public void updateTitle() {
-		setTitle(fPage.getTitle());
-	}
-	
-	/**
-	 * @see Dialog#createButtonsForButtonBar(Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		fOkButton= createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java
deleted file mode 100644
index 094ec03..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-
-/**
- * Presents a custom properties dialog to configure
- * the attibutes of a Java Breakpoint from the ruler popup menu of a 
- * text editor.
- */
-public class JavaBreakpointPropertiesRulerAction extends AbstractBreakpointRulerAction {
-
-	/**
-	 * Creates the action to enable/disable breakpoints
-	 */
-	public JavaBreakpointPropertiesRulerAction(ITextEditor editor, IVerticalRulerInfo info) {
-		setInfo(info);
-		setTextEditor(editor);
-		setText(ActionMessages.getString("JavaBreakpointPropertiesRulerAction.Breakpoint_&Properties_1")); //$NON-NLS-1$
-	}
-	/**
-	 * @see Action#run()
-	 */
-	public void run() {
-		if (getBreakpoint() != null) {
-			Dialog d= 
-				new JavaBreakpointPropertiesDialog(getTextEditor().getEditorSite().getShell(), (IJavaBreakpoint)getBreakpoint());
-			d.open();	
-		}
-	}
-	
-	/**
-	 * @see IUpdate#update()
-	 */
-	public void update() {
-		setBreakpoint(determineBreakpoint());
-		if (getBreakpoint() == null || !(getBreakpoint() instanceof IJavaBreakpoint)) {
-			setBreakpoint(null);
-			setEnabled(false);
-			return;
-		}
-		setEnabled(true);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerActionDelegate.java
deleted file mode 100644
index fc2b2f0..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/JavaBreakpointPropertiesRulerActionDelegate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class JavaBreakpointPropertiesRulerActionDelegate extends AbstractRulerActionDelegate {
-
-	/**
-	 * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo)
-	 */
-	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		return new JavaBreakpointPropertiesRulerAction(editor, rulerInfo);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java
deleted file mode 100644
index 48e2b2c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Action for adding/removing breakpoints at a line in a type represented
- * by the source shown in the active Java Editor.
- */
-public class ManageBreakpointActionDelegate implements IWorkbenchWindowActionDelegate, IPartListener {
-	
-	private boolean fInitialized= false;
-	private IAction fAction= null;
-	private int fLineNumber;
-	private IType fType= null;
-	private ITextEditor fTextEditor= null;
-	private IWorkbenchWindow fWorkbenchWindow= null;
-
-	public ManageBreakpointActionDelegate() {
-	}
-	
-	/**
-	 * Manages a breakpoint.
-	 */
-	protected void manageBreakpoint(IEditorInput editorInput) {
-		ISelectionProvider sp= getTextEditor().getSelectionProvider();
-		if (sp == null || getType() == null) {
-			beep();
-			return;
-		}
-		ISelection selection= sp.getSelection();
-		if (selection instanceof ITextSelection) {
-			IDocument document= getTextEditor().getDocumentProvider().getDocument(editorInput);
-			BreakpointLocationVerifier bv = new BreakpointLocationVerifier();
-			int lineNumber = bv.getValidBreakpointLocation(document, ((ITextSelection)selection).getStartLine());		
-			if (lineNumber > -1) {
-				try {
-					IJavaLineBreakpoint breakpoint= JDIDebugModel.lineBreakpointExists(getType().getFullyQualifiedName(), lineNumber);
-					if (breakpoint != null) {
-						DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
-					} else {
-						Map attributes = new HashMap(10);
-						BreakpointUtils.addJavaBreakpointAttributes(attributes, getType());
-						JDIDebugModel.createLineBreakpoint(BreakpointUtils.getBreakpointResource(getType()), getType().getFullyQualifiedName(), lineNumber, -1, -1, 0, true, attributes);
-					}
-				} catch (CoreException ce) {
-					ExceptionHandler.handle(ce, ActionMessages.getString("ManageBreakpointActionDelegate.error.title1"), ActionMessages.getString("ManageBreakpointActionDelegate.error.message1")); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Determines if a breakpoint exists on the line of the current selection.
-	 */
-	protected boolean breakpointExists(IEditorInput editorInput) {
-		IType type= getType(editorInput);
-		if (type != null) {
-			try {
-				return JDIDebugModel.lineBreakpointExists(type.getFullyQualifiedName(), getLineNumber()) == null;
-			} catch (CoreException ce) {
-				JDIDebugUIPlugin.log(ce);
-			}
-		}
-	
-		return false;
-	}
-	
-	protected IType getType(IEditorInput editorInput) {
-		IType type= null;
-		ISelectionProvider sp= getTextEditor().getSelectionProvider();
-		if (sp != null) {
-			ISelection s= sp.getSelection();
-			if (s instanceof ITextSelection) {
-				ITextSelection selection= (ITextSelection) s;
-				setLineNumber(selection.getStartLine() + 1);
-				type= getType();
-				if (type != null && type.exists()) {
-					try {
-						ISourceRange sourceRange= type.getSourceRange();
-						if (selection.getOffset() >= sourceRange.getOffset() && selection.getOffset() <= (sourceRange.getOffset() + sourceRange.getLength() - 1)) {
-							return type;
-						}
-					} catch(JavaModelException e) {
-						JDIDebugUIPlugin.log(e);
-					}	
-				}
-				type= getType0(selection, editorInput);
-			}
-		}
-		return type;
-	}
-	
-	protected IType getType0(ITextSelection selection, IEditorInput editorInput) {
-		IMember member= ActionDelegateHelper.getDefault().getCurrentMember(selection);
-		IType type= null;
-		if (member instanceof IType) {
-			type = (IType)member;
-		} else if (member != null) {
-			type= member.getDeclaringType();
-		}
-	
-		setType(type);
-		return type;
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		if (getTextEditor() != null) {
-			update();
-			manageBreakpoint(getTextEditor().getEditorInput());
-		}
-	}
-	
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (!fInitialized) {
-			setAction(action);
-			if (getWorkbenchWindow() != null) {
-				IWorkbenchPage page= getWorkbenchWindow().getActivePage();
-				if (page != null) {
-					IEditorPart part= page.getActiveEditor();
-					if (part instanceof ITextEditor) {
-						if (!(part instanceof JavaSnippetEditor)) {
-							setTextEditor((ITextEditor)part);
-							update(getTextEditor().getSelectionProvider().getSelection());
-						}
-					}
-				}
-			}
-			fInitialized= true;
-		} 
-		
-		update(selection);
-	}
-		
-	protected void update(ISelection selection) {
-		setEnabledState(getTextEditor());
-	}
-	
-	protected void update() {
-		IAction action= getAction();
-		if (action != null) {
-			if (getTextEditor() != null) {
-				breakpointExists(getTextEditor().getEditorInput());
-			}
-			action.setEnabled(getTextEditor()!= null && getType() != null);
-		}
-	}
-	
-	protected int getLineNumber() {
-		return fLineNumber;
-	}
-	
-	protected void setLineNumber(int lineNumber) {
-		fLineNumber = lineNumber;
-	}
-	
-	protected IType getType() {
-		return fType;
-	}
-	
-	protected void setType(IType type) {
-		fType = type;
-	}
-	
-	protected IAction getAction() {
-		return fAction;
-	}
-
-	protected void setAction(IAction action) {
-		fAction = action;
-	}
-	
-	/**
-	 * @see IPartListener#partActivated(IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		if (part instanceof ITextEditor) {
-			if (part instanceof JavaSnippetEditor) {
-				setTextEditor(null);
-			} else {
-				setTextEditor((ITextEditor)part);
-			}	
-		}
-	}
-
-	/**
-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-	}
-
-	/**
-	 * @see IPartListener#partClosed(IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part == getTextEditor()) {
-			setTextEditor(null);
-			if (getAction() != null) {
-				getAction().setEnabled(false);
-			}
-		}
-	}
-
-	/**
-	 * @see IPartListener#partDeactivated(IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-	}
-
-	/**
-	 * @see IPartListener#partOpened(IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-		if (part instanceof ITextEditor) {
-			if (getTextEditor() == null) {
-				if (!(part instanceof JavaSnippetEditor)) {
-					setTextEditor((ITextEditor)part);
-				}
-			}
-		}
-	}
-	
-	protected ITextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	protected void setTextEditor(ITextEditor editor) {
-		fTextEditor = editor;
-		setType(null);
-		setEnabledState(editor);
-	}
-
-	protected void setEnabledState(ITextEditor editor) {
-		if (getAction() != null) {
-			getAction().setEnabled(editor != null  
-			&& (editor.getSite().getId().equals(JavaUI.ID_CF_EDITOR)
-			|| editor.getSite().getId().equals(JavaUI.ID_CU_EDITOR)));
-		} 
-	}
-	
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		setWorkbenchWindow(window);
-		window.getPartService().addPartListener(this);
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		getWorkbenchWindow().getPartService().removePartListener(this);
-	}
-
-	protected IWorkbenchWindow getWorkbenchWindow() {
-		return fWorkbenchWindow;
-	}
-
-	protected void setWorkbenchWindow(IWorkbenchWindow workbenchWindow) {
-		fWorkbenchWindow = workbenchWindow;
-	}
-
-	protected void beep() {
-		if (JDIDebugUIPlugin.getActiveWorkbenchShell() != null) {
-			JDIDebugUIPlugin.getActiveWorkbenchShell().getDisplay().beep();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerAction.java
deleted file mode 100644
index 263b287..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerAction.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-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.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-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.IMember;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.ui.IWorkingCopyManager;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.IUpdate;
-
-public class ManageBreakpointRulerAction extends Action implements IUpdate {	
-	
-	private IVerticalRulerInfo fRuler;
-	private ITextEditor fTextEditor;
-	private String fMarkerType;
-	private List fMarkers;
-
-	private String fAddLabel;
-	private String fRemoveLabel;
-	
-	public ManageBreakpointRulerAction(IVerticalRulerInfo ruler, ITextEditor editor) {
-		fRuler= ruler;
-		fTextEditor= editor;
-		fMarkerType= IBreakpoint.BREAKPOINT_MARKER;
-		fAddLabel= ActionMessages.getString("ManageBreakpointRulerAction.add.label"); //$NON-NLS-1$
-		fRemoveLabel= ActionMessages.getString("ManageBreakpointRulerAction.remove.label"); //$NON-NLS-1$
-	}
-	
-	/** 
-	 * Returns the resource for which to create the marker, 
-	 * or <code>null</code> if there is no applicable resource.
-	 *
-	 * @return the resource for which to create the marker or <code>null</code>
-	 */
-	protected IResource getResource() {
-		IEditorInput input= fTextEditor.getEditorInput();
-		
-		IResource resource= (IResource) input.getAdapter(IFile.class);
-		
-		if (resource == null)
-			resource= (IResource) input.getAdapter(IResource.class);
-			
-		return resource;
-	}
-	
-	/**
-	 * Checks whether a position includes the ruler's line of activity.
-	 *
-	 * @param position the position to be checked
-	 * @param document the document the position refers to
-	 * @return <code>true</code> if the line is included by the given position
-	 */
-	protected boolean includesRulerLine(Position position, IDocument document) {
-
-		if (position != null) {
-			try {
-				int markerLine= document.getLineOfOffset(position.getOffset());
-				int line= fRuler.getLineOfLastMouseButtonActivity();
-				if (line == markerLine) {
-					return true;
-				}
-			} catch (BadLocationException x) {
-			}
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Returns this action's vertical ruler info.
-	 *
-	 * @return this action's vertical ruler
-	 */
-	protected IVerticalRulerInfo getVerticalRulerInfo() {
-		return fRuler;
-	}
-	
-	/**
-	 * Returns this action's editor.
-	 *
-	 * @return this action's editor
-	 */
-	protected ITextEditor getTextEditor() {
-		return fTextEditor;
-	}
-	
-	/**
-	 * Returns the <code>AbstractMarkerAnnotationModel</code> of the editor's input.
-	 *
-	 * @return the marker annotation model
-	 */
-	protected AbstractMarkerAnnotationModel getAnnotationModel() {
-		IDocumentProvider provider= fTextEditor.getDocumentProvider();
-		IAnnotationModel model= provider.getAnnotationModel(fTextEditor.getEditorInput());
-		if (model instanceof AbstractMarkerAnnotationModel) {
-			return (AbstractMarkerAnnotationModel) model;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the <code>IDocument</code> of the editor's input.
-	 *
-	 * @return the document of the editor's input
-	 */
-	protected IDocument getDocument() {
-		IDocumentProvider provider= fTextEditor.getDocumentProvider();
-		return provider.getDocument(fTextEditor.getEditorInput());
-	}
-	
-	/**
-	 * @see IUpdate#update()
-	 */
-	public void update() {
-		fMarkers= getMarkers();
-		setText(fMarkers.isEmpty() ? fAddLabel : fRemoveLabel);
-	}
-
-	/**
-	 * @see Action#run()
-	 */
-	public void run() {
-		if (fMarkers.isEmpty()) {
-			addMarker();
-		} else {
-			removeMarkers(fMarkers);
-		}
-	}
-	
-	protected List getMarkers() {
-		
-		List breakpoints= new ArrayList();
-		
-		IResource resource= getResource();
-		IDocument document= getDocument();
-		AbstractMarkerAnnotationModel model= getAnnotationModel();
-		
-		if (model != null) {
-			try {
-				
-				IMarker[] markers= null;
-				if (resource instanceof IFile)
-					markers= resource.findMarkers(IBreakpoint.BREAKPOINT_MARKER, true, IResource.DEPTH_INFINITE);
-				else {
-					IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-					markers= root.findMarkers(IBreakpoint.BREAKPOINT_MARKER, true, IResource.DEPTH_INFINITE);
-				}
-				
-				if (markers != null) {
-					IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager();
-					for (int i= 0; i < markers.length; i++) {
-						IBreakpoint breakpoint= breakpointManager.getBreakpoint(markers[i]);
-						if (breakpoint != null && breakpointManager.isRegistered(breakpoint) && 
-								includesRulerLine(model.getMarkerPosition(markers[i]), document))
-							breakpoints.add(markers[i]);
-					}
-				}
-			} catch (CoreException x) {
-				JDIDebugUIPlugin.log(x.getStatus());
-			}
-		}
-		return breakpoints;
-	}
-	
-	protected void addMarker() {
-		
-		IEditorInput editorInput= getTextEditor().getEditorInput();
-		
-		IDocument document= getDocument();
-		int rulerLine= getVerticalRulerInfo().getLineOfLastMouseButtonActivity();
-		
-		try {
-			BreakpointLocationVerifier bv = new BreakpointLocationVerifier();
-			int lineNumber = bv.getValidBreakpointLocation(document, rulerLine);
-			if (lineNumber > 0) {
-				
-				IRegion line= document.getLineInformation(lineNumber - 1);
-				
-				IType type = null;
-				IClassFile classFile= (IClassFile) editorInput.getAdapter(IClassFile.class);
-				if (classFile != null) {
-					type= classFile.getType();
-				} else if (editorInput instanceof IFileEditorInput) {
-					IWorkingCopyManager manager= JavaUI.getWorkingCopyManager();
-					ICompilationUnit unit= manager.getWorkingCopy(editorInput);
-					if (unit != null) {
-						synchronized (unit) {
-							unit.reconcile();
-						}
-						IJavaElement e = unit.getElementAt(line.getOffset());
-						if (e instanceof IType) {
-							type= (IType)e;
-						} else if (e instanceof IMember) {
-							type= ((IMember)e).getDeclaringType();
-						}
-					}
-				}
-				
-				if (type != null) {
-					IJavaProject project= type.getJavaProject();
-					if (type.exists() && project != null && project.isOnClasspath(type)) {
-						if (JDIDebugModel.lineBreakpointExists(type.getFullyQualifiedName(),lineNumber) == null) {
-							Map attributes = new HashMap(10);
-							JavaCore.addJavaElementMarkerAttributes(attributes, type);
-							attributes.put("org.eclipse.jdt.debug.ui.JAVA_ELEMENT_HANDLE_ID", type.getHandleIdentifier()); //$NON-NLS-1$
-							JDIDebugModel.createLineBreakpoint(getBreakpointResource(type), type.getFullyQualifiedName(), lineNumber, -1, -1, 0, true, attributes);
-						}
-					}
-				}
-			}
-		} catch (DebugException e) {
-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.adding.message1"), e); //$NON-NLS-1$
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.adding.message1"), e); //$NON-NLS-1$
-		} catch (BadLocationException e) {
-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.adding.message1"), e); //$NON-NLS-1$
-		}
-	}
-	
-	protected void removeMarkers(List markers) {
-		IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager();
-		try {
-			Iterator e= markers.iterator();
-			while (e.hasNext()) {
-				IBreakpoint breakpoint= breakpointManager.getBreakpoint((IMarker) e.next());
-				breakpointManager.removeBreakpoint(breakpoint, true);
-			}
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.removing.message1"), e); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Returns the resource on which a breakpoint marker should
-	 * be created for the given member. The resource returned is the 
-	 * associated file, or project in the case of a class file in 
-	 * a jar.
-	 * 
-	 * @param member member in which a breakpoint is being created
-	 * @return resource the resource on which a breakpoint marker
-	 *  should be created
-	 * @exception CoreException if an exception occurs accessing the
-	 *  underlying resource or Java model elements
-	 */
-	public IResource getBreakpointResource(IMember member) throws CoreException {
-		ICompilationUnit cu = member.getCompilationUnit();
-		if (cu != null && cu.isWorkingCopy()) {
-			member = (IMember)cu.getOriginal(member);
-		}
-		IResource res = member.getUnderlyingResource();
-		if (res == null) {
-			res = member.getJavaProject().getProject();
-		}
-		return res;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java
deleted file mode 100644
index 3b9f998..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class ManageBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-
-	/**
-	 * @see AbstractRulerActionDelegate#createAction()
-	 */
-	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		return new ManageBreakpointRulerAction(rulerInfo, editor);
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageMethodBreakpointActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageMethodBreakpointActionDelegate.java
deleted file mode 100644
index eb9b399..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageMethodBreakpointActionDelegate.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaMethodBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Adds a method breakpoint on a single selected element of type IMethod 
- */
-public class ManageMethodBreakpointActionDelegate extends AbstractManageBreakpointActionDelegate {
-		
-	protected IJavaBreakpoint getBreakpoint(IMember method) {
-		IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager();
-		IBreakpoint[] breakpoints= breakpointManager.getBreakpoints(JDIDebugModel.getPluginIdentifier());
-		for (int i= 0; i < breakpoints.length; i++) {
-			IBreakpoint breakpoint= breakpoints[i];
-			if (breakpoint instanceof IJavaMethodBreakpoint) {
-				IMember container = null;
-				try {
-					container= BreakpointUtils.getMember((IJavaMethodBreakpoint) breakpoint);
-				} catch (CoreException e) {
-					JDIDebugUIPlugin.log(e);
-					return null;
-				}
-				if (method.equals(container)) {
-					return (IJavaBreakpoint)breakpoint;
-				}
-			}
-		}
-		return null;
-	}
-	
-	protected IMember getMember(ISelection s) {
-		if (s instanceof IStructuredSelection) {
-			IStructuredSelection ss= (IStructuredSelection) s;
-			if (ss.size() == 1) {					
-				Object o=  ss.getFirstElement();
-				if (o instanceof IMethod) {
-					return (IMethod) o;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		updateForRun();
-		if (getBreakpoint() == null) {
-			// add breakpoint
-			try {
-				IMethod method = (IMethod)getMember();
-				if (method == null || !enableForMember(method)) {
-					beep();
-					return;
-				} 
-				int start = -1;
-				int end = -1;
-				ISourceRange range = method.getNameRange();
-				if (range != null) {
-					start = range.getOffset();
-					end = start + range.getLength();
-				}
-				Map attributes = new HashMap(10);
-				BreakpointUtils.addJavaBreakpointAttributes(attributes, method);
-				String methodName = method.getElementName();
-				if (((IMethod)method).isConstructor()) {
-					methodName = "<init>"; //$NON-NLS-1$
-				}
-				setBreakpoint(JDIDebugModel.createMethodBreakpoint(BreakpointUtils.getBreakpointResource(method), 
-					method.getDeclaringType().getFullyQualifiedName(), methodName, method.getSignature(), true, false, false, -1, start, end, 0, true, attributes));
-			} catch (CoreException x) {
-				JDIDebugUIPlugin.log(x);
-				MessageDialog.openError(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.getString("ManageMethodBreakpointAction.Problems_creating_breakpoint_7"), x.getMessage()); //$NON-NLS-1$
-			}
-		} else {
-			// remove breakpoint
-			try {
-				IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager();
-				breakpointManager.removeBreakpoint(getBreakpoint(), true);
-			} catch (CoreException x) {
-				JDIDebugUIPlugin.log(x);
-				MessageDialog.openError(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.getString("ManageMethodBreakpointAction.Problems_removing_breakpoint_8"), x.getMessage()); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	/**
-	 * @see AbstractManageBreakpointActionDelegate#enableForMember(IMember)
-	 */
-	protected boolean enableForMember(IMember member) {
-		return member instanceof IMethod && member.isBinary();
-	}
-	
-	/**
-	 * Only enabled for binary methods
-	 * @see IPartListener#partActivated(IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		super.partActivated(part);
-		setEnabledState(getTextEditor());
-	}
-	
-	protected void setEnabledState(ITextEditor editor) {
-		if (getAction() != null && getPage() != null) {
-			IWorkbenchPart part = getPage().getActivePart();
-			if (part == null) {
-				getAction().setEnabled(false);
-			} else {
-				if (part == getPage().getActiveEditor()) {
-					IClassFile classFile= (IClassFile)getPage().getActiveEditor().getEditorInput().getAdapter(IClassFile.class);
-					getAction().setEnabled(classFile != null);
-				} else {
-					ISelectionProvider sp= part.getSite().getSelectionProvider();
-					getAction().setEnabled(sp != null && enableForMember(getMember(sp.getSelection())));
-				}
-			}
-		}	
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageWatchpointActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageWatchpointActionDelegate.java
deleted file mode 100644
index 9c674f4..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ManageWatchpointActionDelegate.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.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.model.IBreakpoint;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.ISourceRange;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.ITypeNameRequestor;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaFieldVariable;
-import org.eclipse.jdt.debug.core.IJavaWatchpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.internal.corext.util.TypeInfo;
-import org.eclipse.jdt.internal.corext.util.TypeInfoRequestor;
-import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-public class ManageWatchpointActionDelegate extends AbstractManageBreakpointActionDelegate {
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		updateForRun();
-		if (getBreakpoint() == null) {
-			try {
-				IMember element= getMember();
-				if (element == null || !enableForMember(element)) {
-					beep();
-					return;
-				}
-				IType type = element.getDeclaringType();
-				int start = -1;
-				int end = -1;
-				ISourceRange range = element.getNameRange();
-				if (range != null) {
-					start = range.getOffset();
-					end = start + range.getLength();
-				}
-				Map attributes = new HashMap(10);
-				BreakpointUtils.addJavaBreakpointAttributes(attributes, element);
-				setBreakpoint(JDIDebugModel.createWatchpoint(BreakpointUtils.getBreakpointResource(type),type.getFullyQualifiedName(), element.getElementName(), -1, start, end, 0, true, attributes));
-			} catch (JavaModelException e) {
-				JDIDebugUIPlugin.log(e);
-				MessageDialog.openError(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.getString("ManageWatchpointAction.Problems_adding_watchpoint_7"), ActionMessages.getString("ManageWatchpointAction.The_selected_field_is_not_visible_in_the_currently_selected_debug_context._A_stack_frame_or_suspended_thread_which_contains_the_declaring_type_of_this_field_must_be_selected_1")); //$NON-NLS-1$ //$NON-NLS-2$
-			} catch (CoreException x) {
-				JDIDebugUIPlugin.log(x);
-				MessageDialog.openError(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.getString("ManageWatchpointAction.Problems_adding_watchpoint_7"), x.getMessage()); //$NON-NLS-1$
-			}
-		} else {
-			// remove breakpoint
-			try {
-				IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager();
-				breakpointManager.removeBreakpoint(getBreakpoint(), true);
-			} catch (CoreException x) {
-				JDIDebugUIPlugin.log(x);
-				MessageDialog.openError(JDIDebugUIPlugin.getActiveWorkbenchShell(), ActionMessages.getString("ManageWatchpointAction.Problems_removing_watchpoint_8"), x.getMessage()); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	protected IJavaBreakpoint getBreakpoint(IMember selectedField) {
-		IBreakpointManager breakpointManager= DebugPlugin.getDefault().getBreakpointManager();
-		IBreakpoint[] breakpoints= breakpointManager.getBreakpoints(JDIDebugModel.getPluginIdentifier());
-		for (int i= 0; i < breakpoints.length; i++) {
-			IBreakpoint breakpoint= breakpoints[i];
-			if (breakpoint instanceof IJavaWatchpoint) {
-				try {
-					if (equalFields(selectedField, (IJavaWatchpoint)breakpoint))
-						return (IJavaBreakpoint)breakpoint;
-				} catch (CoreException e) {
-					JDIDebugUIPlugin.log(e);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Compare two fields. The default <code>equals()</code>
-	 * method for <code>IField</code> doesn't give the comparison desired.
-	 */
-	private boolean equalFields(IMember breakpointField, IJavaWatchpoint watchpoint) throws CoreException {
-		return (breakpointField.getElementName().equals(watchpoint.getFieldName()) &&
-		breakpointField.getDeclaringType().getFullyQualifiedName().equals(watchpoint.getTypeName()));
-	}
-	
-	protected IMember getMember(ISelection s) {
-		if (s instanceof IStructuredSelection) {
-			IStructuredSelection ss= (IStructuredSelection) s;
-			if (ss.size() == 1) {					
-				Object o=  ss.getFirstElement();
-				if (o instanceof IField) {
-					return (IField) o;
-				} else if (o instanceof IJavaFieldVariable) {
-					return getField((IJavaFieldVariable) o);
-				}
-			}
-		} 
-		
-		return null;
-	}
-	
-	/**
-	 * Return the associated IField (Java model) for the given
-	 * IJavaFieldVariable (JDI model)
-	 */
-	protected IField getField(IJavaFieldVariable variable) {
-		String varName= null;
-		try {
-			varName= variable.getName();
-		} catch (DebugException x) {
-			JDIDebugUIPlugin.log(x);
-			return null;
-		}
-		IField field;
-		List types= searchForDeclaringType(variable);
-		Iterator iter= types.iterator();
-		while (iter.hasNext()) {
-			IType type= (IType)iter.next();
-			field= type.getField(varName);
-			if (field.exists()) {
-				return field;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a list of matching types (IType - Java model) that correspond to the 
-	 * declaring type (ReferenceType - JDI model) of the given variable.
-	 */
-	protected List searchForDeclaringType(IJavaFieldVariable variable) {
-		List types= new ArrayList();
-		ILaunch launch = variable.getDebugTarget().getLaunch();
-		if (launch == null) {
-			return types;
-		}
-		
-		ILaunchConfiguration configuration= launch.getLaunchConfiguration();
-		IJavaProject[] javaProjects = null;
-		IWorkspace workspace= ResourcesPlugin.getWorkspace();
-		if (configuration != null) {
-			// Launch configuration support
-			try {
-				String projectName= configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
-				if (projectName.length() != 0) {
-					javaProjects= new IJavaProject[] {JavaCore.create(workspace.getRoot().getProject(projectName))};
-				} else {
-					IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects();
-					IProject project;
-					List projectList= new ArrayList();
-					for (int i= 0, numProjects= projects.length; i < numProjects; i++) {
-						project= projects[i];
-						if (project.isAccessible() && project.hasNature(JavaCore.NATURE_ID)) {
-							projectList.add(JavaCore.create(project));
-						}
-					}
-					javaProjects= new IJavaProject[projectList.size()];
-					projectList.toArray(javaProjects);
-				}
-			} catch (CoreException e) {
-				JDIDebugUIPlugin.log(e);
-			}
-		}
-		if (javaProjects == null) {
-			return types;
-		}
-
-		SearchEngine engine= new SearchEngine();
-		IJavaSearchScope scope= engine.createJavaSearchScope(javaProjects, true);
-		String declaringType= null;
-		try {
-			declaringType= variable.getDeclaringType().getName();
-		} catch (DebugException x) {
-			JDIDebugUIPlugin.log(x);
-			return types;
-		}
-		ArrayList typeRefsFound= new ArrayList(3);
-		ITypeNameRequestor requestor= new TypeInfoRequestor(typeRefsFound);
-		try {
-			engine.searchAllTypeNames(workspace, 
-				getPackage(declaringType), 
-				getTypeName(declaringType), 
-				IJavaSearchConstants.EXACT_MATCH, 
-				true, 
-				IJavaSearchConstants.CLASS, 
-				scope, 
-				requestor, 
-				IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH,
-				null);
-		} catch (JavaModelException x) {
-			JDIDebugUIPlugin.log(x);
-			return types;
-		}
-		Iterator iter= typeRefsFound.iterator();
-		TypeInfo typeInfo= null;
-		while (iter.hasNext()) {
-			typeInfo= (TypeInfo)iter.next();
-			try {
-				types.add(typeInfo.resolveType(scope));
-			} catch (JavaModelException jme) {
-				JDIDebugUIPlugin.log(jme);
-			}
-		}
-		return types;
-	}
-	
-	/**
-	 * Returns the package name of the given fully qualified type name.
-	 * The package name is assumed to be the dot-separated prefix of the 
-	 * type name.
-	 */
-	protected char[] getPackage(String fullyQualifiedName) {
-		int index= fullyQualifiedName.lastIndexOf('.');
-		if (index == -1) {
-			return new char[0];
-		}
-		return fullyQualifiedName.substring(0, index).toCharArray();
-	}
-	
-	/**
-	 * Returns a simple type name from the given fully qualified type name.
-	 * The type name is assumed to be the last contiguous segment of the 
-	 * fullyQualifiedName not containing a '.' or '$'
-	 */
-	protected char[] getTypeName(String fullyQualifiedName) {
-		int index= fullyQualifiedName.lastIndexOf('.');
-		String typeName= fullyQualifiedName.substring(index + 1);
-		int lastInnerClass= typeName.lastIndexOf('$');
-		if (lastInnerClass != -1) {
-			typeName= typeName.substring(lastInnerClass + 1);
-		}
-		return typeName.toCharArray();
-	}
-	/**
-	 * @see AbstractManageBreakpointActionDelegate#enableForMember(IMember)
-	 */
-	protected boolean enableForMember(IMember member) {
-		return member instanceof IField;
-	}
-	
-	protected void setEnabledState(ITextEditor editor) {
-		if (getAction() != null && getPage() != null) {
-			IWorkbenchPart part = getPage().getActivePart();
-			if (part == null) {
-				getAction().setEnabled(false);
-			} else if (part != getPage().getActiveEditor()) {
-				ISelectionProvider sp= part.getSite().getSelectionProvider();
-				getAction().setEnabled(sp != null && enableForMember(getMember(sp.getSelection())));
-			} else { //dealing with active editor
-				if (getPage().getActiveEditor() instanceof ITextEditor) {
-					super.setEnabledState((ITextEditor)getPage().getActiveEditor());
-				} else {
-					getAction().setEnabled(false);
-				}
-			}
-		}	
-	}
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ModificationWatchpointToggleAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ModificationWatchpointToggleAction.java
deleted file mode 100644
index 608bdd9..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ModificationWatchpointToggleAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.debug.core.IJavaBreakpoint;

-import org.eclipse.jdt.debug.core.IJavaWatchpoint;

-

-public class ModificationWatchpointToggleAction extends BreakpointToggleAction {

-

-	/**

-	 * @see BreakpointToggleAction#getToggleState(IJavaBreakpoint)

-	 */

-	protected boolean getToggleState(IJavaBreakpoint watchpoint) throws CoreException {

-		return ((IJavaWatchpoint)watchpoint).isModification();

-	}

-

-	/**

-	 * @see BreakpointToggleAction#doAction(IJavaBreakpoint)

-	 */

-	public void doAction(IJavaBreakpoint watchpoint) throws CoreException {

-		((IJavaWatchpoint)watchpoint).setModification(!((IJavaWatchpoint)watchpoint).isModification());

-	}

-

-	/**

-	 * @see BreakpointToggleAction#isEnabledFor(Object)

-	 */

-	public boolean isEnabledFor(Object element) {

-		return element instanceof IJavaWatchpoint;

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveDownAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveDownAction.java
deleted file mode 100644
index 20414ab..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveDownAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.List;
-
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Moves selected enries in a runtime classpath viewer down one position.
- */
-public class MoveDownAction extends RuntimeClasspathAction {
-
-	public MoveDownAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("MoveDownAction.M&ove_Down_1"), viewer); //$NON-NLS-1$
-	}
-	/**
-	 * @see IAction#run()
-	 */
-	public void run() {
-		List targets = getOrderedSelection();
-		if (targets.isEmpty()) {
-			return;
-		}
-		List list = getEntiresAsList();
-		int bottom = list.size() - 1;
-		int index = 0;
-		for (int i = targets.size() - 1; i >= 0; i--) {
-			Object target = targets.get(i);
-			index = list.indexOf(target);
-			if (index < bottom) {
-				bottom = index + 1;
-				Object temp = list.get(bottom);
-				list.set(bottom, target);
-				list.set(index, temp);
-			}
-			bottom = index;
-		} 
-		setEntries(list);
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled() && !selection.isEmpty() && !isIndexSelected(selection, getEntiresAsList().size() - 1);	
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveUpAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveUpAction.java
deleted file mode 100644
index 8874240..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/MoveUpAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Moves selected enries in a runtime classpath viewer up one position.
- */
-public class MoveUpAction extends RuntimeClasspathAction {
-
-	public MoveUpAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("MoveUpAction.Move_U&p_1"), viewer); //$NON-NLS-1$
-	}
-	/**
-	 * Moves all selected entries up one position (if possible).
-	 * 
-	 * @see IAction#run()
-	 */
-	public void run() {
-		List targets = getOrderedSelection();
-		if (targets.isEmpty()) {
-			return;
-		}
-		int top = 0;
-		int index = 0;
-		List list = getEntiresAsList();
-		Iterator entries = targets.iterator();
-		while (entries.hasNext()) {
-			Object target = entries.next();
-			index = list.indexOf(target);
-			if (index > top) {
-				top = index - 1;
-				Object temp = list.get(top);
-				list.set(top, target);
-				list.set(index, temp);
-			}
-			top = index;
-		} 
-		setEntries(list);
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled() && !selection.isEmpty() && !isIndexSelected(selection, 0);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
deleted file mode 100644
index d5a11b6..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectActionDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */

-

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;

-

-public abstract class ObjectActionDelegate implements IObjectActionDelegate {

-	

-	/**

-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)

-	 */

-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		update(action, targetPart);

-	}
-	
-	protected abstract boolean isEnabledFor(Object element);
-	

-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection sel) {
-	}
-	
-	protected void update(IAction action, IWorkbenchPart targetPart) {
-		ISelectionProvider sp= targetPart.getSite().getSelectionProvider();
-		boolean enable= false;
-		if (sp != null) {
-			ISelection selection= sp.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ss= (IStructuredSelection)selection;
-				enable= ss.size() == 1 && isEnabledFor(ss.getFirstElement());
-			}
-		}
-		action.setEnabled(enable);
-	}
-	
-	protected IStructuredSelection getCurrentSelection() {
-		IWorkbenchPage page= JDIDebugUIPlugin.getActivePage();
-		if (page != null) {
-			ISelection selection= page.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				return (IStructuredSelection)selection;
-			}	
-		}
-		return null;
-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectFilter.java
deleted file mode 100644
index f34bbc0..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ObjectFilter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-/**
- * A filter on a set of objects
- */
-public class ObjectFilter extends ViewerFilter {
-		
-	/**
-	 * Objects to filter
-	 */
-	protected List fFilter;
-	
-	/**
-	 * Creates a new filter that filters the given 
-	 * objects.
-	 */
-	public ObjectFilter(List objects) {
-		fFilter = objects;
-	}
-	
-	/**
-	 * @see ViewerFilter#select(Viewer, Object, Object)
-	 */
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		return !fFilter.contains(element);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnConsoleTypeAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnConsoleTypeAction.java
deleted file mode 100644
index b270ef0..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnConsoleTypeAction.java
+++ /dev/null
@@ -1,532 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IWorkspace;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.debug.ui.IDebugView;

-import org.eclipse.jdt.core.IType;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.core.search.IJavaSearchConstants;

-import org.eclipse.jdt.core.search.IJavaSearchScope;

-import org.eclipse.jdt.core.search.ITypeNameRequestor;

-import org.eclipse.jdt.core.search.SearchEngine;

-import org.eclipse.jdt.internal.corext.util.TypeInfo;

-import org.eclipse.jdt.internal.corext.util.TypeInfoRequestor;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.ui.util.TypeInfoLabelProvider;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.jface.text.TextViewer;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Listener;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Widget;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IViewActionDelegate;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.dialogs.ElementListSelectionDialog;

-import org.eclipse.ui.texteditor.IDocumentProvider;

-import org.eclipse.ui.texteditor.ITextEditor;

-

-/**

- * This action opens a Java type in an editor based on output in the console.

- * There are two ways this can happen.  (1) if there is an explicit selection

- * in the console, the selected text is parsed for a type name (2) if there is

- * no selection, but the cursor is placed on a line of output in the console, 

- * the entire line is parsed for a type name.  

- * Example:

- *		If the cursor is placed on the following line of output in the console:

- *			at com.foo.bar.Application.run(Application.java:58)

- * 		An editor for the type com.foo.bar.Application will be opened,

- * 		and line 58 will be selected and revealed.  Note that if the word

- * 		'Application' had been selected, then the user would have been prompted

- * 		to choose a fully qualified instance of 'Application' (if

- * 		there were more than one in the workspace), and an editor opened revealing 

- * 		the beginning of the type.

- */

-public class OpenOnConsoleTypeAction implements IViewActionDelegate, Listener {

-																	

-	private IViewPart fViewPart;

-	

-	private String fPkgName;

-	private String fTypeName;

-	private int fLineNumber;

-	private boolean fInitiatedFromDoubleClick= false;

-	private IAction fAction;

-	private ITextSelection fSelection;

-	

-	/**

-	 * @see IViewActionDelegate#init(IViewPart)

-	 */

-	public void init(IViewPart view) {		

-		setViewPart(view);

-		Widget underlyingWidget= (Widget)view.getAdapter(Widget.class);

-		if (underlyingWidget != null) {

-			underlyingWidget.addListener(SWT.MouseDoubleClick, this);

-		}

-	}

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		openTypeWithProgress();

-	}

-	

-	/**

-	 * Do the work to open the type while displaying a busy cursor.

-	 */

-	protected void openTypeWithProgress() {

-		Runnable runnable = new Runnable() {

-			public void run() {

-				doOpenType();

-			}	

-		};

-		BusyIndicator.showWhile(getShell().getDisplay(), runnable);

-	}

-

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		setAction(action);

-		update(selection);

-	}

-

-	protected void doOpenType() {		

-		

-		// determine what we're searching for

-		setPkgName(null);

-		setTypeName(null);

-		setLineNumber(-1);

-		determineSearchParameters();

-		if (getTypeName() == null) {

-			if (!initiatedFromDoubleClick()) {

-				beep();

-			}

-			return;

-		}

-		

-		// convert package & type names to form required by SearchEngine API

-		char[] typeCharArray = getTypeName().toCharArray();

-		char[] pkgCharArray;

-		if (getPkgName() != null) {

-			pkgCharArray = getPkgName().toCharArray();

-		} else {

-			pkgCharArray = null;

-		}

-					

-		// construct the rest of the search parameters

-		ArrayList typeRefsFound= new ArrayList(3);

-		ITypeNameRequestor requestor= new TypeInfoRequestor(typeRefsFound);

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		IJavaSearchScope scope = SearchEngine.createWorkspaceScope();		

-		

-		// ask the SearchEngine to do the search

-		SearchEngine engine = new SearchEngine();

-		try {

-			engine.searchAllTypeNames(workspace, 

-			                          pkgCharArray, 

-			                          typeCharArray,  

-			                          IJavaSearchConstants.EXACT_MATCH, 

-			                          true, 

-			                          IJavaSearchConstants.TYPE,

-			                          scope, 

-			                          requestor, 

-			                          IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, 

-			                          null);

-			              

-		} catch (JavaModelException jme) {			

-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("OpenOnConsoleTypeAction.Error_searching_for_type_1"), jme); //$NON-NLS-1$

-		}				

-		

-		// choose the appropriate result             

-		TypeInfo typeInfo = selectTypeInfo(typeRefsFound);			                          		

-		if (typeInfo == null) {

-			if (!initiatedFromDoubleClick()) {

-				beep();

-			}

-			return;

-		}

-		

-		// get the actual type and open an editor on it

-		try {

-			IType type = typeInfo.resolveType(scope);

-			openAndPositionEditor(type);		

-		} catch (JavaModelException jme) {

-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("OpenOnConsoleTypeAction.Error_searching_for_type_1"), jme); //$NON-NLS-1$

-		}

-	}

-	

-	/**

-	 * Return one of the TypeInfo objects in the List argument.

-	 */

-	protected TypeInfo selectTypeInfo(List typeInfoList) {

-		if (typeInfoList.isEmpty()) {

-			return null;

-		}

-		if (typeInfoList.size() == 1) {

-			return (TypeInfo)typeInfoList.get(0);

-		}

-

-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), 

-													new TypeInfoLabelProvider(TypeInfoLabelProvider.SHOW_FULLYQUALIFIED | TypeInfoLabelProvider.SHOW_ROOT_POSTFIX));

-		dialog.setTitle(ActionMessages.getString("OpenOnConsoleTypeAction.Open_Type_3")); //$NON-NLS-1$

-		dialog.setMessage(ActionMessages.getString("OpenOnConsoleTypeAction.Choose_a_type_to_open_4"));  //$NON-NLS-1$

-		dialog.setElements(typeInfoList.toArray(new TypeInfo[typeInfoList.size()]));

-		if (dialog.open() == dialog.OK) {

-			return (TypeInfo) dialog.getFirstResult();

-		}

-		return null;		

-	}

-	

-	/**

-	 * Open an editor on the specified Java type.  If a line number is 

-	 * available, also make the editor reveal it.

-	 */

-	protected void openAndPositionEditor(IType type) {

-		try {

-			IEditorPart editor = JavaUI.openInEditor(type);

-			if ((editor instanceof ITextEditor)  && (fLineNumber > 0)) {

-				int zeroBasedLineNumber = fLineNumber - 1;

-				ITextEditor textEditor = (ITextEditor) editor;

-				IEditorInput input = textEditor.getEditorInput();

-				IDocumentProvider provider = textEditor.getDocumentProvider();

-				IDocument document = provider.getDocument(input);

-				if (document.getLength() == 0) {

-					//class file editor with no source

-					return;

-				}

-				int lineOffset = document.getLineOffset(zeroBasedLineNumber);

-				int lineLength = document.getLineLength(zeroBasedLineNumber);

-				textEditor.selectAndReveal(lineOffset, lineLength);

-			}	

-		} catch (JavaModelException jme) {

-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("OpenOnConsoleTypeAction.Error_opening_editor_5"), jme); //$NON-NLS-1$

-		} catch (PartInitException pie) {

-			JDIDebugUIPlugin.errorDialog(ActionMessages.getString("OpenOnConsoleTypeAction.Error_opening_editor_5"), pie); //$NON-NLS-1$

-		} catch (BadLocationException ble) {

-			MessageDialog.openError(getShell(), ActionMessages.getString("OpenOnConsoleTypeAction.Open_Type_3"), ActionMessages.getString("OpenOnConsoleTypeAction.Error_parsing_editor_document")); //$NON-NLS-1$  //$NON-NLS-2$

-		} 

-	}

-	

-	/**

-	 * Parse text in the console for a fully qualified type name and a line number. 

-	 * The package qualification and line number are optional, the type name is not.

-	 * The input for parsing is either an explicit selection in the console, or is

-	 * the entire line where the cursor is currently located.

-	 */

-	protected void determineSearchParameters() {

-		ITextSelection textSelection= getTextSelection();

-		IDocument consoleDocument = getConsoleDocument();

-		if (consoleDocument == null) {

-			return;

-		}

-		try {

-			int offset = textSelection.getOffset();

-			int lineNumber = consoleDocument.getLineOfOffset(offset);

-			int lineOffset = consoleDocument.getLineOffset(lineNumber);

-			int lineLength = consoleDocument.getLineLength(lineNumber);		

-			String lineText = consoleDocument.get(lineOffset, lineLength);				

-			parseSelection(lineText);

-		} catch (BadLocationException ble) {

-			MessageDialog.openError(getShell(), ActionMessages.getString("OpenOnConsoleTypeAction.Open_Type_3"), ActionMessages.getString("OpenOnConsoleTypeAction.Error_parsing_console_document_7")); //$NON-NLS-1$ //$NON-NLS-2$

-		}		

-	}

-	

-	protected IDocument getConsoleDocument() {

-		IDebugView dv = (IDebugView)getViewPart().getAdapter(IDebugView.class);

-		if (dv != null) {

-			Viewer v = dv.getViewer();

-			if (v instanceof TextViewer) {

-				return ((TextViewer)v).getDocument();

-			}

-		}

-		return null;

-	}

-	

-	private boolean isValidJavaCharacter(char c) {

-		return Character.isJavaIdentifierPart(c) || c == '.' || c == '<' || c == '>';

-	}

-	

-	/**

-	 * Parse out the package name (if there is one), type name and line number

-	 * (if there is one).  

-	 */

-	protected void parseSelection(String selection) {

-		

-		selection = selection.trim();

-		if (selection.length() < 1) {

-			return;

-		}

-		

-		int firstDot= selection.indexOf('.');

-		

-		// isolate the first character of the name

-		int nameFirstChar= 0;

-		if (firstDot != -1) {

-			String substring= selection.substring(0, firstDot);

-			nameFirstChar= substring.lastIndexOf(' ') + 1;

-		} 

-		

-		// isolate the last character of the name

-		int nameLastChar= selection.length();

-		if (firstDot != -1) {

-			for (int i= firstDot; i < nameLastChar; i++) {

-				char c= selection.charAt(i);

-				if (!isValidJavaCharacter(c)) {

-					nameLastChar= i;

-				}

-			}

-		}

-		

-		String name= selection.substring(nameFirstChar, nameLastChar);

-		

-		String fileSeparator= System.getProperty("file.separator"); //$NON-NLS-1$

-		String typeName= null;

-		boolean isFind= false;

-		if (name.indexOf(fileSeparator) != -1) { // may be the absolute path of a file

-			IContainer resource= ResourcesPlugin.getWorkspace().getRoot();

-			typeName= null;

-			boolean intermediateFolderFind= true;

-			while (!isFind && intermediateFolderFind) { // find the right file

-				IResource[] children;

-				try {

-					children= resource.members();

-				} catch (CoreException e) {

-					return;

-				}

-				intermediateFolderFind= false;

-				IPath namePath= new Path(name);

-				for (int i= 0, length= children.length; i < length; i++) {

-					IResource child= children[i];

-					if (child.getLocation().isPrefixOf(namePath)) {

-						if (child instanceof IFile) { // a file with a matching name has been found

-							IType[] types;

-							try { // get the fully qualified name of the type contained in this file

-								types= JavaCore.createCompilationUnitFrom((IFile)child).getTypes();

-							} catch (JavaModelException e) {

-								return;

-							}

-							if (types.length > 0) { // there is some types in this file

-								typeName= types[0].getFullyQualifiedName();

-								typeName= parseTypeNames(typeName)[0];

-								isFind= true;

-								intermediateFolderFind= true;

-							}

-						} else if (child instanceof IContainer) { // a folder with a matching name has been found

-							resource = (IContainer) child;

-							intermediateFolderFind= true;

-						}

-						break;

-					}

-				}

-			}

-		}

-		

-		if (!isFind) { // is not the absolute path of a file, should be a qualified type name

-			if (nameLastChar < selection.length() && selection.charAt(nameLastChar) == '(') { // remove the method name if there is one

-				name= name.substring(0, name.lastIndexOf('.'));

-			}

-			

-			typeName= parseTypeNames(name.replace('/', '.'))[0];

-		}

-		

-		setTypeName(typeName);

-		

-		// isolate the first character of the line number

-		int lineNumber= -1;

-		int lineNumberFirstChar= nameLastChar;

-		do {

-			lineNumberFirstChar= selection.indexOf(':', lineNumberFirstChar) + 1;

-		} while (lineNumberFirstChar != 0 && !Character.isDigit(selection.charAt(lineNumberFirstChar)));

-		

-		// get the line number

-		StringBuffer number= new StringBuffer();

-		for (char c; Character.isDigit(c = selection.charAt(lineNumberFirstChar)); lineNumberFirstChar++) {

-			number.append(c);

-		}

-		

-		try {

-			lineNumber= Integer.parseInt(number.toString());

-		} catch (NumberFormatException e) {

-		}

-		

-		setLineNumber(lineNumber);

-		

-	}

-

-	protected Shell getShell() {

-		return getViewPart().getViewSite().getShell();

-	}		

-	

-	/**

-	 * @see Listener#handleEvent(Event)

-	 */

-	public void handleEvent(Event event) {

-		try {

-			setInitiatedFromDoubleClick(true);

-			openTypeWithProgress();

-		} finally {

-			setInitiatedFromDoubleClick(false);

-		}

-	}

-	

-	protected boolean initiatedFromDoubleClick() {

-		return fInitiatedFromDoubleClick;

-	}

-

-	protected void setInitiatedFromDoubleClick(boolean initiatedFromDoubleClick) {

-		fInitiatedFromDoubleClick = initiatedFromDoubleClick;

-	}

-	

-	protected int getLineNumber() {

-		return fLineNumber;

-	}

-

-	protected void setLineNumber(int lineNumber) {

-		fLineNumber = lineNumber;

-	}

-

-	protected String getPkgName() {

-		return fPkgName;

-	}

-

-	protected void setPkgName(String pkgName) {

-		fPkgName = pkgName;

-	}

-

-	protected String getTypeName() {

-		return fTypeName;

-	}

-

-	protected void setTypeName(String typeName) {

-		if (typeName != null) {

-			fTypeName = typeName.replace('$', '.');

-		} else {

-			fTypeName= null;

-		}

-	}

-	

-	protected IViewPart getViewPart() {

-		return fViewPart;

-	}

-

-	protected void setViewPart(IViewPart viewPart) {

-		fViewPart = viewPart;

-	}

-	

-	protected IAction getAction() {

-		return fAction;

-	}

-

-	protected void setAction(IAction action) {

-		fAction = action;

-	}

-	

-	protected void update(ISelection selection) {

-		IAction action= getAction();

-		if (action == null) {

-			return;

-		}

-		

-		if (!(selection instanceof ITextSelection)) {

-			action.setEnabled(false);

-			return;

-		}

-

-		boolean enabled= false;

-		ITextSelection textSelection = (ITextSelection)selection;

-		if (initiatedFromDoubleClick()) {

-			enabled= true;

-		} else {

-			enabled= textHasContent(textSelection.getText());

-		}

-		setTextSelection(textSelection);

-		action.setEnabled(enabled);

-	}

-	

-	protected boolean textHasContent(String text) {

-		if (text != null) {

-			int length= text.length();

-			if (length > 0) {

-				for (int i= 0; i < length; i++) {

-					if (Character.isLetterOrDigit(text.charAt(i))) {

-						return true;

-					}

-				}

-			}

-		}

-		return false;

-	}

-	

-	protected ITextSelection getTextSelection() {

-		return fSelection;

-	}

-

-	protected void setTextSelection(ITextSelection textSelection) {

-		fSelection = textSelection;

-	}

-	

-	protected void beep() {

-		getShell().getDisplay().beep();

-	}

-	

-	/**

-	 * Returns an array of simple type names that are

-	 * part of the given type's qualified name. For

-	 * example, if the given name is <code>x.y.A$B</code>,

-	 * an array with <code>["A", "B"]</code> is returned.

-	 * Sets the package name if there is one.

-	 * 

-	 * @param typeName fully qualified type name

-	 * @return array of nested type names

-	 */

-	protected String[] parseTypeNames(String typeName) {

-		int spaceIndex= typeName.indexOf(' ');

-		if (spaceIndex >= 0) {

-			typeName= typeName.substring(0, spaceIndex);

-		}

-		int index = typeName.lastIndexOf('.');

-		if (index >= 0) {

-			setPkgName(typeName.substring(0, index));

-			typeName= typeName.substring(index + 1);

-		} else {

-			setPkgName(null);

-		}

-		

-		index = typeName.indexOf('$');

-		List list = new ArrayList(1);

-		while (index >= 0) {

-			list.add(typeName.substring(0, index));

-			typeName = typeName.substring(index + 1);

-			index = typeName.indexOf('$');

-		}

-		list.add(typeName);

-		return (String[])list.toArray(new String[list.size()]);	

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnDeclaringTypeAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnDeclaringTypeAction.java
deleted file mode 100644
index 4499725..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnDeclaringTypeAction.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.model.IDebugElement;

-import org.eclipse.jdt.debug.core.IJavaStackFrame;

-

-public class OpenOnDeclaringTypeAction extends StackFrameAction {

-	

-	protected String getTypeNameToOpen(IDebugElement frame) throws DebugException {

-		return ((IJavaStackFrame)frame).getDeclaringTypeName();

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnReceivingTypeAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnReceivingTypeAction.java
deleted file mode 100644
index 2db70db..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnReceivingTypeAction.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.model.IDebugElement;

-import org.eclipse.jdt.debug.core.IJavaStackFrame;

-

-public class OpenOnReceivingTypeAction extends StackFrameAction {

-

-	protected String getTypeNameToOpen(IDebugElement frame) throws DebugException {

-		return ((IJavaStackFrame)frame).getReceivingTypeName();

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnVariableAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnVariableAction.java
deleted file mode 100644
index 7e27f7a..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenOnVariableAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.model.IDebugElement;

-import org.eclipse.jdt.debug.core.IJavaVariable;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-

-

-public class OpenOnVariableAction extends OpenTypeAction {

-	

-	private static final Set fgPrimitiveTypes= initPrimitiveTypes();

-

-	protected IDebugElement getDebugElement(IAdaptable element) {

-		return (IDebugElement)element.getAdapter(IJavaVariable.class);

-	}

-	

-	protected String getTypeNameToOpen(IDebugElement element) throws DebugException {

-		String refType= ((IJavaVariable)element).getReferenceTypeName();

-		refType= removeArray(refType);

-		if (fgPrimitiveTypes.contains(refType)){

-			return null;

-		}

-		return refType;

-	}

-	

-	protected String removeArray(String typeName) {

-		if (typeName == null) {

-			return null;

-		}

-		int index= typeName.indexOf('[');

-		if (index > 0) {

-			return typeName.substring(0, index);

-		}

-		return typeName;

-	}

-	

-	protected boolean isEnabledFor(Object o){

-		if (!(o instanceof IAdaptable)) {

-			return false;

-		}

-		IJavaVariable element= (IJavaVariable)getDebugElement((IAdaptable)o);

-		try {

-			if (element != null) {

-				return getTypeNameToOpen(element) != null;

-			}

-		} catch(DebugException e) {

-			JDIDebugUIPlugin.log(e);

-			// fall through

-		}	

-		return false;

-	}

-

-	private static Set initPrimitiveTypes() {

-		HashSet set= new HashSet(8);

-		set.add("short"); //$NON-NLS-1$

-		set.add("int"); //$NON-NLS-1$

-		set.add("long"); //$NON-NLS-1$

-		set.add("float"); //$NON-NLS-1$

-		set.add("double"); //$NON-NLS-1$

-		set.add("boolean"); //$NON-NLS-1$

-		set.add("byte"); //$NON-NLS-1$

-		set.add("char"); //$NON-NLS-1$

-		return set;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java
deleted file mode 100644
index a49b815..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenTypeAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.Iterator;

-

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.model.IDebugElement;

-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.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.core.Signature;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.ui.IEditorPart;

-

-public abstract class OpenTypeAction extends ObjectActionDelegate {

-	

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		IStructuredSelection selection= getCurrentSelection();

-		if (selection == null) {

-			return;

-		}

-		Iterator enum= selection.iterator();

-		try {

-			while (enum.hasNext()) {

-				Object element= enum.next();

-				doAction(element);

-			}

-		} catch(DebugException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-	}

-	

-	protected abstract IDebugElement getDebugElement(IAdaptable element);

-	

-	protected abstract String getTypeNameToOpen(IDebugElement element) throws DebugException;

-	

-	protected void doAction(Object e) throws DebugException {

-		IAdaptable element= (IAdaptable) e;

-		IDebugElement dbgElement= getDebugElement(element);

-		if (dbgElement != null) {

-			String typeName= getTypeNameToOpen(dbgElement);

-			try {

-				IType t= findTypeInWorkspace(typeName);

-				if (t != null) {

-					IEditorPart part= EditorUtility.openInEditor(t);

-					if (part != null)

-						EditorUtility.revealInEditor(part, t);

-				}

-			} catch (CoreException x) {

-				JDIDebugUIPlugin.log(x);

-			}

-		}

-	}

-	

-	private IType findTypeInWorkspace(String typeName) throws JavaModelException {

-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();

-		IJavaProject[] projects= JavaCore.create(root).getJavaProjects();

-		for (int i= 0; i < projects.length; i++) {

-			IType type= findType(projects[i], typeName);

-			if (type != null) {

-				return type;

-			}

-		}

-		return null;

-	}

-	

-	/** 

-	 * Finds a type by its qualified type name (dot separated).

-	 * @param jproject The Java project to search in

-	 * @param fullyQualifiedName The fully qualified name (type name with enclosing type names and package (all separated by dots))

-	 * @return The type found, or <code>null<code> if no type found

-	 * The method does not find inner types. Waiting for a Java Core solution

-	 */	

-	private IType findType(IJavaProject jproject, String fullyQualifiedName) throws JavaModelException {

-		String pathStr= fullyQualifiedName.replace('.', '/') + ".java"; //$NON-NLS-1$

-		IJavaElement jelement= jproject.findElement(new Path(pathStr));

-		if (jelement == null) {

-			// try to find it as inner type

-			String qualifier= Signature.getQualifier(fullyQualifiedName);

-			if (qualifier.length() > 0) {

-				IType type= findType(jproject, qualifier); // recursive!

-				if (type != null) {

-					IType res= type.getType(Signature.getSimpleName(fullyQualifiedName));

-					if (res.exists()) {

-						return res;

-					}

-				}

-			}

-		} else if (jelement.getElementType() == IJavaElement.COMPILATION_UNIT) {

-			String simpleName= Signature.getSimpleName(fullyQualifiedName);

-			return ((ICompilationUnit) jelement).getType(simpleName);

-		} else if (jelement.getElementType() == IJavaElement.CLASS_FILE) {

-			return ((IClassFile) jelement).getType();

-		}

-		return null;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveAction.java
deleted file mode 100644
index 27859cc..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RemoveAction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.List;
-
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Removes selected enries in a runtime classpath viewer.
- */
-public class RemoveAction extends RuntimeClasspathAction {
-
-	public RemoveAction(RuntimeClasspathViewer viewer) {
-		super(ActionMessages.getString("RemoveAction.&Remove_1"), viewer); //$NON-NLS-1$
-	}
-	/**
-	 * Removes all selected entries.
-	 * 
-	 * @see IAction#run()
-	 */
-	public void run() {
-		List targets = getOrderedSelection();
-		List list = getEntiresAsList();
-		list.removeAll(targets);
-		setEntries(list);
-	}
-
-	/**
-	 * @see SelectionListenerAction#updateSelection(IStructuredSelection)
-	 */
-	protected boolean updateSelection(IStructuredSelection selection) {
-		return getViewer().isEnabled() && !selection.isEmpty();
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineActionDelegate.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineActionDelegate.java
deleted file mode 100644
index 5421824..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RunToLineActionDelegate.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.internal.debug.ui.BreakpointUtils;
-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookLauncher;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Action to support run to line (i.e. where the cursor is in the active editor)
- */
-public class RunToLineActionDelegate extends ManageBreakpointActionDelegate implements IEditorActionDelegate {
-	
-	public RunToLineActionDelegate() {
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			IDebugTarget target= getContext();
-			if (target == null) {
-				if (getTextEditor() != null) {
-					getTextEditor().getSite().getShell().getDisplay().beep();
-				}
-				return;
-			}
-			
-			ITextSelection selection= (ITextSelection)getTextEditor().getSelectionProvider().getSelection();
-			setLineNumber(selection.getStartLine() + 1);
-			IType type= getType(getTextEditor().getEditorInput());
-			if (type == null) {
-				return;
-			}
-	
-			IBreakpoint breakpoint= null;
-			try {
-				Map attributes = new HashMap(4);
-				BreakpointUtils.addJavaBreakpointAttributes(attributes, type);
-				BreakpointUtils.addRunToLineAttributes(attributes);
-				breakpoint= JDIDebugModel.createLineBreakpoint(BreakpointUtils.getBreakpointResource(type), type.getFullyQualifiedName(), getLineNumber(), -1, -1, 1, false, attributes);
-			} catch (CoreException ce) {
-				ExceptionHandler.handle(ce, ActionMessages.getString("RunToLine.error.title1"), ActionMessages.getString("RunToLine.error.message1")); //$NON-NLS-1$ //$NON-NLS-2$
-				return;
-			} 
-			target.breakpointAdded(breakpoint);
-			IThread[] threads= target.getThreads(); 
-			for (int i= 0; i < threads.length; i++) {
-				IThread thread= threads[i];
-				if (thread.canResume()) {
-					try {
-						thread.resume();
-					} catch (DebugException de) {
-						JDIDebugUIPlugin.log(de);
-					}
-					break;
-				}
-			}
-		} catch(DebugException de) {
-			ExceptionHandler.handle(de, ActionMessages.getString("RunToLine.error.title1"), ActionMessages.getString("RunToLine.error.message1")); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	/**
-	 * Resolves the debug target context to set the run to line
-	 */
-	protected IDebugTarget getContext() throws DebugException{
-		IDebugTarget target= getContextFromUI();
-		if (target == null) {
-			target= getContextFromModel();
-			//target has already been checked for suspended thread
-			return target;
-		}
-		if (target == null) {
-			return null;
-		}
-		if (target.getLaunch().getAttribute(ScrapbookLauncher.SCRAPBOOK_LAUNCH) != null) {
-			//can't set run to line in scrapbook context
-			return null;
-		}
-		IThread[] threads= target.getThreads();
-		for (int i= 0; i < threads.length; i++) {
-			IThread thread= threads[i];
-			if (thread.canResume()) {
-				return target;
-			}
-		}
-		
-		return null;
-	}
-	/**
-	 * Resolves a debug target context from the model
-	 */
-	protected IDebugTarget getContextFromModel() throws DebugException {
-		IDebugTarget[] dts= DebugPlugin.getDefault().getLaunchManager().getDebugTargets();
-		for (int i= 0; i < dts.length; i++) {
-			IDebugTarget dt= dts[i];
-			if (getContextFromDebugTarget(dt) != null) {
-				return dt;
-			}
-		}
-		return null;
-	}
-	/**
-	 * Resolves a debug target context from the model
-	 */
-	protected IDebugTarget getContextFromThread(IThread thread) throws DebugException {
-		if (thread.isSuspended()) {
-			return thread.getDebugTarget();
-		}
-		return null;
-	}
-	/**
-	 * Resolves a stack frame context from the UI
-	 */
-	protected IDebugTarget getContextFromUI() throws DebugException {
-		IAdaptable de= DebugUITools.getDebugContext();
-		if (de != null) {
-			if (de instanceof IThread) {
-				return getContextFromThread((IThread) de);
-			} else if (de instanceof IDebugElement) {
-				return ((IDebugElement)de).getDebugTarget();
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Updates the enabled state of this action and the plugin action
-	 * this action is the delegate for.
-	 */
-	protected void update() {
-		setEnabledState(getTextEditor());
-	}
-	
-	/**
-	 * @see ManageBreakpointActionDelegate#setEnabledState(ITextEditor)
-	 */
-	protected void setEnabledState(ITextEditor editor) {
-		IAction action= getAction();
-		if (action != null) {
-			try {
-				super.setEnabledState(editor);
-				if (action.isEnabled()) {
-					IDebugTarget target= getContext();
-					action.setEnabled(target != null 
-						&& !(target.isDisconnected() 
-						|| target.isTerminated()));
-				}
-			} catch (DebugException de) {
-				action.setEnabled(false);
-				JDIDebugUIPlugin.log(de);
-			}
-		}
-	}
-	
-	/**
-	 * Resolves a stack frame context from the model.
-	 */
-	protected IDebugTarget getContextFromDebugTarget(IDebugTarget dt) throws DebugException {
-		if (dt.isTerminated() || dt.isDisconnected()) {
-			return null;
-		}
-		IThread[] threads= dt.getThreads();
-		for (int i= 0; i < threads.length; i++) {
-			IThread thread= threads[i];
-			if (thread.isSuspended()) {
-				return dt;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * @see IEditorActionDelegate#setActiveEditor(IAction, IEditorPart)
-	 */
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		setAction(action);
-		if (targetEditor instanceof ITextEditor) {
-			setTextEditor((ITextEditor)targetEditor);
-		}
-		update();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RuntimeClasspathAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RuntimeClasspathAction.java
deleted file mode 100644
index 8506e97..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/RuntimeClasspathAction.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jdt.internal.debug.ui.launcher.RuntimeClasspathViewer;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-/**
- * Action used with a runtime classpath viewer.
- */
-public abstract class RuntimeClasspathAction extends SelectionListenerAction {
-	
-	private RuntimeClasspathViewer fViewer;
-	private Button fButton;
-	private Shell fShell;
-	
-	public RuntimeClasspathAction(String label, RuntimeClasspathViewer viewer) {
-		super(label);
-		setViewer(viewer);
-	}
-
-	/**
-	 * Sets the viewer on which this action operates.
-	 * 
-	 * @param viewer the viewer on which this action operates
-	 */
-	public void setViewer(RuntimeClasspathViewer viewer) {
-		if (fViewer != null) {
-			fViewer.removeSelectionChangedListener(this);
-		}
-		fViewer = viewer;
-		if (fViewer != null) {
-			fViewer.addSelectionChangedListener(this);
-			update();
-		}
-	}
-	
-	/**
-	 * Returns the viewer on which this action operates.
-	 * 
-	 * @return the viewer on which this action operates
-	 */
-	protected RuntimeClasspathViewer getViewer() {
-		return fViewer;
-	}
-
-	/**
-	 * Returns the selected items in the list, in the order they are
-	 * displayed.
-	 * 
-	 * @return targets for an action
-	 */
-	protected List getOrderedSelection() {
-		List targets = new ArrayList();
-		List selection = ((IStructuredSelection)getViewer().getSelection()).toList();
-		IRuntimeClasspathEntry[] entries = getViewer().getEntries();
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry target = entries[i];
-			if (selection.contains(target)) {
-				targets.add(target);
-			}
-		}
-		return targets;		
-	}
-	
-	/**
-	 * Returns a list (copy) of the entries in the viewer
-	 */
-	protected List getEntiresAsList() {
-		IRuntimeClasspathEntry[] entries = getViewer().getEntries();
-		List list = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			list.add(entries[i]);
-		}
-		return list;
-	}
-	
-	/**
-	 * Updates the entries to the entries in the given list
-	 */
-	protected void setEntries(List list) {
-		getViewer().setEntries((IRuntimeClasspathEntry[])list.toArray(new IRuntimeClasspathEntry[list.size()]));
-		// update all selection listeners
-		getViewer().setSelection(getViewer().getSelection());
-	}
-	
-	/**
-	 * Returns whether the item at the given index in the list
-	 * (visually) is selected.
-	 */
-	protected boolean isIndexSelected(IStructuredSelection selection, int index) {
-		if (selection.isEmpty()) {
-			return false;
-		}
-		Iterator entries = selection.iterator();
-		List list = getEntiresAsList();
-		while (entries.hasNext()) {
-			Object next = entries.next();
-			if (list.indexOf(next) == index) {
-				return true;
-			}
-		}
-		return false;
-	}	
-	
-	/**
-	 * Sets the button that invokes this action
-	 */
-	public void setButton(Button button) {
-		fButton = button;
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				run();
-			}
-		});
-	}
-	/**
-	 * @see IAction#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		if (fButton != null) {
-			fButton.setEnabled(enabled);
-		}
-	}
-
-	/**
-	 * Updates the enabled state.
-	 */
-	protected void update() {
-		selectionChanged((IStructuredSelection)getViewer().getSelection());
-	}
-	
-	/**
-	 * Returns the shell used to realize this action's dialog (if any).
-	 */
-	protected Shell getShell() {
-		if (fShell == null) {
-			fShell= getViewer().getControl().getShell();
-		} 
-		return fShell;
-	}
-	
-	/**
-	 * Sets the shell used to realize this action's dialog (if any).
-	 */
-	public void setShell(Shell shell) {
-		fShell= shell;
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowFinalFieldsAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowFinalFieldsAction.java
deleted file mode 100644
index 0c9f296..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowFinalFieldsAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.jdt.debug.core.IJavaVariable;

-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-

-/**

- * An view filter action that shows/hides final fields in a view

- */

-public class ShowFinalFieldsAction extends ToggleFilterAction {

-

-	/**

-	 * The filter this action applies to the viewer

-	 */

-	private static final ViewerFilter fgFinalFilter= new FinalFilter();

-

-	public ShowFinalFieldsAction() {

-	}

-	

-

-	/**

-	 * @see ToggleFilterAction#getViewerFilter()

-	 */

-	protected ViewerFilter getViewerFilter() {

-		return fgFinalFilter;

-	}

-	

-	/**

-	 * @see ToggleDelegateAction#initActionId()

-	 */

-	protected void initActionId() {

-		fId= JDIDebugUIPlugin.getUniqueIdentifier() + getView().getSite().getId() + ".ShowFinalFieldsAction"; //$NON-NLS-1$

-	}

-	

-	protected void setAction(IAction action) {

-		super.setAction(action);

-		action.setChecked(JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SHOW_FINAL_FIELDS));

-	}

-}

-

-class FinalFilter extends ViewerFilter {

-		

-	/**

-	 * @see ViewerFilter#select(Viewer, Object, Object)

-	 */

-	public boolean select(Viewer viewer, Object parentElement, Object element) {

-		if (element instanceof IAdaptable) {

-			IJavaVariable var= (IJavaVariable) ((IAdaptable) element).getAdapter(IJavaVariable.class);

-			if (var != null) {

-				if (element.equals(viewer.getInput())) {

-					//never filter out the root

-					return true;

-				}

-				try {

-					return !var.isFinal();

-				} catch (DebugException e) {

-					JDIDebugUIPlugin.log(e);

-					return true;

-				}

-			}

-		}

-		return true;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java
deleted file mode 100644
index 20ddc39..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowQualifiedAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.debug.ui.IDebugModelPresentation;

-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.debug.ui.JDIModelPresentation;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.ILabelProvider;

-import org.eclipse.swt.custom.BusyIndicator;

-

-/**

- * An action delegate that toggles the state of its viewer to

- * show/hide qualified names.

- */

-public class ShowQualifiedAction extends ToggleDelegateAction {

-

-	protected void valueChanged(boolean on) {

-		if (getViewer().getControl().isDisposed()) {

-			return;

-		}		

-		ILabelProvider labelProvider= (ILabelProvider)getViewer().getLabelProvider();

-		if (labelProvider instanceof IDebugModelPresentation) {

-			IDebugModelPresentation debugLabelProvider= (IDebugModelPresentation)labelProvider;

-			debugLabelProvider.setAttribute(JDIModelPresentation.DISPLAY_QUALIFIED_NAMES, (on ? Boolean.TRUE : Boolean.FALSE));

-			BusyIndicator.showWhile(getViewer().getControl().getDisplay(), new Runnable() {

-				public void run() {

-					getViewer().refresh();

-				}

-			});

-		}

-	}

-	

-	/**

-	 * @see ToggleDelegateAction#initActionId()

-	 */

-	protected void initActionId() {

-		fId= JDIDebugUIPlugin.getUniqueIdentifier() + getView().getSite().getId() + ".ShowQualifiedAction"; //$NON-NLS-1$

-	}

-	

-	protected void setAction(IAction action) {

-		super.setAction(action);

-		action.setChecked(JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SHOW_QUALIFIED_NAMES));

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStaticFieldsAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStaticFieldsAction.java
deleted file mode 100644
index 8ef9da2..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ShowStaticFieldsAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.jdt.debug.core.IJavaVariable;

-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-

-/**

- * An view filter action that shows/hides static fields in a view

- */

-public class ShowStaticFieldsAction extends ToggleFilterAction {

-

-	/**

-	 * The filter this action applies to the viewer

-	 */

-	private static final ViewerFilter fgStaticFilter= new StaticFilter();

-	

-	public ShowStaticFieldsAction() {

-	}

-

-	/**

-	 * @see ToggleFilterAction#getViewerFilter()

-	 */

-	protected ViewerFilter getViewerFilter() {

-		return fgStaticFilter;

-	}

-	

-	/**

-	 * @see ToggleDelegateAction#initActionId()

-	 */

-	protected void initActionId() {

-		fId= JDIDebugUIPlugin.getUniqueIdentifier() + getView().getSite().getId() + ".ShowStaticFieldsAction"; //$NON-NLS-1$

-	}

-	

-	protected void setAction(IAction action) {

-		super.setAction(action);

-		action.setChecked(JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_SHOW_STATIC_FIELDS));

-	}

-}

-

-class StaticFilter extends ViewerFilter {

-		

-	/**

-	 * @see ViewerFilter#select(Viewer, Object, Object)

-	 */

-	public boolean select(Viewer viewer, Object parentElement, Object element) {

-		if (element instanceof IAdaptable) {

-			IJavaVariable var= (IJavaVariable) ((IAdaptable) element).getAdapter(IJavaVariable.class);

-			if (var != null) {

-				if (element.equals(viewer.getInput())) {

-					//never filter out the root

-					return true;

-				}

-				try {

-					return !var.isStatic();

-				} catch (DebugException e) {

-					JDIDebugUIPlugin.log(e);

-					return true;

-				}

-			}

-		}

-		return true;

-	}

-

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StackFrameAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StackFrameAction.java
deleted file mode 100644
index a40c903..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/StackFrameAction.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.debug.core.model.IDebugElement;

-import org.eclipse.jdt.debug.core.IJavaStackFrame;

-

-public abstract class StackFrameAction extends OpenTypeAction {

-	

-	protected boolean isEnabledFor(Object element) {

-		return element instanceof IAdaptable && ((IAdaptable) element).getAdapter(IJavaStackFrame.class) != null;

-	}

-		

-	protected IDebugElement getDebugElement(IAdaptable element) {

-		return (IDebugElement)element.getAdapter(IJavaStackFrame.class);

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ThreadFilterViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ThreadFilterViewer.java
deleted file mode 100644
index 2441edc..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ThreadFilterViewer.java
+++ /dev/null
@@ -1,429 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */ 
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.internal.ui.DelegatingModelPresentation;
-import org.eclipse.jdt.debug.core.IJavaBreakpoint;
-import org.eclipse.jdt.debug.core.IJavaDebugTarget;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A thread filter viewer is a field editor which
- * allows the user to configure thread filters for a given
- * breakpoint.
- */
-public class ThreadFilterViewer extends FieldEditor {
-	
-	private IJavaBreakpoint fBreakpoint;
-	private Button fUseThreadFilters;
-	private CheckboxTreeViewer fThreadViewer;
-	private Composite fOuter;
-	private ThreadFilterContentProvider fContentProvider;
-	private CheckHandler fCheckHandler;
-	
-	private static String MAIN= "main"; //$NON-NLS-1$
-	
-	public ThreadFilterViewer(Composite parent, IJavaBreakpoint breakpoint) {
-		fBreakpoint= breakpoint;
-		fContentProvider= new ThreadFilterContentProvider();
-		fCheckHandler= new CheckHandler();
-		init(JavaBreakpointPreferenceStore.THREAD_FILTER, ActionMessages.getString("ThreadFilterViewer.Thread_filtering_1")); //$NON-NLS-1$
-		createControl(parent);
-	}
-	
-	/**
-	 * Create and initialize the thread filter tree viewer.
-	 */
-	protected void createThreadViewer() {
-		GridData data= new GridData();
-		data.horizontalAlignment= GridData.FILL;
-		data.grabExcessHorizontalSpace= true;
-		data.heightHint= 100;
-
-		fThreadViewer= new CheckboxTreeViewer(fOuter, SWT.BORDER);
-		fThreadViewer.addCheckStateListener(fCheckHandler);
-		fThreadViewer.getTree().setLayoutData(data);
-		fThreadViewer.setContentProvider(fContentProvider);
-		fThreadViewer.setLabelProvider(new DelegatingModelPresentation());
-		fThreadViewer.setInput(DebugPlugin.getDefault().getLaunchManager());
-		setInitialCheckedState();
-	}
-	
-	/**
-	 * Sets the initial checked state of the tree viewer.
-	 * The initial state should reflect the current state
-	 * of the breakpoint. If the breakpoint has a thread
-	 * filter in a given thread, that thread should be
-	 * checked.
-	 */
-	protected void setInitialCheckedState() {
-		try {
-			IDebugTarget[] targets= getDebugTargets();
-			for (int i= 0, numTargets= targets.length; i < numTargets; i++) {
-				IJavaDebugTarget target = (IJavaDebugTarget)targets[i].getAdapter(IJavaDebugTarget.class);
-				if (target != null) {
-					IJavaThread filteredThread= fBreakpoint.getThreadFilter(target);
-					if (filteredThread != null) {
-						fCheckHandler.checkThread(filteredThread, true);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-	}
-
-	/**
-	 * Returns the debug targets that appear in the tree
-	 */
-	protected IDebugTarget[] getDebugTargets() {
-		Object input= fThreadViewer.getInput();
-		if (!(input instanceof ILaunchManager)) {
-			return new IJavaDebugTarget[0];
-		}
-		ILaunchManager launchManager= (ILaunchManager)input;
-		return launchManager.getDebugTargets();
-	}
-
-	/**
-	 * @see FieldEditor#adjustForNumColumns(int)
-	 */
-	protected void adjustForNumColumns(int numColumns) {
-		((GridData) fOuter.getLayoutData()).horizontalSpan = numColumns;
-	}
-
-	/**
-	 * @see FieldEditor#doFillIntoGrid(Composite, int)
-	 */
-	protected void doFillIntoGrid(Composite parent, int numColumns) {
-		fOuter= new Composite(parent, SWT.NONE);
-
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.numColumns = numColumns;
-		fOuter.setLayout(layout);
-		
-		GridData data= new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		fOuter.setLayoutData(data);
-		
-		data = new GridData();
-		data.horizontalSpan = numColumns;
-		getLabelControl(fOuter).setLayoutData(data);
-		createThreadViewer();
-	}
-
-	/**
-	 * @see FieldEditor#doLoad()
-	 */
-	protected void doLoad() {
-	}
-
-	/**
-	 * @see FieldEditor#doLoadDefault()
-	 */
-	protected void doLoadDefault() {
-	}
-
-	/**
-	 * @see FieldEditor#doStore()
-	 */
-	protected void doStore() {
-		IDebugTarget[] targets= getDebugTargets();
-		IJavaDebugTarget target;
-		IThread[] threads;
-		IJavaThread thread;
-		for (int i= 0, numTargets= targets.length; i < numTargets; i++) {
-			target = (IJavaDebugTarget)targets[i].getAdapter(IJavaDebugTarget.class);
-			if (target != null) {
-				try {
-					if (fThreadViewer.getChecked(target)) {
-						threads= target.getThreads();
-						for (int j=0, numThreads= threads.length; j < numThreads; j++) {
-							thread= (IJavaThread)threads[j];
-							if (fThreadViewer.getChecked(thread)) {
-								// thread selected for filtering
-								fBreakpoint.setThreadFilter(thread);
-								break; // Can only set one filtered thread.
-							}
-						}
-					} else {
-						fBreakpoint.removeThreadFilter(target);
-					}
-				} catch (CoreException e) {
-					JDIDebugUIPlugin.log(e);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see FieldEditor#getNumberOfControls()
-	 */
-	public int getNumberOfControls() {
-		return 1;
-	}
-	
-	class CheckHandler implements ICheckStateListener {	
-		public void checkStateChanged(CheckStateChangedEvent event) {
-			Object element= event.getElement();
-			if (element instanceof IDebugTarget) {
-				checkTarget((IDebugTarget)element, event.getChecked());
-			} else if (element instanceof IThread) {
-				checkThread((IThread)element, event.getChecked());
-			}
-			verifyCheckedState();
-		}
-		
-		/**
-		 * Check or uncheck a debug target in the tree viewer.
-		 * When a debug target is checked, attempt to
-		 * check one of the target's threads by default.
-		 * When a debug target is unchecked, uncheck all
-		 * its threads.
-		 */
-		protected void checkTarget(IDebugTarget target, boolean checked) {
-			fThreadViewer.setChecked(target, checked);
-			if (checked) {
-				fThreadViewer.expandToLevel(target, TreeViewer.ALL_LEVELS);
-				IThread[] threads;
-				try {
-					threads= target.getThreads();
-				} catch (DebugException exception) {
-					JDIDebugUIPlugin.log(exception);
-					return;
-				}
-				IThread thread;
-				boolean checkedThread= false;
-				// Try to check the "main" thread by default
-				for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
-					thread= threads[i];
-					String name= null;
-					try {
-						name= thread.getName();
-					} catch (DebugException exception) {
-						JDIDebugUIPlugin.log(exception);
-					}
-					if (MAIN.equals(name)) {
-						checkedThread= fThreadViewer.setChecked(thread, true);
-					}
-				}
-				// If the main thread couldn't be checked, check the first
-				// available thread
-				if (!checkedThread) {
-					for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
-						if (fThreadViewer.setChecked(threads[i], true)) {
-							break;
-						}
-					}
-				}
-			} else { // Unchecked
-				IThread[] threads;
-				try {
-					threads= target.getThreads();
-				} catch (DebugException exception) {
-					JDIDebugUIPlugin.log(exception);
-					return;
-				}
-				for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
-					fThreadViewer.setChecked(threads[i], false);
-				}
-			}
-		}
-	
-		/**
-		 * Check or uncheck a thread.
-		 * When a thread is checked, make sure its debug
-		 * target is also checked.
-		 * When a thread is unchecked, uncheck its debug
-		 * target.
-		 */
-		protected void checkThread(IThread thread, boolean checked) {	
-			fThreadViewer.setChecked(thread, checked);
-			IDebugTarget target= (thread).getDebugTarget();
-			if (checked) {
-				// When a thread is checked, make sure the target
-				// is checked and all other threads are
-				// unchecked (simulate radio button behavior)
-				if (!fThreadViewer.getChecked(target)) {					
-					fThreadViewer.setChecked(target, true);
-				}
-				IThread[] threads;
-				try {
-					threads= target.getThreads();
-				} catch (DebugException exception) {
-					JDIDebugUIPlugin.log(exception);
-					return;
-				}
-				for (int i= 0, numThreads= threads.length; i < numThreads; i++) {
-					if (threads[i] != thread) {
-						// Uncheck all threads other than the selected thread
-						fThreadViewer.setChecked(threads[i], false);
-					}
-				}
-			} else {
-				// When a thread is unchecked, uncheck the target
-				fThreadViewer.setChecked(target, false);
-			}
-		}
-	
-		/**
-		 * Verify the state of the tree viewer.
-		 * If the user selects a debug target, they must select
-		 * a thread.
-		 */
-		protected void verifyCheckedState() {
-			IDebugTarget[] targets= getDebugTargets();
-			IDebugTarget target;
-			IThread[] threads;
-			boolean checkedThread;
-			for (int i= 0, numTargets= targets.length; i < numTargets; i++) {
-				target= targets[i];
-				if (!fThreadViewer.getChecked(target)) {
-					continue;
-				}
-				try {
-					threads= target.getThreads();
-				} catch (DebugException exception) {
-					JDIDebugUIPlugin.log(exception);
-					continue;
-				}
-				checkedThread= false;
-				for (int j= 0, numThreads= threads.length; j < numThreads; j++) {
-					if (fThreadViewer.getChecked(threads[j])) {
-						checkedThread= true;
-						break;
-					}
-				}
-				if (checkedThread) {
-					clearErrorMessage();
-				} else {
-					showErrorMessage(ActionMessages.getString("ThreadFilterViewer.Must_select_a_thread_in_selected_targets_2")); //$NON-NLS-1$
-				}
-			}
-		}
-		
-	}
-	
-	class ThreadFilterContentProvider implements ITreeContentProvider {
-		
-		/**
-		 * @see ITreeContentProvider#getChildren(Object)
-		 */
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof IDebugTarget) {
-				IJavaDebugTarget target = (IJavaDebugTarget)((IDebugTarget)parent).getAdapter(IJavaDebugTarget.class);
-				if (target != null) {
-					try {
-						return ((IJavaDebugTarget)parent).getThreads();
-					} catch (DebugException e) {
-						JDIDebugUIPlugin.log(e);
-					}
-				}
-			}		
-			if (parent instanceof ILaunchManager) {
-				List children= new ArrayList();
-				ILaunch[] launches= ((ILaunchManager) parent).getLaunches();
-				IDebugTarget[] targets;
-				IJavaDebugTarget target;
-				for (int i= 0, numLaunches= launches.length; i < numLaunches; i++) {
-					targets= launches[i].getDebugTargets();
-					for (int j= 0, numTargets= targets.length; j < numTargets; j++) {
-						target= (IJavaDebugTarget)targets[j].getAdapter(IJavaDebugTarget.class);
-						if (target != null && !target.isDisconnected() && !target.isTerminated()) {
-							children.add(target);
-						}
-					}
-				}
-				return children.toArray();
-			}
-			return new Object[0];
-		}
-
-		/**
-		 * @see ITreeContentProvider#getParent(Object)
-		 */
-		public Object getParent(Object element) {
-			if (element instanceof IThread) {
-				return ((IThread)element).getDebugTarget();
-			}
-			if (element instanceof IDebugTarget) {
-				return ((IDebugElement)element).getLaunch();
-			}
-			if (element instanceof ILaunch) {
-				return DebugPlugin.getDefault().getLaunchManager();
-			}
-			return null;
-		}
-
-		/**
-		 * @see ITreeContentProvider#hasChildren(Object)
-		 */
-		public boolean hasChildren(Object element) {
-			if (element instanceof IStackFrame) {
-				return false;
-			}
-			if (element instanceof IDebugElement) {
-				return getChildren(element).length > 0;
-			} 
-			if (element instanceof ILaunch) {
-				return true;
-			}
-			if (element instanceof ILaunchManager) {
-				return ((ILaunchManager) element).getLaunches().length > 0;
-			}
-			return false;
-		}
-
-		/**
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return getChildren(inputElement);
-		}
-
-		/**
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/**
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleDelegateAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleDelegateAction.java
deleted file mode 100644
index e97a3df..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleDelegateAction.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.debug.ui.IDebugView;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IViewActionDelegate;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * A generic Toggle view action delegate, meant to be subclassed to provide

- * a specific filter.

- */

-public abstract class ToggleDelegateAction implements IViewActionDelegate, IPropertyChangeListener, IPartListener{

-

-	/**

-	 * The viewer that this action works for

-	 */

-	private StructuredViewer fViewer;

-	

-	private IViewPart fView;

-	

-	protected String fId= ""; //$NON-NLS-1$

-	

-	private IAction fAction;

-	private boolean fNeedsInitialization= true;

-

-	protected void dispose() {

-		if (fView != null) {

-			fView.getViewSite().getPage().removePartListener(this);

-		}

-		JDIDebugUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);

-	}

-	/**

-	 * @see IViewActionDelegate#init(IViewPart)

-	 */

-	public void init(IViewPart view) {

-		setView(view);

-		initActionId();

-		IDebugView adapter= (IDebugView) view.getAdapter(IDebugView.class);

-		if (adapter != null && adapter.getViewer() instanceof StructuredViewer) {

-			setViewer((StructuredViewer)adapter.getViewer());

-		}

-		view.getViewSite().getPage().addPartListener(this);

-		JDIDebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);

-	}

-

-	protected abstract void initActionId();

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		//do nothing.."run" will occur from the property change

-		//this allows for setting the checked state of the IAction

-		//to drive the execution of this delegate.

-		//see propertyChange(PropertyChangeEvent)

-	}

-	

-	protected abstract void valueChanged(boolean on);

-	

-	protected String getActionId() {

-		return fId;

-	}

-	

-	protected StructuredViewer getViewer() {

-		return fViewer;

-	}

-

-	protected void setViewer(StructuredViewer viewer) {

-		fViewer = viewer;

-	}

-	

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (fNeedsInitialization) {

-			setAction(action);

-			action.setId(getActionId());

-			fNeedsInitialization= false;

-		}

-	}

-	

-	protected IAction getAction() {

-		return fAction;

-	}

-

-	protected void setAction(IAction action) {

-		fAction = action;

-		action.addPropertyChangeListener(this);

-	}

-	

-	/**

-	 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)

-	 */

-	public void propertyChange(PropertyChangeEvent event) {

-		if (event.getProperty().equals(getActionId())) {

-			getAction().setChecked(JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(getActionId()));

-		} else if (event.getProperty().equals(IAction.CHECKED)) {

-			JDIDebugUIPlugin.getDefault().getPreferenceStore().setValue(getActionId(), getAction().isChecked());

-			valueChanged(getAction().isChecked());

-		}

-	}

-	/**

-	 * @see IPartListener#partActivated(IWorkbenchPart)

-	 */

-	public void partActivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)

-	 */

-	public void partBroughtToTop(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partClosed(IWorkbenchPart)

-	 */

-	public void partClosed(IWorkbenchPart part) {

-		if (part.equals(getView())) {

-			dispose();

-		}

-	}

-

-	/**

-	 * @see IPartListener#partDeactivated(IWorkbenchPart)

-	 */

-	public void partDeactivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partOpened(IWorkbenchPart)

-	 */

-	public void partOpened(IWorkbenchPart part) {

-	}

-	

-	protected IViewPart getView() {

-		return fView;

-	}

-

-	protected void setView(IViewPart view) {

-		fView = view;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleFilterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleFilterAction.java
deleted file mode 100644
index fe60145..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleFilterAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.ViewerFilter;

-import org.eclipse.swt.custom.BusyIndicator;

-/**

- * A generic Toggle filter action, meant to be subclassed to provide

- * a specific filter.

- */

-public abstract class ToggleFilterAction extends ToggleDelegateAction {

-	/**

-	 * Adds or removes the viewer filter depending

-	 * on the value of the parameter.

-	 */

-	protected void valueChanged(final boolean on) {

-		if (getViewer().getControl().isDisposed()) {

-			return;

-		}

-		BusyIndicator.showWhile(getViewer().getControl().getDisplay(), new Runnable() {

-			public void run() {

-				if (on) {

-					getViewer().removeFilter(getViewerFilter());

-				} else {

-					addFilterToViewer();

-				}

-			}

-		});

-	}

-

-	/**

-	 * Returns the <code>ViewerFilter</code> that this action

-	 * will add/remove from the viewer, or <code>null</code>

-	 * if no filter is involved.

-	 */

-	protected abstract ViewerFilter getViewerFilter();

-	

-	protected void setViewer(StructuredViewer viewer) {

-		super.setViewer(viewer);

-		addFilterToViewer();

-	}

-	

-	protected void addFilterToViewer() {

-		ViewerFilter filter = getViewerFilter();

-		ViewerFilter[] filters = getViewer().getFilters();

-		boolean alreadyAdded = false;

-		for (int i = 0; i < filters.length; i++) {

-			ViewerFilter addedFilter = filters[i];

-			if (addedFilter.equals(filter)) {

-				alreadyAdded = true;

-				break;

-			}

-		}

-		if (!alreadyAdded) {

-			getViewer().addFilter(filter);

-		}					

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleStepFilterAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleStepFilterAction.java
deleted file mode 100644
index 3a4e8db..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/ToggleStepFilterAction.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.actions;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.jdt.internal.debug.ui.IJDIPreferencesConstants;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IViewActionDelegate;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * Toggles the global preference flag that controls whether the active step filters

- * defined in the Java Debug Options preference page are used.

- */

-public class ToggleStepFilterAction implements IViewActionDelegate, IPartListener ,IPropertyChangeListener {

-

-	private boolean fSetInitialState = false;

-

-	private IViewPart fView;

-	private IAction fAction;

-	

-	/**

-	 * @see IViewActionDelegate#init(IViewPart)

-	 */

-	public void init(IViewPart view) {

-		setView(view);

-		view.getSite().getPage().addPartListener(this);

-		IPreferenceStore store = JDIDebugUIPlugin.getDefault().getPreferenceStore();

-		store.addPropertyChangeListener(this);

-	}

-

-	/**

-	 * @see IActionDelegate#run(IAction)

-	 */

-	public void run(IAction action) {

-		IPreferenceStore store = JDIDebugUIPlugin.getDefault().getPreferenceStore();

-		boolean newStepFilterState = !store.getBoolean(IJDIPreferencesConstants.PREF_USE_FILTERS);		

-		store.setValue(IJDIPreferencesConstants.PREF_USE_FILTERS, newStepFilterState);

-	}

-	

-	/**

-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)

-	 */

-	public void selectionChanged(IAction action, ISelection selection) {

-		if (!fSetInitialState) {

-			action.setChecked(JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_USE_FILTERS));

-			fSetInitialState = true;

-			setAction(action);

-		}

-	}

-	

-	protected IAction getAction() {

-		return fAction;

-	}

-

-	protected void setAction(IAction action) {

-		fAction = action;

-	}

-

-	protected IViewPart getView() {

-		return fView;

-	}

-

-	protected void setView(IViewPart view) {

-		fView = view;

-	}

-	/**

-	 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)

-	 */

-	public void propertyChange(PropertyChangeEvent event) {

-		IAction action= getAction();

-		if (action == null) {

-			return;

-		}

-		if (event.getProperty().equals(IJDIPreferencesConstants.PREF_USE_FILTERS)) {

-			action.setChecked(JDIDebugUIPlugin.getDefault().getPreferenceStore().getBoolean(IJDIPreferencesConstants.PREF_USE_FILTERS));

-		}

-		

-	}

-	/**

-	 * @see IPartListener#partActivated(IWorkbenchPart)

-	 */

-	public void partActivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)

-	 */

-	public void partBroughtToTop(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partClosed(IWorkbenchPart)

-	 */

-	public void partClosed(IWorkbenchPart part) {

-		if (part == getView()) {

-			getView().getSite().getPage().removePartListener(this);

-			IPreferenceStore store = JDIDebugUIPlugin.getDefault().getPreferenceStore();

-			store.removePropertyChangeListener(this);

-		}

-	}

-

-	/**

-	 * @see IPartListener#partDeactivated(IWorkbenchPart)

-	 */

-	public void partDeactivated(IWorkbenchPart part) {

-	}

-

-	/**

-	 * @see IPartListener#partOpened(IWorkbenchPart)

-	 */

-	public void partOpened(IWorkbenchPart part) {

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/ClearDisplayAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/ClearDisplayAction.java
deleted file mode 100644
index f6e8f21..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/ClearDisplayAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;

-import org.eclipse.jface.action.Action;

-import org.eclipse.ui.IWorkbenchPart;

-

-/**

- * Clears the display.

- */

-public class ClearDisplayAction extends Action {

-	

-	private IWorkbenchPart fWorkbenchPart;

-

-	public ClearDisplayAction(IWorkbenchPart workbenchPart) {

-		fWorkbenchPart= workbenchPart;

-		

-		setText(DisplayMessages.getString("ClearDisplay.label")); //$NON-NLS-1$

-		setToolTipText(DisplayMessages.getString("ClearDisplay.tooltip")); //$NON-NLS-1$

-		setDescription(DisplayMessages.getString("ClearDisplay.description")); //$NON-NLS-1$

-		

-		JavaDebugImages.setLocalImageDescriptors(this, "clear_co.gif"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @see Action#run

-	 */

-	public void run() {

-		Object value= fWorkbenchPart.getAdapter(IDataDisplay.class);

-		if (value instanceof IDataDisplay) {

-			IDataDisplay dataDisplay= (IDataDisplay) value;

-			dataDisplay.clear();

-		}

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java
deleted file mode 100644
index 3c88a20..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DataDisplay.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;

-

-/**********************************************************************

-Copyright (c) 2000, 2002 IBM Corp. and others.

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Common Public License v0.5

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/cpl-v05.html

-

-Contributors:

-    IBM Corporation - Initial implementation

-**********************************************************************/

-

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.jface.text.ITextViewer;

-

-/**

- * An implementation of a data display for a text viewer

- */

-public class DataDisplay implements IDataDisplay {

-	

-	/**

-	 * The text viewer this data display works on

-	 */

-	private ITextViewer fTextViewer;

-	

-	/**

-	 * Constructs a data display for the given text viewer.

-	 * 

-	 * @param viewer text viewer

-	 */

-	public DataDisplay(ITextViewer viewer) {

-		setTextViewer(viewer);

-	}

-

-	/**

-	 * @see IDataDisplay#clear()

-	 */

-	public void clear() {

-		IDocument document= getTextViewer().getDocument();

-		if (document != null) {

-			document.set(""); //$NON-NLS-1$

-		}

-	}

-	

-	/**

-	 * @see IDataDisplay#displayExpression(String)

-	 */

-	public void displayExpression(String expression) {

-		ITextSelection selection= (ITextSelection)getTextViewer().getSelectionProvider().getSelection();

-		int offset= selection.getOffset();

-		expression= expression.trim();

-		StringBuffer buffer= new StringBuffer(expression);

-		buffer.append(System.getProperty("line.separator")); //$NON-NLS-1$

-		buffer.append('\t');

-		expression= buffer.toString();

-		try {

-			getTextViewer().getDocument().replace(offset, selection.getLength(), expression);	

-			getTextViewer().setSelectedRange(offset + expression.length(), 0);	

-			getTextViewer().revealRange(offset, expression.length());

-		} catch (BadLocationException ble) {

-			JDIDebugUIPlugin.log(ble);

-		}

-	}		

-	

-	/**

-	 * @see IDataDisplay#displayExpressionValue(String)

-	 */

-	public void displayExpressionValue(String value) {

-		value= value + System.getProperty("line.separator"); //$NON-NLS-1$

-		ITextSelection selection= (ITextSelection)getTextViewer().getSelectionProvider().getSelection();

-

-		int offset= selection.getOffset();

-		int length= value.length();

-		int replace= selection.getLength() - offset;

-		if (replace < 0) {

-			replace= 0;

-		}

-		try {

-			getTextViewer().getDocument().replace(offset, replace, value);	

-		} catch (BadLocationException ble) {

-			JDIDebugUIPlugin.log(ble);

-		}

-		getTextViewer().setSelectedRange(offset + length, 0);	

-		getTextViewer().revealRange(offset, length);

-	}

-

-	/**

-	 * Sets the text viewer for this data display

-	 * 

-	 * @param viewer text viewer

-	 */

-	private void setTextViewer(ITextViewer viewer) {

-		fTextViewer = viewer;

-	}

-	

-	/**

-	 * Returns the text viewer for this data display

-	 * 

-	 * @return text viewer

-	 */

-	protected ITextViewer getTextViewer() {

-		return fTextViewer;

-	}	

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsCompletionProcessor.java
deleted file mode 100644
index 4b7f4de..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsCompletionProcessor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IExpression;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugView;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.core.IJavaArray;
-import org.eclipse.jdt.debug.core.IJavaStackFrame;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
- 
-public class DetailsCompletionProcessor extends DisplayCompletionProcessor {
-
-	/**
-	 * @see IContentAssistProcessor#computeCompletionProposals(ITextViewer, int)
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
-		IAdaptable context = DebugUITools.getDebugContext();
-		if (context == null) {
-			return new ICompletionProposal[0];
-		}
-		IJavaStackFrame stackFrame= (IJavaStackFrame)context.getAdapter(IJavaStackFrame.class);
-		if (stackFrame == null) {
-			return new ICompletionProposal[0];
-		}
-		
-		IWorkbenchWindow window= JDIDebugUIPlugin.getActiveWorkbenchWindow();
-		if (window == null) {
-			return new ICompletionProposal[0];
-		}
-		IWorkbenchPage page= window.getActivePage();
-		if (page == null) {
-			return new ICompletionProposal[0];
-		}
-		IDebugView view= (IDebugView)page.getActivePart();
-		if (view == null) {
-			return new ICompletionProposal[0];
-		}
-		ISelection selection= view.getViewer().getSelection();
-		if (selection.isEmpty() || !(selection instanceof IStructuredSelection)) {
-			return super.computeCompletionProposals(stackFrame, viewer, documentOffset);
-		}
-		
-		IStructuredSelection viewerSelection= (IStructuredSelection)selection;
-		if (viewerSelection.size() > 1) {
-			return new ICompletionProposal[0];
-		}
-		Object element= viewerSelection.getFirstElement();	
-		IJavaProject project= getJavaProject(stackFrame);
-		if (project != null) {
-			try {
-				ITextSelection textSelection= (ITextSelection)viewer.getSelectionProvider().getSelection();			
-				IType receivingType= getReceivingType(project, element);
-					
-				if (receivingType == null) {
-					return new ICompletionProposal[0];
-				}
-		
-				configureResultCollector(project, textSelection);	
-				int insertionPosition= computeInsertionPosition(receivingType, stackFrame);
-				receivingType.codeComplete(viewer.getDocument().get().toCharArray(), insertionPosition, documentOffset,
-					 new char[0][], new char[0][],
-					 new int[0], false, getCollector());
-					 
-				 //Order here and not in result collector to make sure that the order
-				 //applies to all proposals and not just those of the compilation unit. 
-				return order(getCollector().getResults());	
-			} catch (JavaModelException x) {
-				handle(viewer, x);
-			} catch (DebugException de) {
-				handle(viewer, de);
-			}
-		}
-		return null;
-	}
-	
-	private IType getReceivingType(IJavaProject project, Object element) throws DebugException {
-		String originalTypeName= getReceivingTypeName(element);
-		if (originalTypeName == null) {
-			return null;
-		}
-		String typeName= originalTypeName;
-		int dollarIndex= typeName.indexOf('$');
-		if (dollarIndex >= 0) {
-			typeName= typeName.substring(0, dollarIndex);
-		}
-		int index = typeName.lastIndexOf('.');
-		if (index >= 0) {
-			typeName = typeName.replace('.', IPath.SEPARATOR);
-		} 
-		typeName+=".java"; //$NON-NLS-1$
-		
-		return getType(project, originalTypeName, typeName);
-	}
-
-	private String getReceivingTypeName(Object element) {
-		
-		IValue value= null;
-		try {
-			if (element instanceof IVariable) {
-				value= ((IVariable)element).getValue();
-				if (value instanceof IJavaArray) {
-					return null;
-				}
-			} else if (element instanceof IExpression) {
-				value= ((IExpression)element).getValue();	
-			}
-			if (value != null) {
-				return value.getReferenceTypeName();
-			}
-		} catch (DebugException de) {
-			JDIDebugUIPlugin.log(de);
-		}
-				
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsViewerConfiguration.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsViewerConfiguration.java
deleted file mode 100644
index 9e3ba89..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DetailsViewerConfiguration.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
-
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-
-public class DetailsViewerConfiguration extends DisplayViewerConfiguration {
-
-	/**
-	 * @see JDIViewerConfiguration#getContentAssistantProcessor()
-	 */
-	public IContentAssistProcessor getContentAssistantProcessor() {
-		return new DetailsCompletionProcessor();
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
deleted file mode 100644
index a4cef96..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayCompletionProcessor.java
+++ /dev/null
@@ -1,434 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.debug.core.DebugException;

-import org.eclipse.debug.core.ILaunch;

-import org.eclipse.debug.core.model.ISourceLocator;

-import org.eclipse.debug.core.model.IStackFrame;

-import org.eclipse.debug.core.model.IVariable;

-import org.eclipse.debug.ui.DebugUITools;

-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.debug.core.IJavaStackFrame;

-import org.eclipse.jdt.internal.corext.template.ContextType;

-import org.eclipse.jdt.internal.corext.template.ContextTypeRegistry;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.ui.text.java.IJavaCompletionProposal;

-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposalComparator;

-import org.eclipse.jdt.internal.ui.text.java.JavaParameterListValidator;

-import org.eclipse.jdt.internal.ui.text.java.ResultCollector;

-import org.eclipse.jdt.internal.ui.text.template.TemplateEngine;

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.Document;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.jface.text.ITextViewer;

-import org.eclipse.jface.text.contentassist.ICompletionProposal;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.text.contentassist.IContextInformation;

-import org.eclipse.jface.text.contentassist.IContextInformationValidator;

-import org.eclipse.swt.widgets.Shell;

-

-/**

- * Display snippet completion processor.

- */

-public class DisplayCompletionProcessor implements IContentAssistProcessor {

-		

-	private ResultCollector fCollector;

-	private IContextInformationValidator fValidator;

-	private TemplateEngine fTemplateEngine;

-	

-	private char[] fProposalAutoActivationSet;

-	private JavaCompletionProposalComparator fComparator;

-		

-	public DisplayCompletionProcessor() {

-		fCollector= new ResultCollector();

-		ContextType contextType= ContextTypeRegistry.getInstance().getContextType("java"); //$NON-NLS-1$

-		if (contextType != null) {

-			fTemplateEngine= new TemplateEngine(contextType);

-		}

-		fComparator= new JavaCompletionProposalComparator();

-	}

-	

-	/**

-	 * @see IContentAssistProcessor#getErrorMessage()

-	 */

-	public String getErrorMessage() {

-		return fCollector.getErrorMessage();

-	}

-

-	/**

-	 * @see IContentAssistProcessor#getContextInformationValidator()

-	 */

-	public IContextInformationValidator getContextInformationValidator() {

-		if (fValidator == null) {

-			fValidator= new JavaParameterListValidator();

-		}

-		return fValidator;

-	}

-

-	/**

-	 * @see IContentAssistProcessor#getContextInformationAutoActivationCharacters()

-	 */

-	public char[] getContextInformationAutoActivationCharacters() {

-		return null;

-	}

-

-	/**

-	 * @see IContentAssistProcessor#computeContextInformation(ITextViewer, int)

-	 */

-	public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {

-		return null;

-	}

-	

-	/**

-	 * @see IContentAssistProcessor#computeProposals(ITextViewer, int)

-	 */

-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {

-		IAdaptable context = DebugUITools.getDebugContext();

-		if (context == null) {

-			return new ICompletionProposal[0];

-		}

-		

-		IJavaStackFrame stackFrame= (IJavaStackFrame)context.getAdapter(IJavaStackFrame.class);

-		if (stackFrame == null) {

-			return new ICompletionProposal[0];

-		}

-			

-		return computeCompletionProposals(stackFrame, viewer, documentOffset);

-	}

-

-	protected ICompletionProposal[] computeCompletionProposals(IJavaStackFrame stackFrame, ITextViewer viewer, int documentOffset) {

-		try {

-			IJavaProject project= getJavaProject(stackFrame);

-			if (project != null) {

-				IType receivingType= getReceivingType(project, stackFrame);

-				

-				if (receivingType == null) {

-					return new ICompletionProposal[0];

-				}

-				IVariable[] variables= stackFrame.getLocalVariables();

-				char[][] localVariableNames= new char[variables.length][];

-				char[][] localVariableTypeNames= new char[variables.length][];

-				resolveLocalVariables(variables, localVariableNames, localVariableTypeNames);

-				

-				ITextSelection selection= (ITextSelection)viewer.getSelectionProvider().getSelection();

-				configureResultCollector(project, selection);	

-				

-				int[] localModifiers= new int[localVariableNames.length];

-				Arrays.fill(localModifiers, 0);

-				

-				int insertionPosition = computeInsertionPosition(receivingType, stackFrame);

-				

-				receivingType.codeComplete(viewer.getDocument().get().toCharArray(), insertionPosition, documentOffset,

-					 localVariableTypeNames, localVariableNames,

-					 localModifiers, stackFrame.isStatic(), fCollector);

-				

-				IJavaCompletionProposal[] results= fCollector.getResults();

-				

-				if (fTemplateEngine != null) {

-					try {

-						fTemplateEngine.reset();

-						fTemplateEngine.complete(viewer, documentOffset, null);

-						IJavaCompletionProposal[] templateResults= fTemplateEngine.getResults();

-

-						// concatenate arrays

-						IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];

-						System.arraycopy(templateResults, 0, total, 0, templateResults.length);

-						System.arraycopy(results, 0, total, templateResults.length, results.length);

-						results= total;

-					} catch (JavaModelException x) {

-						JDIDebugUIPlugin.log(x);

-					}					

-				}	 

-				 //Order here and not in result collector to make sure that the order

-				 //applies to all proposals and not just those of the compilation unit. 

-				return order(results);	

-			}

-		} catch (JavaModelException x) {

-			handle(viewer, x);

-		} catch (DebugException de) {

-			handle(viewer, de);

-		}

-		

-		return null;

-	}

-

-	protected int computeInsertionPosition(IType receivingType, IJavaStackFrame stackFrame) throws JavaModelException, DebugException {

-		int insertion = -1;

-		if (!receivingType.isBinary() && receivingType.getDeclaringType() == null) {

-			ICompilationUnit stackCU= getCompilationUnit(stackFrame);

-			ICompilationUnit typeCU= receivingType.getCompilationUnit();

-			if (typeCU != null && typeCU.equals(stackCU)) {

-				if (stackCU != null) {

-					IDocument doc = new Document(stackCU.getSource());

-					try {

-						insertion = doc.getLineOffset(stackFrame.getLineNumber() - 1);

-					} catch(BadLocationException e) {

-						JDIDebugUIPlugin.log(e);

-					}	

-				}

-			}

-		}

-		return insertion;

-	}

-	

-	/**

-	 * Returns the compliation unit associated with this

-	 * Java stack frame.  Returns <code>null</code> for a binary stack

-	 * frame.

-	 */

-	protected ICompilationUnit getCompilationUnit(IJavaStackFrame stackFrame) {

-		// Get the corresponding element.

-		ILaunch launch = stackFrame.getLaunch();

-		if (launch == null) {

-			return null;

-		}

-		ISourceLocator locator= launch.getSourceLocator();

-		if (locator == null) {

-			return null;

-		}

-		Object sourceElement= locator.getSourceElement(stackFrame);

-		if (sourceElement instanceof IType) {

-			return (ICompilationUnit)((IType)sourceElement).getCompilationUnit();

-		}

-		if (sourceElement instanceof ICompilationUnit) {

-			return (ICompilationUnit)sourceElement;

-		}

-		return null;

-	}

-	

-	protected void handle(ITextViewer viewer, CoreException x) {

-		Shell shell= viewer.getTextWidget().getShell();

-		ErrorDialog.openError(shell,

-			DisplayMessages.getString("DisplayCompletionProcessor.Problems_during_completion_1"), //$NON-NLS-1$

-			DisplayMessages.getString("DisplayCompletionProcessor.An_exception_occurred_during_code_completion_2"), //$NON-NLS-1$ 

-			x.getStatus());  

-		JDIDebugUIPlugin.log(x);

-	}

-	

-	protected void resolveLocalVariables(IVariable[] variables, char[][] localVariableNames, char[][] localVariableTypeNames) throws DebugException {

-		for (int i = 0; i < variables.length; i++) {

-			IVariable variable = variables[i];

-			localVariableNames[i]= variable.getName().toCharArray();

-			localVariableTypeNames[i]= getTranslatedTypeName(variable.getReferenceTypeName()).toCharArray();

-		}

-	}

-	

-	/**

-	 * Returns the Java project associated with the given stack

-	 * frame, or <code>null</code> if none.

-	 */

-	protected IJavaProject getJavaProject(IStackFrame stackFrame) {

-		

-		// Get the corresponding element.

-		ILaunch launch = stackFrame.getLaunch();

-		if (launch == null) {

-			return null;

-		}

-		ISourceLocator locator= launch.getSourceLocator();

-		if (locator == null)

-			return null;

-		

-		Object sourceElement = locator.getSourceElement(stackFrame);

-		if (sourceElement instanceof IJavaElement) {

-			return ((IJavaElement) sourceElement).getJavaProject();

-		}			

-		return null;

-	}	

-	

-	/**

-	 * Order the given proposals.

-	 */

-	protected IJavaCompletionProposal[] order(IJavaCompletionProposal[] proposals) {

-		Arrays.sort(proposals, fComparator);

-		return proposals;	

-	}	

-	

-	/**

-	 * Configures the display result collection for the current code assist session

-	 */

-	protected void configureResultCollector(IJavaProject project, ITextSelection selection) {

-		fCollector.reset(selection.getOffset(), project, null);

-		if (selection.getLength() != 0) {

-			fCollector.setReplacementLength(selection.getLength());

-		} 

-	}

-	

-	/**

-	 * Returns an array of simple type names that are

-	 * part of the given type's qualified name. For

-	 * example, if the given name is <code>x.y.A$B</code>,

-	 * an array with <code>["A", "B"]</code> is returned.

-	 * 

-	 * @param typeName fully qualified type name

-	 * @return array of nested type names

-	 */

-	protected String[] getNestedTypeNames(String typeName) {

-		int index = typeName.lastIndexOf('.');

-		if (index >= 0) {

-			typeName= typeName.substring(index + 1);

-		}

-		index = typeName.indexOf('$');

-		List list = new ArrayList(1);

-		while (index >= 0) {

-			list.add(typeName.substring(0, index));

-			typeName = typeName.substring(index + 1);

-			index = typeName.indexOf('$');

-		}

-		list.add(typeName);

-		return (String[])list.toArray(new String[list.size()]);	

-	}

-	

-	/**

-	 * Returns a copy of the type name with '$' replaced by

-	 * '.', or returns <code>null</code> if the given type

-	 * name refers to an anonymous inner class. 

-	 * 

-	 * @param typeName a fully qualified type name

-	 * @return a copy of the type name with '$' replaced by

-	 * '.', or returns <code>null</code> if the given type

-	 * name refers to an anonymous inner class.

-	 */

-	protected String getTranslatedTypeName(String typeName) {

-		int index = typeName.lastIndexOf('$');

-		if (index == -1) {

-			return typeName;

-		}

-		if (index + 1 > typeName.length()) {

-			// invalid name

-			return typeName;

-		}

-		String last = typeName.substring(index + 1);

-		try {

-			Integer.parseInt(last);

-			return null;

-		} catch (NumberFormatException e) {

-			return typeName.replace('$', '.');

-		}

-	}

-

-

-	/**

-	 * Returns the receiving type of the the given stack frame.

-	 * 

-	 * @return receiving type

-	 * @exception DebugException if:<ul>

-	 * <li>A failure occurs while accessing attributes of 

-	 *  the stack frame</li>

-	 * <li>the resolved type is an inner type</li>

-	 * <li>unable to resolve a type</li>

-	 * </ul>

-	 */

-	private IType getReceivingType(IJavaProject project, IJavaStackFrame frame) throws DebugException {

-		String typeName= frame.getReceivingTypeName();

-		String sourceName= frame.getSourceName();

-		if (sourceName == null || !typeName.equals(frame.getDeclaringTypeName())) {

-			// if there is no debug attribute or the declaring type is not the

-			// same as the receiving type, we must guess at the receiver's source

-			// file

-			int dollarIndex= typeName.indexOf('$');

-			if (dollarIndex >= 0) {

-				typeName= typeName.substring(0, dollarIndex);

-			}

-			typeName = typeName.replace('.', IPath.SEPARATOR);

-			typeName+= ".java";			 //$NON-NLS-1$

-		} else {

-			int index = typeName.lastIndexOf('.');

-			if (index >= 0) {

-				typeName = typeName.substring(0, index + 1);

-				typeName = typeName.replace('.', IPath.SEPARATOR);

-			} else {

-				typeName = ""; //$NON-NLS-1$

-			}

-			typeName+=sourceName;

-		}

-		return getType(project, frame.getReceivingTypeName(), typeName);

-	}

-	

-	/**

-	 * Tells this processor to order the proposals alphabetically.

-	 * 

-	 * @param order <code>true</code> if proposals should be ordered.

-	 */

-	public void orderProposalsAlphabetically(boolean order) {

-		fComparator.setOrderAlphabetically(order);

-	}

-	

-	/**

-	 * @see IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()

-	 */

-	public char[] getCompletionProposalAutoActivationCharacters() {

-		return fProposalAutoActivationSet;

-	}

-	

-	/**

-	 * Sets this processor's set of characters triggering the activation of the

-	 * completion proposal computation.

-	 * 

-	 * @param activationSet the activation set

-	 */

-	public void setCompletionProposalAutoActivationCharacters(char[] activationSet) {

-		fProposalAutoActivationSet= activationSet;

-	}

-	

-	protected ResultCollector getCollector() {

-		return fCollector;

-	}

-

-	protected void setCollector(ResultCollector collector) {

-		fCollector = collector;

-	}

-

-	protected IType getType(IJavaProject project, String originalTypeName, String typeName) throws DebugException {

-		

-		int dollarIndex= typeName.indexOf('$');

-		if (dollarIndex > 0) {

-			typeName= typeName.substring(0, dollarIndex);

-		}

-		IPath sourcePath =  new Path(typeName);

-		IType type = null;

-		try {

-			IJavaElement result= project.findElement(sourcePath);

-			String[] typeNames = getNestedTypeNames(originalTypeName);

-			if (result != null) {

-				if (result instanceof IClassFile) {

-					type = ((IClassFile)result).getType();

-				} else if (result instanceof ICompilationUnit) {

-					type = ((ICompilationUnit)result).getType(typeNames[0]);

-				} else if (result instanceof IType) {

-					type = (IType)result;

-				}

-			}

-			for (int i = 1; i < typeNames.length; i++) {

-				String innerTypeName= typeNames[i];

-				try {

-					Integer.parseInt(innerTypeName);

-					return type;

-				} catch (NumberFormatException e) {

-				}

-				type = type.getType(innerTypeName);

-			}

-		} catch (JavaModelException e) {

-			throw new DebugException(e.getStatus());

-		}

-		

-		return type;	

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java
deleted file mode 100644
index 98f9dbb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.display;

-

-

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-

-class DisplayMessages {

-

-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.debug.ui.display.DisplayMessages";//$NON-NLS-1$

-

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-	private DisplayMessages() {

-	}

-

-	public 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.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties
deleted file mode 100644
index dd8eaf1..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayMessages.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial implementation

-######################################################################

-

-ClearDisplay.description=Clear the Display

-ClearDisplay.label=Clea&r

-ClearDisplay.tooltip=Clear Display

-

-DisplayCompletionProcessor.An_exception_occurred_during_code_completion_2=An exception occurred during code completion

-DisplayCompletionProcessor.Problems_during_completion_1=Problems during completion

-

-DisplayView.Co&ntent_Assist@Ctrl+Space_1=Co&ntent Assist@Ctrl+Space

-DisplayView.Content_Assist_2=Content Assist

-DisplayView.Copy.description=Copy

-DisplayView.Copy.label=&Copy@Ctrl+C

-DisplayView.Copy.tooltip=Copy

-DisplayView.Cut.description=Cut

-DisplayView.Cut.label=Cu&t@Ctrl+X

-DisplayView.Cut.tooltip=Cut

-DisplayView.Paste.Description=Paste

-DisplayView.Paste.label=&Paste@Ctrl+V

-DisplayView.Paste.tooltip=Paste

-DisplayView.SelectAll.description=Select All

-DisplayView.SelectAll.label=Select &All@Ctrl+A

-DisplayView.SelectAll.tooltip=Select 

-

-find_replace_action.label=&Find/Replace...@Ctrl+F

-find_replace_action.tooltip=Find/Replace

-find_replace_action.image=

-find_replace_action.description=Find/Replace
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
deleted file mode 100644
index cca891d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayView.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java
deleted file mode 100644
index 1966822..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.text.ITextOperationTarget;

-import org.eclipse.ui.texteditor.IUpdate;

-

-

-public class DisplayViewAction extends Action implements IUpdate {

-	

-	/** The text operation code */

-	private int fOperationCode= -1;

-	/** The text operation target */

-	private ITextOperationTarget fOperationTarget;

-	/** The text operation target provider */

-	private IAdaptable fTargetProvider;

-	

-	

-	public DisplayViewAction(ITextOperationTarget target, int operationCode) {

-		super();

-		fOperationTarget= target;

-		fOperationCode= operationCode;

-		update();

-	}

-		

-	public DisplayViewAction(IAdaptable targetProvider, int operationCode) {

-		super();

-		fTargetProvider= targetProvider;

-		fOperationCode= operationCode;

-		update();

-	}

-	

-	/**

-	 * The <code>TextOperationAction</code> implementation of this 

-	 * <code>IAction</code> method runs the operation with the current

-	 * operation code.

-	 */

-	public void run() {

-		if (fOperationCode != -1 && fOperationTarget != null)

-			fOperationTarget.doOperation(fOperationCode);

-	}

-	

-	/**

-	 * The <code>TextOperationAction</code> implementation of this 

-	 * <code>IUpdate</code> method discovers the operation through the current

-	 * editor's <code>ITextOperationTarget</code> adapter, and sets the

-	 * enabled state accordingly.

-	 */

-	public void update() {

-		if (fOperationTarget == null && fTargetProvider != null && fOperationCode != -1){

-			fOperationTarget= (ITextOperationTarget) fTargetProvider.getAdapter(ITextOperationTarget.class);

-		}

-	

-		boolean isEnabled= (fOperationTarget != null && fOperationTarget.canDoOperation(fOperationCode));

-		setEnabled(isEnabled);

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java
deleted file mode 100644
index 8f5d589..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/DisplayViewerConfiguration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jdt.internal.debug.ui.JDIContentAssistPreference;

-import org.eclipse.jdt.internal.ui.JavaPlugin;

-import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.contentassist.ContentAssistant;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.text.contentassist.IContentAssistant;

-import org.eclipse.jface.text.source.ISourceViewer;

-

-/**

- *  The source viewer configuration for the Display view

- */

-public class DisplayViewerConfiguration extends JavaSourceViewerConfiguration {

-		

-	public DisplayViewerConfiguration() {

-		super(JavaPlugin.getDefault().getJavaTextTools(), null);

-	}

-

-	/**

-	 * @see JDIViewerConfiguration#getContentAssistantProcessor()

-	 */

-	public IContentAssistProcessor getContentAssistantProcessor() {

-		return new DisplayCompletionProcessor();

-	}

-	

-	/**

-	 * @see SourceViewerConfiguration#getContentAssistant(ISourceViewer)

-	 */

-	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {

-

-		ContentAssistant assistant = new ContentAssistant();

-		assistant.setContentAssistProcessor(

-			getContentAssistantProcessor(),

-			IDocument.DEFAULT_CONTENT_TYPE);

-

-		JDIContentAssistPreference.configure(assistant, getColorManager());

-

-		assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE);

-		assistant.setInformationControlCreator(

-			getInformationControlCreator(sourceViewer));

-

-		return assistant;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/IDataDisplay.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/IDataDisplay.java
deleted file mode 100644
index bbfd776..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/IDataDisplay.java
+++ /dev/null
@@ -1,27 +0,0 @@
-

-package org.eclipse.jdt.internal.debug.ui.display;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-public interface IDataDisplay {

-	

-	/**

-	 * Clears the content of this data display.

-	 */

-	public void clear();

-	

-	/**

-	 * Displays the expression in the content of this data

-	 * display.

-	 */

-	public void displayExpression(String expression);

-	

-	/**

-	 * Displays the expression valur in the content of this data

-	 * display.

-	 */

-	public void displayExpressionValue(String value);

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java
deleted file mode 100644
index 8b971d3..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/display/JavaInspectExpression.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.display;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.core.runtime.PlatformObject;

-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.model.IDebugTarget;

-import org.eclipse.debug.core.model.IExpression;

-import org.eclipse.debug.core.model.IValue;

-import org.eclipse.jdt.debug.core.IJavaValue;

-

-/**

- * An implementation of an expression produced from the

- * inspect action. An inspect expression removes

- * itself from the expression manager when its debug

- * target terminates.

- */

-public class JavaInspectExpression extends PlatformObject implements IExpression, IDebugEventSetListener {

-	

-	/**

-	 * The value of this expression

-	 */

-	private IJavaValue fValue;

-	

-	/**

-	 * The code snippet for this expression.

-	 */

-	private String fExpression;

-

-	/**

-	 * Constucts a new inspect result for the given

-	 * expression and resulting value. Starts listening

-	 * to debug events such that this element will remove

-	 * itself from the expression manager when its debug

-	 * target terminates.

-	 * 

-	 * @param expression code snippet

-	 * @param value value of the expression

-	 */

-	public JavaInspectExpression(String expression, IJavaValue value) {

-		fValue = value;

-		fExpression = expression;

-		DebugPlugin.getDefault().addDebugEventListener(this);

-	}

-	

-	/**

-	 * @see IExpression#getExpressionText()

-	 */

-	public String getExpressionText() {

-		return fExpression;

-	}

-

-	/**

-	 * @see IExpression#getValue()

-	 */

-	public IValue getValue() {

-		return fValue;

-	}

-

-	/**

-	 * @see IDebugElement#getDebugTarget()

-	 */

-	public IDebugTarget getDebugTarget() {

-		return getValue().getDebugTarget();

-	}

-

-	/**

-	 * @see IDebugElement#getModelIdentifier()

-	 */

-	public String getModelIdentifier() {

-		return getValue().getModelIdentifier();

-	}

-

-	/**

-	 * @see IDebugElement#getLaunch()

-	 */

-	public ILaunch getLaunch() {

-		return getValue().getLaunch();

-	}

-

-	/**

-	 * @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 && event.getSource().equals(getDebugTarget())) {

-				DebugPlugin.getDefault().getExpressionManager().removeExpression(this);

-			}

-		}

-	}

-

-	/**

-	 * @see IExpression#dispose()

-	 */

-	public void dispose() {

-		DebugPlugin.getDefault().removeDebugEventListener(this);		

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaCommandTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaCommandTab.java
deleted file mode 100644
index db0975c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AbstractJavaCommandTab.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public abstract class AbstractJavaCommandTab extends AbstractLaunchConfigurationTab {
-	
-	protected Text fJavaCommandText;
-	protected Button fDefaultButton;
-	
-	protected static final Map EMPTY_MAP = new HashMap(1);
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		GridLayout topLayout = new GridLayout();
-		comp.setLayout(topLayout);
-		topLayout.marginWidth= 0;
-		topLayout.marginHeight= 0;
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		comp.setLayoutData(gd);
-		
-		createVerticalSpacer(comp, 2);
-		
-		Label javaCommandLabel= new Label(comp, SWT.NONE);
-		javaCommandLabel.setText(LauncherMessages.getString("AbstractJavaCommandTab.Name_of_Java_e&xecutable__1"));  //$NON-NLS-1$
-		
-		fJavaCommandText= new Text(comp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fJavaCommandText.setLayoutData(gd);
-		fJavaCommandText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fDefaultButton = new Button(comp, SWT.CHECK);
-		fDefaultButton.setText(LauncherMessages.getString("AbstractJavaCommandTab.Use_de&fault_Java_executable_2")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fDefaultButton.setLayoutData(gd);
-		fDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleDefaultButtonSelected(fDefaultButton.getSelection());
-			}
-		});
-
-		setControl(comp);
-	}
-
-	protected void handleDefaultButtonSelected(boolean useDefault) {
-		if (useDefault) {
-			fJavaCommandText.setText(getCommand());
-		} 
-		fJavaCommandText.setEnabled(!useDefault);
-	}
-	
-	protected abstract String getCommand();
-
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("AbstractJavaCommandTab.Standard_VM_Java_Command_3"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		String javaCommand= LauncherMessages.getString("AbstractJavaCommandTab._4"); //$NON-NLS-1$
-		try {
-			Map attributeMap = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, EMPTY_MAP);
-			if (attributeMap != null) {
-				javaCommand = (String) attributeMap.get(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND);
-				if (javaCommand == null) {
-					javaCommand = "javaw"; //$NON-NLS-1$
-				}
-			}
-		} catch(CoreException ce) {
-			JDIDebugUIPlugin.log(ce);		
-		}
-		fJavaCommandText.setText(javaCommand);
-		if (javaCommand.equals(getCommand())) {
-			//using the default
-			fDefaultButton.setSelection(true);
-			handleDefaultButtonSelected(true);
-		} else {
-			fDefaultButton.setSelection(false);
-			handleDefaultButtonSelected(false);
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		String javaCommand = fJavaCommandText.getText();
-		Map attributeMap = new HashMap(1);
-		attributeMap.put(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, javaCommand);
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, attributeMap);	
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		boolean valid= fJavaCommandText.getText().length() != 0;
-		if (valid) {
-			setErrorMessage(null);
-			setMessage(null);
-		} else {
-			setErrorMessage(LauncherMessages.getString("AbstractJavaCommandTab.Java_executable_must_be_specified_5")); //$NON-NLS-1$
-			setMessage(null);
-		}
-		return valid;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AddVMDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AddVMDialog.java
deleted file mode 100644
index 178c87b..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/AddVMDialog.java
+++ /dev/null
@@ -1,458 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.File;

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.Enumeration;

-import java.util.zip.ZipEntry;

-import java.util.zip.ZipFile;

-

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.ui.dialogs.StatusDialog;

-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;

-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ComboDialogField;

-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;

-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;

-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;

-import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;

-import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;

-import org.eclipse.jdt.launching.IVMInstall;

-import org.eclipse.jdt.launching.IVMInstallType;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.jface.dialogs.IDialogSettings;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.DirectoryDialog;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.ui.help.WorkbenchHelp;

-

-public class AddVMDialog extends StatusDialog {

-	private static final String JAVA_LANG_OBJECT= "java/lang/Object.java"; //$NON-NLS-1$

-

-	private IAddVMDialogRequestor fRequestor;

-	

-	private IVMInstall fEditedVM;

-

-	private IVMInstallType[] fVMTypes;

-	private IVMInstallType fSelectedVMType;

-	

-	private ComboDialogField fVMTypeCombo;

-	private VMLibraryBlock fLibraryBlock;

-	

-	private StringButtonDialogField fJRERoot;

-	private StringDialogField fVMName;

-

-	private StringButtonDialogField fJavadocURL;

-	

-	private IDialogSettings fDialogSettings;

-	

-	private IStatus[] fStati;

-		

-	public AddVMDialog(IAddVMDialogRequestor requestor, Shell shell, IVMInstallType[] vmInstallTypes, IVMInstall editedVM) {

-		super(shell);

-		fRequestor= requestor;

-		fStati= new IStatus[5];

-		for (int i= 0; i < fStati.length; i++) {

-			fStati[i]= new StatusInfo();

-		}

-		

-		fVMTypes= vmInstallTypes;

-		fSelectedVMType= editedVM != null ? editedVM.getVMInstallType() : vmInstallTypes[0];

-		

-		fEditedVM= editedVM;

-		

-		fDialogSettings= JDIDebugUIPlugin.getDefault().getDialogSettings();

-	}

-	

-	/**

-	 * @see Windows#configureShell

-	 */

-	protected void configureShell(Shell newShell) {

-		super.configureShell(newShell);

-		WorkbenchHelp.setHelp(newShell, IJavaDebugHelpContextIds.EDIT_JRE_DIALOG);

-	}		

-	

-	protected void createDialogFields() {

-		fVMTypeCombo= new ComboDialogField(SWT.READ_ONLY);

-		fVMTypeCombo.setLabelText(LauncherMessages.getString("addVMDialog.jreType")); //$NON-NLS-1$

-		fVMTypeCombo.setDialogFieldListener(new IDialogFieldListener() {

-			public void dialogFieldChanged(DialogField field) {

-				updateVMType();

-			}

-		});

-		

-		fVMName= new StringDialogField();

-		fVMName.setLabelText(LauncherMessages.getString("addVMDialog.jreName")); //$NON-NLS-1$

-		fVMName.setDialogFieldListener(new IDialogFieldListener() {

-			public void dialogFieldChanged(DialogField field) {

-				setVMNameStatus(validateVMName());

-				updateStatusLine();

-			}

-		});

-		

-		fJRERoot= new StringButtonDialogField(new IStringButtonAdapter() {

-			public void changeControlPressed(DialogField field) {

-				browseForInstallDir();

-			}

-		});

-		fJRERoot.setLabelText(LauncherMessages.getString("addVMDialog.jreHome")); //$NON-NLS-1$

-		fJRERoot.setButtonLabel(LauncherMessages.getString("addVMDialog.browse1")); //$NON-NLS-1$

-		fJRERoot.setDialogFieldListener(new IDialogFieldListener() {

-			public void dialogFieldChanged(DialogField field) {

-				setJRELocationStatus(validateJRELocation());

-				updateStatusLine();

-			}

-		});

-	

-		fJavadocURL = new StringButtonDialogField(new IStringButtonAdapter() {

-			public void changeControlPressed(DialogField field) {

-				browseForJavadocURL();

-			}

-		});

-		fJavadocURL.setLabelText(LauncherMessages.getString("AddVMDialog.Java&doc_URL__1")); //$NON-NLS-1$

-		fJavadocURL.setButtonLabel(LauncherMessages.getString("AddVMDialog.Bro&wse..._2")); //$NON-NLS-1$

-	}

-	

-	protected String getVMName() {

-		return fVMName.getText();

-	}

-		

-	protected File getInstallLocation() {

-		return new File(fJRERoot.getText());

-	}

-		

-	protected Control createDialogArea(Composite ancestor) {

-		createDialogFields();

-		Composite parent= new Composite(ancestor, SWT.NULL);

-		GridLayout layout= new GridLayout();

-		layout.numColumns= 3;

-		parent.setLayout(layout);

-		

-		fVMTypeCombo.doFillIntoGrid(parent, 3);

-		((GridData)fVMTypeCombo.getComboControl(null).getLayoutData()).widthHint= convertWidthInCharsToPixels(50);

-

-		fVMName.doFillIntoGrid(parent, 3);

-	

-		fJRERoot.doFillIntoGrid(parent, 3);

-		

-		fJavadocURL.doFillIntoGrid(parent, 3);

-		

-		Label l = new Label(parent, SWT.NONE);

-		l.setText(LauncherMessages.getString("AddVMDialog.JRE_system_libraries__1")); //$NON-NLS-1$

-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 3;

-		l.setLayoutData(gd);		

-		

-		fLibraryBlock = new VMLibraryBlock(this);

-		Control block = fLibraryBlock.createControl(parent);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 3;

-		block.setLayoutData(gd);

-		

-		Text t= fJRERoot.getTextControl(parent);

-		gd= (GridData)t.getLayoutData();

-		gd.grabExcessHorizontalSpace=true;

-		gd.widthHint= convertWidthInCharsToPixels(50);

-		

-		t= fJavadocURL.getTextControl(parent);

-		gd= (GridData)t.getLayoutData();

-		gd.grabExcessHorizontalSpace=true;

-		gd.widthHint= convertWidthInCharsToPixels(50);

-		

-		initializeFields();

-		

-		return parent;

-	}

-	

-	private void updateVMType() {

-		int selIndex= fVMTypeCombo.getSelectionIndex();

-		if (selIndex >= 0 && selIndex < fVMTypes.length) {

-			fSelectedVMType= fVMTypes[selIndex];

-		}

-		setJRELocationStatus(validateJRELocation());

-		fLibraryBlock.initializeFrom(fEditedVM, fSelectedVMType);

-		updateStatusLine();

-	}	

-	

-	public void create() {

-		super.create();

-		fVMName.setFocus();

-		selectVMType();

-	}

-	

-	private String[] getVMTypeNames() {

-		String[] names=  new String[fVMTypes.length];

-		for (int i= 0; i < fVMTypes.length; i++) {

-			names[i]= fVMTypes[i].getName();

-		}

-		return names;

-	}

-	

-	private void selectVMType() {

-		for (int i= 0; i < fVMTypes.length; i++) {

-			if (fSelectedVMType == fVMTypes[i]) {

-				fVMTypeCombo.selectItem(i);

-				return;

-			}

-		}

-	}

-	

-	private void initializeFields() {

-		fVMTypeCombo.setItems(getVMTypeNames());

-		if (fEditedVM == null) {

-			fVMName.setText(""); //$NON-NLS-1$

-			fJRERoot.setText(""); //$NON-NLS-1$

-			fJavadocURL.setText(""); //$NON-NLS-1$

-			fLibraryBlock.initializeFrom(null, fSelectedVMType);

-		} else {

-			fVMTypeCombo.setEnabled(false);

-			fVMName.setText(fEditedVM.getName());

-			fJRERoot.setText(fEditedVM.getInstallLocation().getAbsolutePath());

-			URL url = fEditedVM.getJavadocLocation();

-			if (url == null) {

-				fJavadocURL.setText(""); //$NON-NLS-1$

-			} else {

-				fJavadocURL.setText(url.toExternalForm());

-			}

-			fLibraryBlock.initializeFrom(fEditedVM, fSelectedVMType);

-		}

-	}

-	

-	private IVMInstallType getVMType() {

-		return fSelectedVMType;

-	}

-	

-	private IStatus validateJRELocation() {

-		String locationName= fJRERoot.getText();

-		IStatus s = null;

-		File file = null;

-		if (locationName.length() == 0) {//$NON-NLS-1$

-			s = new StatusInfo(IStatus.INFO, LauncherMessages.getString("addVMDialog.enterLocation")); //$NON-NLS-1$

-		} else {

-			file= new File(locationName);

-			if (!file.exists()) {

-				s = new StatusInfo(IStatus.ERROR, LauncherMessages.getString("addVMDialog.locationNotExists")); //$NON-NLS-1$

-			} else {

-				s = getVMType().validateInstallLocation(file);

-			}

-		}

-		if (s.isOK()) {

-			fLibraryBlock.setHomeDirectory(file);

-		} else {

-			fLibraryBlock.setHomeDirectory(null);

-		}

-		fLibraryBlock.update();

-		return s;

-	}

-

-	private IStatus validateVMName() {

-		StatusInfo status= new StatusInfo();

-		String name= fVMName.getText();

-		if (name == null || name.trim().length() == 0) {

-			status.setInfo(LauncherMessages.getString("addVMDialog.enterName")); //$NON-NLS-1$

-		} else {

-			IVMInstallType type= getVMType();

-			if (fRequestor.isDuplicateName(type, name) && (fEditedVM == null || !name.equals(fEditedVM.getName()))) {

-				status.setError(LauncherMessages.getString("addVMDialog.duplicateName")); //$NON-NLS-1$

-			}

-		}

-		return status;

-	}

-	

-	protected void updateStatusLine() {

-		IStatus max= null;

-		for (int i= 0; i < fStati.length; i++) {

-			IStatus curr= fStati[i];

-			if (curr.matches(IStatus.ERROR)) {

-				updateStatus(curr);

-				return;

-			}

-			if (max == null || curr.getSeverity() > max.getSeverity()) {

-				max= curr;

-			}

-		}

-		updateStatus(max);

-	}

-			

-	/**

-	 * try finding the package prefix

-	 */

-	private IPath determinePackagePrefix(IPath sourceJar) {

-		if (sourceJar.isEmpty() || !sourceJar.toFile().isFile()) {

-			return null;

-		}

-		ZipFile zip= null;

-		try {

-			zip= new ZipFile(sourceJar.toFile());

-			Enumeration zipEntries= zip.entries();

-			while (zipEntries.hasMoreElements()) {

-				ZipEntry entry= (ZipEntry) zipEntries.nextElement();

-				String name= entry.getName();

-				if (name.endsWith(JAVA_LANG_OBJECT)) {

-					String prefix= name.substring(0, name.length() - JAVA_LANG_OBJECT.length());

-					if (prefix.endsWith("/")) { //$NON-NLS-1$

-						prefix= prefix.substring(0, prefix.length() - 1);

-					}

-					return new Path(prefix);

-				}

-			}

-		} catch (IOException e) {

-			JDIDebugUIPlugin.log(e);

-		} finally {

-			if (zip != null) {

-				try { 

-					zip.close();

-				} catch (IOException e) {

-					JDIDebugUIPlugin.log(e);

-				}

-			}

-		}

-		return null;

-	}

-	

-	private void browseForInstallDir() {

-		DirectoryDialog dialog= new DirectoryDialog(getShell());

-		dialog.setFilterPath(fJRERoot.getText());

-		dialog.setMessage(LauncherMessages.getString("addVMDialog.pickJRERootDialog.message")); //$NON-NLS-1$

-		String newPath= dialog.open();

-		if (newPath != null) {

-			fJRERoot.setText(newPath);

-		}

-	}

-	

-	private void browseForJavadocURL() {

-		DirectoryDialog dialog= new DirectoryDialog(getShell());

-		

-		String initPath= ""; //$NON-NLS-1$

-		URL url = getURL();

-		if (url != null && "file".equals(url.getProtocol())) { //$NON-NLS-1$

-			initPath= (new File(url.getFile())).getPath();

-		}

-

-		dialog.setFilterPath(initPath);

-		dialog.setMessage(LauncherMessages.getString("AddVMDialog.Select_Javadoc_location__3")); //$NON-NLS-1$

-		String res = dialog.open();

-		if (res != null) {

-			try {

-				url = (new File(res)).toURL();

-				fJavadocURL.setText(url.toExternalForm());

-			} catch (MalformedURLException e) {

-				// should not happen

-				JDIDebugUIPlugin.log(e);

-			}

-		}

-	}	

-	

-	protected URL getURL() {

-		try {

-			return new URL(fJavadocURL.getText());

-		} catch (MalformedURLException e) {

-			return null;

-		}

-	}

-	

-	protected void okPressed() {

-		doOkPressed();

-		super.okPressed();

-	}

-	

-	private void doOkPressed() {

-		if (fEditedVM == null) {

-			IVMInstall vm= new VMStandin(fSelectedVMType, createUniqueId(fSelectedVMType));

-			setFieldValuesToVM(vm);

-			fRequestor.vmAdded(vm);

-		} else {

-			setFieldValuesToVM(fEditedVM);

-		}

-	}

-	

-	private String createUniqueId(IVMInstallType vmType) {

-		String id= null;

-		do {

-			id= String.valueOf(System.currentTimeMillis());

-		} while (vmType.findVMInstall(id) != null);

-		return id;

-	}

-	

-	protected void setFieldValuesToVM(IVMInstall vm) {

-		vm.setInstallLocation(new File(fJRERoot.getText()).getAbsoluteFile());

-		vm.setName(fVMName.getText());

-		vm.setJavadocLocation(getURL());

-		fLibraryBlock.performApply(vm);

-	}

-	

-	protected File getAbsoluteFileOrEmpty(String path) {

-		if (path == null || path.length() == 0) {

-			return new File(""); //$NON-NLS-1$

-		}

-		return new File(path).getAbsoluteFile();

-	}

-	

-	private IStatus getVMNameStatus() {

-		return fStati[0];

-	}

-	

-	private void setVMNameStatus(IStatus status) {

-		fStati[0]= status;

-	}

-	

-	private IStatus getJRELocationStatus() {

-		return fStati[1];

-	}

-	

-	private void setJRELocationStatus(IStatus status) {

-		fStati[1]= status;

-	}

-	

-	private IStatus getDebuggerTimeoutStatus() {

-		return fStati[2];

-	}

-	

-	private void setDebuggerTimeoutStatus(IStatus status) {

-		fStati[2]= status;

-	}

-	

-	protected IStatus getSystemLibraryStatus() {

-		return fStati[3];

-	}

-	

-	protected void setSystemLibraryStatus(IStatus status) {

-		fStati[3]= status;

-	}

-	

-	private IStatus getSystemLibrarySourceStatus() {

-		return fStati[4];

-	}

-	

-	private void setSystemLibrarySourceStatus(IStatus status) {

-		fStati[4]= status;

-	}

-	

-	/**

-	 * Updates the status of the ok button to reflect the given status.

-	 * Subclasses may override this method to update additional buttons.

-	 * @param status the status.

-	 */

-	protected void updateButtonsEnableState(IStatus status) {

-		Button ok = getButton(IDialogConstants.OK_ID);

-		if (ok != null && !ok.isDisposed())

-			ok.setEnabled(status.getSeverity() == IStatus.OK);

-	}	

-	

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java
deleted file mode 100644
index f2f731a..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ArchiveFileFilter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-/**
- * Viewer filter for archive selection dialogs.
- * Archives are files with file extension 'jar' and 'zip'.
- * The filter is not case sensitive.
- */
-public class ArchiveFileFilter extends ViewerFilter {
-
-	private static final String[] fgArchiveExtensions= { "jar", "zip" }; //$NON-NLS-1$ //$NON-NLS-2$
-
-	private List fExcludes;
-	
-	/**
-	 * @param excludedFiles Excluded files will not pass the filter.
-	 * <code>null</code> is allowed if no files should be excluded. 
-	 */
-	public ArchiveFileFilter(IFile[] excludedFiles) {
-		if (excludedFiles != null) {
-			fExcludes= Arrays.asList(excludedFiles);
-		} else {
-			fExcludes= null;
-		}
-	}
-	
-	/*
-	 * @see ViewerFilter#select
-	 */
-	public boolean select(Viewer viewer, Object parent, Object element) {
-		if (element instanceof IFile) {
-			if (fExcludes != null && fExcludes.contains(element)) {
-				return false;
-			}
-			return isArchivePath(((IFile)element).getFullPath());
-		} else if (element instanceof IContainer) { // IProject, IFolder
-			try {
-				IResource[] resources= ((IContainer)element).members();
-				for (int i= 0; i < resources.length; i++) {
-					// recursive! Only show containers that contain an archive
-					if (select(viewer, parent, resources[i])) {
-						return true;
-					}
-				}
-			} catch (CoreException e) {
-				JDIDebugUIPlugin.log(e.getStatus());
-			}				
-		}
-		return false;
-	}
-	
-	public static boolean isArchivePath(IPath path) {
-		String ext= path.getFileExtension();
-		if (ext != null && ext.length() != 0) {
-			for (int i= 0; i < fgArchiveExtensions.length; i++) {
-				if (ext.equalsIgnoreCase(fgArchiveExtensions[i])) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}		
-	
-			
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ComboFieldEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ComboFieldEditor.java
deleted file mode 100644
index bbce5fd..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ComboFieldEditor.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A field editor for a combo box that allows the drop-down selection of one of a list of items.
- */
-public class ComboFieldEditor extends FieldEditor {
-
-	/**
-	 * The <code>Combo</code> widget.
-	 */
-	private Combo fCombo;
-	
-	/**
-	 * The value (not the name) of the currently selected item in the Combo widget.
-	 */
-	private String fValue;
-	
-	/**
-	 * The names (labels) and underlying values to populate the combo widget.  These should be
-	 * arranged as: { {name1, value1}, {name2, value2}, ...}
-	 */
-	private String[][] fEntryNamesAndValues;
-
-	public ComboFieldEditor(String name, String labelText, String[][] entryNamesAndValues, Composite parent) {
-		init(name, labelText);
-		Assert.isTrue(checkArray(entryNamesAndValues));
-		fEntryNamesAndValues = entryNamesAndValues;
-		createControl(parent);		
-	}
-
-	/**
-	 * Checks whether given <code>String[][]</code> is of "type" 
-	 * <code>String[][2]</code>.
-	 *
-	 * @return <code>true</code> if it is ok, and <code>false</code> otherwise
-	 */
-	private boolean checkArray(String[][] table) {
-		if (table == null) {
-			return false;
-		}
-		for (int i = 0; i < table.length; i++) {
-			String[] array = table[i];
-			if (array == null || array.length != 2) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @see FieldEditor#adjustForNumColumns(int)
-	 */
-	protected void adjustForNumColumns(int numColumns) {
-		if (numColumns > 1) {
-			Control control = getLabelControl();
-			int left = numColumns;
-			if (control != null) {
-				((GridData)control.getLayoutData()).horizontalSpan = 1;
-				left = left - 1;
-			}
-			((GridData)fCombo.getLayoutData()).horizontalSpan = left;
-		} else {
-			Control control = getLabelControl();
-			if (control != null) {
-				((GridData)control.getLayoutData()).horizontalSpan = 1;
-			}
-			((GridData)fCombo.getLayoutData()).horizontalSpan = 1;			
-		}
-	}
-
-	/**
-	 * @see FieldEditor#doFillIntoGrid(Composite, int)
-	 */
-	protected void doFillIntoGrid(Composite parent, int numColumns) {
-		int comboC = 1;
-		if (numColumns > 1) {
-			comboC = numColumns - 1;
-		}
-		Control control = getLabelControl(parent);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 1;
-		control.setLayoutData(gd);
-		control = getComboBoxControl(parent);
-		gd = new GridData();
-		gd.horizontalSpan = comboC;
-		gd.horizontalAlignment = GridData.FILL;
-		control.setLayoutData(gd);
-	}
-
-	/**
-	 * @see FieldEditor#doLoad()
-	 */
-	protected void doLoad() {
-		updateComboForValue(getPreferenceStore().getString(getPreferenceName()));
-	}
-
-	/**
-	 * @see FieldEditor#doLoadDefault()
-	 */
-	protected void doLoadDefault() {
-		updateComboForValue(getPreferenceStore().getDefaultString(getPreferenceName()));
-	}
-
-	/**
-	 * @see FieldEditor#doStore()
-	 */
-	protected void doStore() {
-		if (fValue == null) {
-			getPreferenceStore().setToDefault(getPreferenceName());
-			return;
-		}
-	
-		getPreferenceStore().setValue(getPreferenceName(), fValue);
-	}
-
-	/**
-	 * @see FieldEditor#getNumberOfControls()
-	 */
-	public int getNumberOfControls() {
-		return 1;
-	}
-
-	/**
-	 * Lazily create and return the Combo control.
-	 */
-	public Combo getComboBoxControl(Composite parent) {
-		if (fCombo == null) {
-			fCombo = new Combo(parent, SWT.READ_ONLY);
-			for (int i = 0; i < fEntryNamesAndValues.length; i++) {
-				fCombo.add(fEntryNamesAndValues[i][0], i);
-			}
-			
-			fCombo.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					String oldValue = fValue;
-					String name = fCombo.getText();
-					fValue = getValueForName(name);
-					setPresentsDefaultValue(false);
-					fireValueChanged(VALUE, oldValue, fValue);					
-				}
-			});
-		}
-		return fCombo;
-	}
-	
-	/**
-	 * Given the name (label) of an entry, return the corresponding value.
-	 */
-	protected String getValueForName(String name) {
-		for (int i = 0; i < fEntryNamesAndValues.length; i++) {
-			String[] entry = fEntryNamesAndValues[i];
-			if (name.equals(entry[0])) {
-				return entry[1];
-			}
-		}
-		return fEntryNamesAndValues[0][0];
-	}
-	
-	/**
-	 * Set the name in the combo widget to match the specified value.
-	 */
-	protected void updateComboForValue(String value) {
-		fValue = value;
-		for (int i = 0; i < fEntryNamesAndValues.length; i++) {
-			if (value.equals(fEntryNamesAndValues[i][1])) {
-				fCombo.setText(fEntryNamesAndValues[i][0]);
-				return;
-			}
-		}
-		if (fEntryNamesAndValues.length > 0) {
-			fValue = fEntryNamesAndValues[0][1];
-		}
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IAddVMDialogRequestor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IAddVMDialogRequestor.java
deleted file mode 100644
index b99ad09..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IAddVMDialogRequestor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */ 

-

-import org.eclipse.jdt.launching.IVMInstall;

-import org.eclipse.jdt.launching.IVMInstallType;

-

-/**

- * This interface is implemented by clients of the <code>AddVMDialog</code>.

- */

-public interface IAddVMDialogRequestor {

-

-	/**

-	 * Reply whether or not a new VM of the specified name and type would

-	 * constitute a duplicate.

-	 * 

-	 * @param type the type of a potential new VM

-	 * @param name the name of a potential new VM

-	 * @return whether a new VM of the specified type and name would be a duplicate VM

-	 */

-	public boolean isDuplicateName(IVMInstallType type, String name);

-	

-	/**

-	 * Notification that a VM has been added from the <code>AddVMDialog</code>.

-	 * 

-	 * @param vm the added vm

-	 */

-	public void vmAdded(IVMInstall vm);

-	

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IEntriesChangedListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IEntriesChangedListener.java
deleted file mode 100644
index 79f88bc..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/IEntriesChangedListener.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-/**
- * Listener interface to receive notification when entries in a runtime
- * classpath entry viewer change in some way.
- */
-public interface IEntriesChangedListener {
-
-	/**
-	 * Notification entries have changed in the viewer
-	 */
-	public void entriesChanged(RuntimeClasspathViewer viewer);
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JREContainerWizardPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JREContainerWizardPage.java
deleted file mode 100644
index b4cecd6..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JREContainerWizardPage.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Extension to allow a user to associate a JRE with a Java project.
- */
-public class JREContainerWizardPage extends WizardPage implements IClasspathContainerPage {
-	
-	/**
-	 * The classpath entry to be created.
-	 */
-	private IClasspathEntry fSelection;
-	
-	/**
-	 * JRE control
-	 */
-	private JavaJRETab fJRETab;
-	
-	/**
-	 * Fake launch config used with the control.
-	 */
-	private ILaunchConfigurationWorkingCopy fConfig;
-	
-	/**
-	 * Image
-	 */
-	private Image fImage;
-	
-	/**
-	 * Constructs a new page.
-	 */
-	public JREContainerWizardPage() {
-		super(LauncherMessages.getString("JREContainerWizardPage.JRE_System_Library_1")); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see IClasspathContainerPage#finish()
-	 */
-	public boolean finish() {
-		// retrieve selected JRE
-		fJRETab.performApply(fConfig);
-		String typeId = null;
-		String name = null;
-		try {
-			typeId = fConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-			name = fConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String)null);
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JREContainerWizardPage.Unable_to_set_JRE_for_project._2"), e); //$NON-NLS-1$
-			return false;
-		}
-		
-		IPath path = new Path(JavaRuntime.JRE_CONTAINER);
-		if (typeId != null) {
-			path = path.append(typeId);
-			path = path.append(name);
-		}
-		
-		fSelection = JavaCore.newContainerEntry(path);
-		
-		return true;
-	}
-
-	/**
-	 * @see IClasspathContainerPage#getSelection()
-	 */
-	public IClasspathEntry getSelection() {
-		return fSelection;
-	}
-
-	/**
-	 * @see IClasspathContainerPage#setSelection(IClasspathEntry)
-	 */
-	public void setSelection(IClasspathEntry containerEntry) {
-		fSelection = containerEntry;
-		initializeFromSelection();
-	}
-
-	/**
-	 * Initlaizes the JRE selection
-	 */
-	protected void initializeFromSelection() {
-		if (getControl() != null) {
-			String typeId = null;
-			String name = null;		
-			if (fSelection != null) {
-				IPath path = fSelection.getPath();
-				if (path.segmentCount() > 1) {
-					typeId = path.segment(1);
-					name = path.segment(2);
-				}
-			}
-			fConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, typeId);
-			fConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, name);
-			fJRETab.initializeFrom(fConfig);
-		}
-	}
-	
-	/**
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		fJRETab = new JavaJRETab();
-		fJRETab.setVMSpecificArgumentsVisible(false);
-		fJRETab.createControl(parent);
-		setControl(fJRETab.getControl());
-		setTitle(LauncherMessages.getString("JREContainerWizardPage.JRE_System_Library_1")); //$NON-NLS-1$
-		setMessage(LauncherMessages.getString("JREContainerWizardPage.Select_the_JRE_used_to_build_this_project._4")); //$NON-NLS-1$
-		
-		ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		try {
-			fConfig = type.newInstance(null, "TEMP_CONFIG"); //$NON-NLS-1$
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JREContainerWizardPage.Unable_to_retrieve_existing_JREs_6"), e); //$NON-NLS-1$
-			return;
-		}
-		
-		initializeFromSelection();
-	}
-
-	/**
-	 * @see IDialogPage#getImage()
-	 */
-	public Image getImage() {
-		if (fImage == null) {
-			fImage = JavaDebugImages.DESC_WIZBAN_LIBRARY.createImage();
-		}
-		return fImage;
-	}
-
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (fImage != null) {
-			fImage.dispose();
-		}
-	}
-
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaApplicationShortcut.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaApplicationShortcut.java
deleted file mode 100644
index e615a71..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaApplicationShortcut.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-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.ILaunchManager;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.debug.ui.JavaUISourceLocator;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-/**
- * Performs single click launching for local java applications.
- */
-public class JavaApplicationShortcut implements ILaunchShortcut {
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void searchAndLaunch(Object[] search, String mode) {
-		IType[] types = null;
-		if (search != null) {
-			try {
-				ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-				types = MainMethodFinder.findTargets(dialog, search);
-			} catch (InterruptedException e) {
-				return;
-			} catch (InvocationTargetException e) {
-				MessageDialog.openError(getShell(), LauncherMessages.getString("JavaApplicationAction.Launch_failed_7"), e.getMessage()); //$NON-NLS-1$
-				return;
-			}
-			IType type = null;
-			if (types.length == 0) {
-				MessageDialog.openError(getShell(), LauncherMessages.getString("JavaApplicationAction.Launch_failed_7"), LauncherMessages.getString("JavaApplicationAction.Launch_failed__no_main_type_found_1")); //$NON-NLS-1$ //$NON-NLS-2$
-			} else if (types.length > 1) {
-				type = chooseType(types, mode);
-			} else {
-				type = types[0];
-			}
-			if (type != null) {
-				launch(type, mode);
-			}
-		}
-
-	}	
-
-	/**
-	 * Prompts the user to select a type
-	 * 
-	 * @return the selected type or <code>null</code> if none.
-	 */
-	protected IType chooseType(IType[] types, String mode) {
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider());
-		dialog.setElements(types);
-		dialog.setTitle(LauncherMessages.getString("JavaApplicationAction.Type_Selection_4")); //$NON-NLS-1$
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(LauncherMessages.getString("JavaApplicationAction.Choose_a_&main_type_to_debug__5")); //$NON-NLS-1$
-		} else {
-			dialog.setMessage(LauncherMessages.getString("JavaApplicationAction.Choose_a_&main_type_to_run__6")); //$NON-NLS-1$
-		}
-		dialog.setMultipleSelection(false);
-		if (dialog.open() == dialog.OK) {
-			return (IType)dialog.getFirstResult();
-		}
-		return null;
-	}
-	
-	/**
-	 * Launches a configuration for the given type
-	 */
-	protected void launch(IType type, String mode) {
-		try { 
-			ILaunchConfiguration config = findLaunchConfiguration(type, mode);
-			if (config != null) {
-				DebugUITools.saveAndBuildBeforeLaunch();
-				config.launch(mode, null);
-			}			
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("JavaApplicationAction.Launch_failed_7"), e.getStatus()); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Locate a configuration to relaunch for the given type.  If one cannot be found, create one.
-	 * 
-	 * @return a re-useable config or <code>null</code> if none
-	 */
-	protected ILaunchConfiguration findLaunchConfiguration(IType type, String mode) {
-		ILaunchConfigurationType configType = getJavaLaunchConfigType();
-		List candidateConfigs = Collections.EMPTY_LIST;
-		try {
-			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType);
-			candidateConfigs = new ArrayList(configs.length);
-			for (int i = 0; i < configs.length; i++) {
-				ILaunchConfiguration config = configs[i];
-				if (config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "").equals(type.getFullyQualifiedName())) { //$NON-NLS-1$
-					if (config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(type.getJavaProject().getElementName())) { //$NON-NLS-1$
-						candidateConfigs.add(config);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-		
-		// If there are no existing configs associated with the IType, create one.
-		// If there is exactly one config associated with the IType, return it.
-		// Otherwise, if there is more than one config associated with the IType, prompt the
-		// user to choose one.
-		int candidateCount = candidateConfigs.size();
-		if (candidateCount < 1) {
-			return createConfiguration(type);
-		} else if (candidateCount == 1) {
-			return (ILaunchConfiguration) candidateConfigs.get(0);
-		} else {
-			// Prompt the user to choose a config.  A null result means the user
-			// cancelled the dialog, in which case this method returns null,
-			// since cancelling the dialog should also cancel launching anything.
-			ILaunchConfiguration config = chooseConfiguration(candidateConfigs, mode);
-			if (config != null) {
-				return config;
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Show a selection dialog that allows the user to choose one of the specified
-	 * launch configurations.  Return the chosen config, or <code>null</code> if the
-	 * user cancelled the dialog.
-	 */
-	protected ILaunchConfiguration chooseConfiguration(List configList, String mode) {
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setElements(configList.toArray());
-		dialog.setTitle(LauncherMessages.getString("JavaApplicationAction.Launch_Configuration_Selection_1"));  //$NON-NLS-1$
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(LauncherMessages.getString("JavaApplicationAction.Choose_a_launch_configuration_to_debug_2"));  //$NON-NLS-1$
-		} else {
-			dialog.setMessage(LauncherMessages.getString("JavaApplicationAction.Choose_a_launch_configuration_to_run_3")); //$NON-NLS-1$
-		}
-		dialog.setMultipleSelection(false);
-		int result = dialog.open();
-		labelProvider.dispose();
-		if (result == dialog.OK) {
-			return (ILaunchConfiguration) dialog.getFirstResult();
-		}
-		return null;		
-	}
-	
-	/**
-	 * Create & return a new configuration based on the specified <code>IType</code>.
-	 */
-	protected ILaunchConfiguration createConfiguration(IType type) {
-		ILaunchConfiguration config = null;
-		try {
-			ILaunchConfigurationType configType = getJavaLaunchConfigType();
-			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(type.getElementName())); 
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, type.getFullyQualifiedName());
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, type.getJavaProject().getElementName());
-			wc.setAttribute(IDebugUIConstants.ATTR_TARGET_DEBUG_PERSPECTIVE, IDebugUIConstants.PERSPECTIVE_DEFAULT);
-			wc.setAttribute(IDebugUIConstants.ATTR_TARGET_RUN_PERSPECTIVE, IDebugUIConstants.PERSPECTIVE_DEFAULT);
-			wc.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, JavaUISourceLocator.ID_PROMPTING_JAVA_SOURCE_LOCATOR);
-			config = wc.doSave();		
-		} catch (CoreException ce) {
-			JDIDebugUIPlugin.log(ce);			
-		}
-		return config;
-	}
-	
-	/**
-	 * Returns the local java launch config type
-	 */
-	protected ILaunchConfigurationType getJavaLaunchConfigType() {
-		return getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);		
-	}
-	
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Convenience method to get the window that owns this action's Shell.
-	 */
-	protected Shell getShell() {
-		return JDIDebugUIPlugin.getActiveWorkbenchShell();
-	}
-	
-	/**
-	 * @see ILaunchShortcut#launch(IEditorPart, String)
-	 */
-	public void launch(IEditorPart editor, String mode) {
-		IEditorInput input = editor.getEditorInput();
-		IJavaElement je = (IJavaElement) input.getAdapter(IJavaElement.class);
-		if (je != null) {
-			searchAndLaunch(new Object[] {je}, mode);
-		} else {
-			// error
-		}
-		
-	}
-
-	/**
-	 * @see ILaunchShortcut#launch(ISelection, String)
-	 */
-	public void launch(ISelection selection, String mode) {
-		if (selection instanceof IStructuredSelection) {
-			searchAndLaunch(((IStructuredSelection)selection).toArray(), mode);
-		} else {
-			// error
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaLaunchConfigurationTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaLaunchConfigurationTab.java
deleted file mode 100644
index 16333ee..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaLaunchConfigurationTab.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * Common function for Java launch configuration tabs.
- */
-public abstract class JavaLaunchConfigurationTab extends AbstractLaunchConfigurationTab implements IEntriesChangedListener {
-		
-	/**
-	 * Returns the current Java element context from which to initialize
-	 * default settings, or <code>null</code> if none.
-	 * 
-	 * @return Java element context.
-	 */
-	protected IJavaElement getContext() {
-		IWorkbenchPage page = JDIDebugUIPlugin.getActivePage();
-		if (page != null) {
-			ISelection selection = page.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ss = (IStructuredSelection)selection;
-				if (!ss.isEmpty()) {
-					Object obj = ss.getFirstElement();
-					if (obj instanceof IJavaElement) {
-						return (IJavaElement)obj;
-					}
-					if (obj instanceof IResource) {
-						IJavaElement je = JavaCore.create((IResource)obj);
-						if (je == null) {
-							IProject pro = ((IResource)obj).getProject();
-							je = JavaCore.create(pro);
-						}
-						if (je != null) {
-							return je;
-						}
-					}
-				}
-			}
-			IEditorPart part = page.getActiveEditor();
-			if (part != null) {
-				IEditorInput input = part.getEditorInput();
-				return (IJavaElement) input.getAdapter(IJavaElement.class);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Set the java project attribute based on the IJavaElement.
-	 */
-	protected void initializeJavaProject(IJavaElement javaElement, ILaunchConfigurationWorkingCopy config) {
-		IJavaProject javaProject = javaElement.getJavaProject();
-		String name = null;
-		if (javaProject != null && javaProject.exists()) {
-			name = javaProject.getElementName();
-		}
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, name);
-	}	
-	
-	/**
-	 * @see IEntriesChangedListener#entriesChanged(RuntimeClasspathViewer)
-	 */
-	public void entriesChanged(RuntimeClasspathViewer viewer) {
-		updateLaunchConfigurationDialog();
-	}
-
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaProjectPropertyPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaProjectPropertyPage.java
deleted file mode 100644
index eb38bf7..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/JavaProjectPropertyPage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.ui.dialogs.PropertyPage;

-

-

-/*

- * The page for setting java runtime

- */

-public abstract class JavaProjectPropertyPage extends PropertyPage {

-	

-	private boolean fHasJavaContents;

-	

-	public final Control createContents(Composite parent) {

-		IJavaProject jproject= getJavaProject();

-		if (jproject != null && jproject.getProject().isOpen()) {

-			fHasJavaContents= true;

-			return createJavaContents(parent);

-		} else {

-			return createClosedContents(parent);

-		}

-	}

-	

-	protected abstract boolean performJavaOk();

-	protected abstract Control createJavaContents(Composite parent);

-		

-	protected Control createClosedContents(Composite parent) {

-		Label label= new Label(parent, SWT.LEFT);

-		label.setText(LauncherMessages.getString("javaProjectPropertyPage.closed")); //$NON-NLS-1$

-		return label;

-	}

-		

-	final public boolean performOk() {

-		if (fHasJavaContents) {

-			return performJavaOk();

-		}

-		return true;

-	}

-		

-	protected IJavaProject getJavaProject() {

-		Object obj= getElement();

-		if (obj instanceof IProject) {

-			IProject p= (IProject)obj;

-			try {

-				if (p.hasNature(JavaCore.NATURE_ID)) {

-					return JavaCore.create(p);

-				}

-			} catch (CoreException e) {

-				JDIDebugUIPlugin.log(e);

-			}

-		} else if (obj instanceof IJavaProject) {

-			return (IJavaProject)obj;

-		}

-		return null;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java
deleted file mode 100644
index b9c863f..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-public class LauncherMessages {

-

-	private static final String RESOURCE_BUNDLE= LauncherMessages.class.getName();

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-	private LauncherMessages() {

-	}

-

-	public static String getString(String key) {

-		try {

-			return fgResourceBundle.getString(key);

-		} catch (MissingResourceException e) {

-			return '!' + key + '!';

-		}

-	}

-	

-	/**

-	 * Gets a string from the resource bundle and formats it with the argument

-	 * 

-	 * @param key	the string used to get the bundle value, must not be null

-	 */

-	public static String getFormattedString(String key, Object arg) {

-		return MessageFormat.format(getString(key), new Object[] { arg });

-	}

-

-

-	/**

-	 * Gets a string from the resource bundle and formats it with arguments

-	 */	

-	public static String getFormattedString(String key, Object[] args) {

-		return MessageFormat.format(getString(key), args);

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
deleted file mode 100644
index eb21e1a..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LauncherMessages.properties
+++ /dev/null
@@ -1,184 +0,0 @@
-######################################################################

-#Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.

-#This file is made available under the terms of the Common Public License v1.0

-#which accompanies this distribution, and is available at

-#http://www.eclipse.org/legal/cpl-v10.html

-######################################################################

-

-addVMDialog.browse1=&Browse...

-addVMDialog.duplicateName=The name is already used.

-addVMDialog.enterLocation=Enter the location of the JRE.

-addVMDialog.enterName=Enter a name for the JRE.

-addVMDialog.jreHome=&JRE home directory:

-addVMDialog.jreName=JRE &name:

-addVMDialog.jreType=JRE &type:

-addVMDialog.locationNotExists=The location does not exist.

-addVMDialog.pickJRERootDialog.message=&Select the root directory of the JRE installation:

-AddVMDialog.JRE_system_libraries__1=JRE s&ystem libraries:

-AddVMDialog.Java&doc_URL__1=Ja&vadoc URL:

-AddVMDialog.Bro&wse..._2=Bro&wse...

-AddVMDialog.Select_Javadoc_location__3=Select Javadoc location:

-

-JavaArgumentsTab.&Arguments_16=Arguments

-JavaArgumentsTab.&Browse_3=&Browse...

-JavaArgumentsTab.&Program_arguments__5=Program &arguments:

-JavaArgumentsTab.Exception_occurred_reading_configuration___15=Exception occurred reading configuration: 

-JavaArgumentsTab.Select_a_&working_directory_for_the_launch_configuration__7=Select a &working directory for the launch configuration:

-JavaArgumentsTab.Use_de&fault_working_directory_4=Use &default working directory

-JavaArgumentsTab.VM_ar&guments__6=VM ar&guments:

-JavaArgumentsTab.Wor&king_directory__2=Working directory:

-JavaArgumentsTab.Working_directory_does_not_exist_10=Working directory does not exist

-JavaArgumentsTab.Working_directory_is_not_a_directory_11=Working directory is not a directory

-

-JavaConnectTab.&Allow_termination_of_remote_VM_6=&Allow termination of remote VM

-JavaConnectTab.&Browse_3=&Browse...

-

-JavaConnectTab.&Project__2=&Project:

-JavaConnectTab.Choose_a_project_to_constrain_the_search_for_main_types_11=Choose a &project to constrain the search for main types:

-JavaConnectTab.Conn&ect_20=Connect

-JavaConnectTab.Connect&ion_Type__7=Connect&ion Type:

-

-JavaConnectTab.Project_does_not_exist_14=Project does not exist

-JavaConnectTab.Project_selection_10=Project selection

-JavaConnectTab.Connection_Properties_1=Connection Properties

-JavaConnectTab.Unable_to_display_connection_arguments._2=Unable to display connection arguments.

-JavaConnectTab._is_invalid._5=\ is invalid.

-

-JavaEnvironmentTab.Use_defau&lt_classpath_10=Use default class pat&h

-

-JavaJRETab.JRE_home_directory_does_not_exist_37=JRE home directory does not exist

-JavaJRETab.JRE_home_directory_not_specified_36=JRE home directory not specified

-JavaJRETab.JRE_not_specified_38=JRE not specified

-JavaJRETab.&JRE_1=JRE

-JavaJRETab.Add=&Add...

-JavaJRETab.Run_with_JRE__1=&JRE:

-JavaJRETab.Default_1=Default

-JavaJRETab.Unable_to_initialize_defaults_for_selected_JRE_1=Unable to initialize defaults for selected JRE

-JavaJRETab.Configuration_specifies_undefined_JRE_-_{0}_1=Configuration specifies undefined JRE - {0}

-

-JavaMainTab.&Browse_3=&Browse...

-JavaMainTab.&Main_19=Main

-JavaMainTab.&Project__2=&Project:

-JavaMainTab.Choose_a_&project_to_constrain_the_search_for_main_types__14=Choose a &project to constrain the search for main types:

-JavaMainTab.Choose_a_main_&type_to_launch__12=Choose a main &type to launch:

-JavaMainTab.Choose_Main_Type_11=Choose Main Type

-JavaMainTab.E&xt._jars_6=Include e&xternal jars when searching for a main class

-JavaMainTab.Main_cla&ss__4=&Main class:

-JavaMainTab.Main_type_not_specified_16=Main type not specified

-JavaMainTab.Project_does_not_exist_15=Project does not exist

-JavaMainTab.Project_Selection_13=Project Selection

-JavaMainTab.Searc&h_5=&Search...

-

-javaProjectPropertyPage.closed=Java information is not available for a closed project.

-

-JavaUISourceLocator.askagain.message=Do &not ask again.

-JavaUISourceLocator.selectprojects.message=The source of the type ''{0}'' could not be shown as the type was not found.

-JavaUISourceLocator.selectprojects.title=Debugger Source Lookup

-

-JDKDebugLauncher.Setting_a_working_directory=Eclipse is not able to set the working directory specified by the program being launched as the current runtime does not support working directories.\nContinue launch without setting the working directory?

-

-jdkLauncher.error.timeout=Timeout while waiting for VM to connect. Retry?

-

-MainMethodFinder.description=Searching types with 'main'...

-

-ProcessPropertyPage.cmdLine=Command Line:

-

-SourceLookupBlock.Use_defau&lt_source_lookup_path_1=Use default source loo&kup path

-SourceLookupBlock.Unable_to_save_source_lookup_path_1=Unable to save source lookup path

-

-VMConnectTimeoutStatusHandler.Java_Application_1=Java Application

-

-vmPreferencePage.add=&Add...

-vmPreferencePage.addJRE.title=Add JRE

-VMPreferencePage.Could_not_set_classpath_variables._2=Could not set classpath variables.

-vmPreferencePage.edit=&Edit...

-vmPreferencePage.editJRE.title=Edit JRE

-vmPreferencePage.error.exception=An exception occurred while saving configuration data

-vmPreferencePage.error.title=JRE Configuration

-VMPreferencePage.Installed_JRE_location_no_longer_exists.__JRE_will_be_removed_2=Installed JRE location no longer exists.  JRE will be removed

-VMPreferencePage.Installed_JREs_1=Installed JREs

-VMPreferencePage.JRE_removed_3=JRE removed

-vmPreferencePage.jreLocation=Location

-vmPreferencePage.jreName=Name

-vmPreferencePage.jreType=JRE Type

-vmPreferencePage.message=Create, remove or edit JRE definitions.\nThe &checked JRE will be used by default to build and run Java programs.

-vmPreferencePage.remove=&Remove

-vmPreferencePage.title=Installed Java Runtime Environments

-VMPreferencePage.Build_failed._1=Build failed.

-

-WorkingDirectoryStatusHandler.Java_Application_1=Java Application

-

-JavaClasspathTab.Us&er_classes_1=User c&lasses

-JavaClasspathTab.&Bootstrap_classes_2=&Bootstrap classes

-JavaClasspathTab.Cla&ss_path_3=Classpath

-JavaClasspathTab.Unable_to_save_classpath_1=Unable to save classpath

-

-JavaSourceLookupTab.Source_1=Source

-

-JavaApplicationAction.Launch_failed__no_main_type_found_1=Launch failed: no main type found

-JavaApplicationAction.Type_Selection_4=Type Selection

-JavaApplicationAction.Choose_a_&main_type_to_debug__5=Choose a &main type to debug:

-JavaApplicationAction.Choose_a_&main_type_to_run__6=Choose a &main type to run:

-JavaApplicationAction.Launch_failed_7=Launch failed

-JavaApplicationAction.Launch_Configuration_Selection_1=Launch Configuration Selection

-JavaApplicationAction.Choose_a_launch_configuration_to_debug_2=Choose a launch configuration to deb&ug:

-JavaApplicationAction.Choose_a_launch_configuration_to_run_3=Choose a launch configuration to r&un:

-

-VMLibraryBlock.Use_default_system_libraries_1=&Use default system libraries

-

-WorkingDirectoryBlock.&Local_directory__1=&Local directory:

-WorkingDirectoryBlock.Works&pace__2=Works&pace:

-WorkingDirectoryBlock.B&rowse..._3=B&rowse...

-WorkingDirectoryBlock.Select_a_&workspace_relative_working_directory__4=Select a &workspace relative working directory:

-WorkingDirectoryBlock.Specified_project_or_folder_does_not_exist._5=Specified project or folder does not exist.

-WorkingDirectoryBlock.Working_Directory_8=Working Directory

-

-SourceAttachmentBlock.Ar&chive_variable_path__1=Ar&chive variable path:

-SourceAttachmentBlock.E&xtension..._2=E&xtension...

-SourceAttachmentBlock.&Variable..._3=&Variable...

-SourceAttachmentBlock.Ex&tension..._3=Ex&tension...

-SourceAttachmentBlock.V&ariable..._4=V&ariable...

-SourceAttachmentBlock.R&oot_variable_path__4=R&oot variable path:

-SourceAttachmentBlock.Ar&chive__7=Ar&chive:

-SourceAttachmentBlock.Browse_&File_System..._8=Browse &File System...

-SourceAttachmentBlock.Browse_&Workspace..._9=Browse &Workspace...

-SourceAttachmentBlock.R&oot_Path__10=R&oot Path:

-SourceAttachmentBlock.&Browse..._11=&Browse...

-SourceAttachmentBlock.Select_the_archive_file_(JAR_or_zip)_containing_the_source_for_____{0}______12=Select the archive file (JAR or zip) containing the source for \'\'{0}\'\':

-SourceAttachmentBlock.Source_attachments_for_variable_entries_are_defined_by_variable_paths._The_first_segment_of_such_a_path_describes_a_variable_name,_the_rest_is_an_optional_path_extension._13=Source attachments for variable entries are defined by variable paths. The first segment of such a path describes a variable name, the rest is an optional path extension.

-SourceAttachmentBlock.Define_the_root_of_the_package_structure_in_the_archive._For_example,_when_the_archive_contains_src/java/lang/Object.java,_the_root_path_would_be___src__._14=Define the root of the package structure in the archive. For example, when the archive contains src/java/lang/Object.java, the root path would be \'src\'.

-SourceAttachmentBlock.Root_path_is_not_a_valid_path._15=Root path is not a valid path.

-SourceAttachmentBlock.Root_path_variable_must_not_contain_a_device._17=Root path variable must not contain a device.

-SourceAttachmentBlock.Root_path_must_not_contain_a_device._18=Root path must not contain a device.

-SourceAttachmentBlock.Variable_in_the_archive_path_does_not_exist._22=Variable in the archive path does not exist.

-SourceAttachmentBlock.The_archive_path_____{0}_____does_not_exist._24=The archive path \'\'{0}\'\' does not exist.

-SourceAttachmentBlock.JAR/ZIP_File_Selection_26=JAR/ZIP File Selection

-SourceAttachmentBlock.&Select_JAR/ZIP_file_containing_the_source__28=&Select JAR/ZIP file containing the source:

-SourceAttachmentBlock.Package_Structure_Root_Selection_29=Package Structure Root Selection

-SourceAttachmentBlock.Problem_While_Opening_31=Problem While Opening

-

-JREContainerWizardPage.JRE_System_Library_1=JRE System Library

-JREContainerWizardPage.Unable_to_set_JRE_for_project._2=Unable to set JRE for project.

-JREContainerWizardPage.Select_the_JRE_used_to_build_this_project._4=Select a JRE to add to the classpath.

-JREContainerWizardPage.Unable_to_retrieve_existing_JREs_6=Unable to retrieve existing JREs

-

-UnresolvedJREStatusHandler.Error_1=Error

-UnresolvedJREStatusHandler.Unable_to_resolve_system_library._Select_an_alternate_JRE._2=Unable to resolve system library. Select an alternate JRE.

-

-RuntimeClasspathAdvancedDialog.Advanced_Options_1=Advanced Options

-RuntimeClasspathAdvancedDialog.Add_&Container__1=Add &Container:

-RuntimeClasspathAdvancedDialog.Select_Container_2=Select Container

-RuntimeClasspathAdvancedDialog.Unable_to_create_new_entry._3=Unable to create new entry.

-RuntimeClasspathAdvancedDialog.Select_an_advanced_option__1=Select an advanced option:

-

-SourceLookupBlock.Source_1=Source

-SourceLookupBlock.&Source_Lookup_Path__1=S&ource Lookup Path:

-

-AbstractJavaCommandTab.Name_of_Java_e&xecutable__1=Name of Java e&xecutable:

-AbstractJavaCommandTab.Use_de&fault_Java_executable_2=U&se default Java executable

-AbstractJavaCommandTab.Standard_VM_Java_Command_3=Standard VM Java Command

-AbstractJavaCommandTab._4=

-AbstractJavaCommandTab.Java_executable_must_be_specified_5=Java executable must be specified

-

-VMLibraryBlock.Libraries_cannot_be_empty._1=Libraries cannot be empty.

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ListContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ListContentProvider.java
deleted file mode 100644
index 39b8e5b..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ListContentProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.util.List;

-

-import org.eclipse.jdt.launching.IVMInstall;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.Viewer;

-

-/** 

- * A specialized content provider to show a list of vm installs

- */ 

-public class ListContentProvider implements IStructuredContentProvider {

-	StructuredViewer fViewer;

-	List fInput;	

-

-	public ListContentProvider(StructuredViewer viewer, List input) {

-		fViewer= viewer;

-		fInput= input;

-	}

-	

-	public Object[] getElements(Object input) {

-		IVMInstall[] installs= new IVMInstall[fInput.size()];

-		return fInput.toArray(installs);

-	}

-

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		fInput= (List)newInput;

-	}

-

-	public void dispose() {

-		fViewer= null;

-		fInput= null;

-	}

-	

-	public boolean isDeleted(Object o) {

-		return fInput.contains(o);

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java
deleted file mode 100644
index a17d2a1..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/LocalJavaApplicationTabGroup.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.*;
-
-public class LocalJavaApplicationTabGroup 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(),
-			new JavaSourceLookupTab(),
-			new CommonTab()
-		};
-		setTabs(tabs);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodFinder.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodFinder.java
deleted file mode 100644
index 9e35d58..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/MainMethodFinder.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.lang.reflect.InvocationTargetException;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.SubProgressMonitor;

-import org.eclipse.debug.core.model.IDebugTarget;

-import org.eclipse.debug.core.model.IProcess;

-import org.eclipse.jdt.core.IClassFile;

-import org.eclipse.jdt.core.ICompilationUnit;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IType;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.core.Signature;

-import org.eclipse.jdt.core.search.IJavaSearchScope;

-import org.eclipse.jdt.core.search.SearchEngine;

-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.ui.util.MainMethodSearchEngine;

-import org.eclipse.jdt.ui.IJavaElementSearchConstants;

-import org.eclipse.jface.operation.IRunnableContext;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-

-public class MainMethodFinder {

-	

-	private MainMethodFinder() {

-	}

-

-	public static IType[] findTargets(IRunnableContext context, final Object[] elements) throws InvocationTargetException, InterruptedException{

-		final Set result= new HashSet();

-	

-		if (elements.length > 0) {

-			IRunnableWithProgress runnable= new IRunnableWithProgress() {

-				public void run(IProgressMonitor pm) throws InterruptedException {

-					int nElements= elements.length;

-					pm.beginTask(LauncherMessages.getString("MainMethodFinder.description"), nElements); //$NON-NLS-1$

-					try {

-						for (int i= 0; i < nElements; i++) {

-							try {

-								collectTypes(elements[i], new SubProgressMonitor(pm, 1), result);

-							} catch (JavaModelException e) {

-								JDIDebugUIPlugin.log(e);

-							}

-							if (pm.isCanceled()) {

-								throw new InterruptedException();

-							}

-						}

-					} finally {

-						pm.done();

-					}

-				}

-			};

-			context.run(true, true, runnable);			

-		}

-		return (IType[]) result.toArray(new IType[result.size()]) ;

-	}

-			

-	private static void collectTypes(Object element, IProgressMonitor monitor, Set result) throws JavaModelException {

-		if (element instanceof IProcess) {

-			element= ((IProcess)element).getLaunch();

-		} else if (element instanceof IDebugTarget) {

-			element= ((IDebugTarget)element).getLaunch();

-		}

-		

-		if (element instanceof IAdaptable) {

-			IJavaElement jelem= (IJavaElement) ((IAdaptable) element).getAdapter(IJavaElement.class);

-			if (jelem != null) {

-				IType parentType= (IType)jelem.getAncestor(IJavaElement.TYPE);

-				if (parentType != null && JavaModelUtil.hasMainMethod((IType) parentType)) {

-					result.add(parentType);

-					monitor.done();

-					return;

-				}

-				IJavaElement openable= (IJavaElement) jelem.getOpenable();

-				if (openable != null) {

-					if (openable.getElementType() == IJavaElement.COMPILATION_UNIT) {

-						ICompilationUnit cu= (ICompilationUnit) openable;

-						IType mainType= cu.getType(Signature.getQualifier(cu.getElementName()));

-						if (mainType.exists() && JavaModelUtil.hasMainMethod(mainType)) {

-							result.add(mainType);

-						}

-						monitor.done();

-						return;

-					} else if (openable.getElementType() == IJavaElement.CLASS_FILE) {

-						IType mainType= ((IClassFile)openable).getType();

-						if (JavaModelUtil.hasMainMethod(mainType)) {

-							result.add(mainType);

-						}

-						monitor.done();

-						return;	

-					}

-				}

-				IType[] types= searchMainMethods(jelem, monitor);

-				for (int i= 0; i < types.length; i++) {

-					result.add(types[i]);

-				}				

-			}

-		}

-	}

-	

-	private static IType[] searchMainMethods(IJavaElement elem, IProgressMonitor monitor) throws JavaModelException {

-		IJavaSearchScope scope= SearchEngine.createJavaSearchScope(new IJavaElement[] { elem });

-		MainMethodSearchEngine searchEngine= new MainMethodSearchEngine();

-		return searchEngine.searchMainMethods(monitor, scope, IJavaElementSearchConstants.CONSIDER_BINARIES);

-	}

-}

-	
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java
deleted file mode 100644
index 5c7883d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/NameValuePairDialog.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jface.dialogs.Dialog;

-import org.eclipse.jface.dialogs.IDialogConstants;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Text;

-

-public class NameValuePairDialog extends Dialog {

-

-	private String fName;

-	private String fValue;

-

-	private String fTitle;

-	private String[] fFieldLabels;

-	private String[] fInitialValues;

-	

-	private Label fNameLabel;

-	private Text fNameText;

-	private Label fValueLabel;

-	private Text fValueText;

-

-	public NameValuePairDialog(Shell shell, String title, String[] fieldLabels, String[] initialValues) {

-		super(shell);

-		fTitle = title;

-		fFieldLabels = fieldLabels;

-		fInitialValues = initialValues;

-	}

-

-	/**

-	 * @see Dialog#createDialogArea(Composite)

-	 */

-	protected Control createDialogArea(Composite parent) {

-		Composite comp = new Composite(parent, SWT.NULL);

-		GridLayout topLayout = new GridLayout();

-		topLayout.numColumns = 2;

-		comp.setLayout(topLayout);

-		GridData gd;

-		

-		fNameLabel = new Label(comp, SWT.NONE);

-		fNameLabel.setText(fFieldLabels[0]);

-		

-		fNameText = new Text(comp, SWT.BORDER | SWT.SINGLE);

-		fNameText.setText(fInitialValues[0]);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.widthHint = 300;

-		fNameText.setLayoutData(gd);

-		fNameText.addModifyListener(new ModifyListener() {

-			public void modifyText(ModifyEvent e) {

-				updateButtons();

-			}

-		});

-		

-		fValueLabel = new Label(comp, SWT.NONE);

-		fValueLabel.setText(fFieldLabels[1]);

-		

-		fValueText = new Text(comp, SWT.BORDER | SWT.SINGLE);

-		fValueText.setText(fInitialValues[1]);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.widthHint = 300;

-		fValueText.setLayoutData(gd);

-		fValueText.addModifyListener(new ModifyListener() {

-			public void modifyText(ModifyEvent e) {

-				updateButtons();

-			}

-		});		

-		

-		return comp;

-	}

-	

-	/**

-	 * Return the name/value pair entered in this dialog.  If the cancel button was hit,

-	 * both will be <code>null</code>.

-	 */

-	public String[] getNameValuePair() {

-		return new String[] {fName, fValue};

-	}

-	

-	/**

-	 * @see Dialog#buttonPressed(int)

-	 */

-	protected void buttonPressed(int buttonId) {

-		if (buttonId == IDialogConstants.OK_ID) {

-			fName= fNameText.getText();

-			fValue = fValueText.getText();

-		} else {

-			fName = null;

-			fValue = null;

-		}

-		super.buttonPressed(buttonId);

-	}

-	

-	/**

-	 * @see Window#configureShell(Shell)

-	 */

-	protected void configureShell(Shell shell) {

-		super.configureShell(shell);

-		if (fTitle != null) {

-			shell.setText(fTitle);

-		}

-	}

-	

-	/**

-	 * Enable the OK button if valid input

-	 */

-	protected void updateButtons() {

-		String name = fNameText.getText().trim();

-		String value = fValueText.getText().trim();

-		getButton(IDialogConstants.OK_ID).setEnabled((name.length() > 0) &&(value.length() > 0));

-	}

-	

-	/**

-	 * Enable the buttons on creation.

-	 */

-	public void create() {

-		super.create();

-		updateButtons();

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProcessPropertyPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProcessPropertyPage.java
deleted file mode 100644
index e5aca41..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ProcessPropertyPage.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java
deleted file mode 100644
index d97f87f..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RemoteJavaApplicationTabGroup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.*;
-
-public class RemoteJavaApplicationTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/**
-	 * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-			new JavaConnectTab(),
-			new JavaSourceLookupTab(),
-			new CommonTab(),
-		};
-		setTabs(tabs);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java
deleted file mode 100644
index c2483b5..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathAdvancedDialog.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.PixelConverter;
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ClasspathContainerDescriptor;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ClasspathContainerWizard;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Dialog of radio buttons/actions for advanced classpath options.
- */
-public class RuntimeClasspathAdvancedDialog extends Dialog {
-	
-	private IAction[] fActions;
-	private Button[] fButtons;	
-	
-	private Button fAddContainerButton;
-	private Combo fContainerCombo;
-	private ClasspathContainerDescriptor[] fDescriptors;
-	private RuntimeClasspathViewer fViewer;
-
-	/**
-	 * Constructs a new dialog on the given shell, with the specified
-	 * set of actions.
-	 * 
-	 * @param parentShell
-	 * @param actions advanced actions
-	 */
-	public RuntimeClasspathAdvancedDialog(Shell parentShell, IAction[] actions, RuntimeClasspathViewer viewer) {
-		super(parentShell);
-		fActions = actions;
-		fViewer = viewer;
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		initializeDialogUnits(parent);
-		
-		Composite composite= (Composite) super.createDialogArea(parent);
-		Composite inner= new Composite(composite, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.makeColumnsEqualWidth = false;
-		layout.numColumns = 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		inner.setLayout(layout);
-		
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		inner.setLayoutData(gd);
-		
-		Label l = new Label(inner, SWT.NONE);
-		l.setText(LauncherMessages.getString("RuntimeClasspathAdvancedDialog.Select_an_advanced_option__1")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		l.setLayoutData(gd);
-		
-		fButtons = new Button[fActions.length];
-		for (int i = 0; i < fActions.length; i++) {
-			IAction action= fActions[i];
-			fButtons[i] = new Button(inner, SWT.RADIO);
-			fButtons[i].setText(action.getText());
-			fButtons[i].setData(action);
-			fButtons[i].setEnabled(action.isEnabled());
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			fButtons[i].setLayoutData(gd);
-		}
-		
-		fAddContainerButton = new Button(inner, SWT.RADIO);
-		fAddContainerButton.setText(LauncherMessages.getString("RuntimeClasspathAdvancedDialog.Add_&Container__1")); //$NON-NLS-1$
-		fContainerCombo = new Combo(inner, SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		fContainerCombo.setLayoutData(gd);
-		fDescriptors= ClasspathContainerDescriptor.getDescriptors();
-		String[] names= new String[fDescriptors.length];
-		for (int i = 0; i < names.length; i++) {
-			names[i]= fDescriptors[i].getName();
-		}	
-		fContainerCombo.setItems(names);
-		fContainerCombo.select(0);
-		
-		new Label(inner, SWT.NONE);
-		
-		getShell().setText(LauncherMessages.getString("RuntimeClasspathAdvancedDialog.Advanced_Options_1")); //$NON-NLS-1$
-		return composite;
-
-	}
-
-	/**
-	 * @see Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		if (fAddContainerButton.getSelection()) {
-			int index = fContainerCombo.getSelectionIndex();
-			IRuntimeClasspathEntry entry = chooseContainerEntry(fDescriptors[index]);
-			if (entry != null) {
-				// check if duplicate
-				int pos = fViewer.indexOf(entry);
-				if (pos == -1) {
-					fViewer.addEntries(new IRuntimeClasspathEntry[]{entry});
-				}
-			}
-		} else {
-			for (int i = 0; i < fButtons.length; i++) {
-				if (fButtons[i].getSelection()) {
-					IAction action = (IAction)fButtons[i].getData();
-					if (action instanceof RuntimeClasspathAction) {
-						((RuntimeClasspathAction)action).setShell(getShell());
-					}
-					action.run();
-					break;
-				}
-			}
-		}
-		super.okPressed();
-	}
-	
-	private IRuntimeClasspathEntry chooseContainerEntry(ClasspathContainerDescriptor desc) {
-		ClasspathContainerWizard wizard= new ClasspathContainerWizard(desc);
-		
-		WizardDialog dialog= new WizardDialog(getShell(), wizard);
-		PixelConverter converter= new PixelConverter(getShell());
-		
-		dialog.setMinimumPageSize(converter.convertWidthInCharsToPixels(40), converter.convertHeightInCharsToPixels(20));
-		dialog.create();
-		dialog.getShell().setText(LauncherMessages.getString("RuntimeClasspathAdvancedDialog.Select_Container_2")); //$NON-NLS-1$
-		if (dialog.open() == dialog.OK) {
-			IClasspathEntry created= wizard.getNewEntry();
-			if (created != null) {
-				// XXX: kind needs to be resolved
-				try {
-					return JavaRuntime.newRuntimeContainerClasspathEntry(created.getPath(), IRuntimeClasspathEntry.STANDARD_CLASSES);
-				} catch (CoreException e) {
-					JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("RuntimeClasspathAdvancedDialog.Unable_to_create_new_entry._3"), e); //$NON-NLS-1$
-				}
-			}
-		}			
-		return null;
-	}	
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java
deleted file mode 100644
index 64cc2bf..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathEntryLabelProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-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.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Label provider for runtime classpath entries.
- */
-public class RuntimeClasspathEntryLabelProvider extends LabelProvider {
-		
-		private WorkbenchLabelProvider lp = new WorkbenchLabelProvider();
-		
-		/**
-		 * Context in which to render containers, or <code>null</code>
-		 */
-		private ILaunchConfiguration fLaunchConfuration;
-		
-		/**
-		 * @see ILabelProvider#getImage(Object)
-		 */
-		public Image getImage(Object element) {
-			IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry)element;
-			switch (entry.getType()) {
-				case IRuntimeClasspathEntry.PROJECT:
-					// XXX: what if project not loaded?
-					IResource res = entry.getResource();
-					IJavaElement proj = JavaCore.create(res);
-					return lp.getImage(proj);
-				case IRuntimeClasspathEntry.ARCHIVE:
-					// XXX: illegal access to images
-					res = entry.getResource();
-					if (res instanceof IContainer) {
-						return lp.getImage(res);
-					}
-					boolean external = res == null;
-					boolean source = (entry.getSourceAttachmentPath() != null && !Path.EMPTY.equals(entry.getSourceAttachmentPath()));
-					String key = null;
-					if (external) {
-						if (source) {
-							key = JavaPluginImages.IMG_OBJS_EXTJAR_WSRC;
-						} else {
-							key = JavaPluginImages.IMG_OBJS_EXTJAR;
-						}	
-					} else {
-						if (source) {
-							key = JavaPluginImages.IMG_OBJS_JAR_WSRC;
-						} else {
-							key = JavaPluginImages.IMG_OBJS_JAR;
-						}
-					}
-					return JavaPluginImages.get(key);
-				case IRuntimeClasspathEntry.VARIABLE:
-					// XXX: illegal internal access
-					return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_ENV_VAR);				
-				case IRuntimeClasspathEntry.CONTAINER:
-					// XXX: illegal internal access
-					return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_LIBRARY);
-			}	
-			return null;
-		}
-
-		/**
-		 * @see ILabelProvider#getText(Object)
-		 */
-		public String getText(Object element) {
-			IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry)element;
-			switch (entry.getType()) {
-				case IRuntimeClasspathEntry.PROJECT:
-					IResource res = entry.getResource();
-					IJavaElement proj = JavaCore.create(res);
-					return lp.getText(proj);
-				case IRuntimeClasspathEntry.ARCHIVE:
-					res = entry.getResource();
-					if (res == null) {
-						return entry.getPath().toString();
-					} else {
-						return lp.getText(res);				
-					}
-				case IRuntimeClasspathEntry.VARIABLE:
-					IPath path = entry.getPath();
-					IPath srcPath = entry.getSourceAttachmentPath();
-					StringBuffer buf = new StringBuffer(path.toString());
-					if (srcPath != null) {
-						buf.append(" ["); //$NON-NLS-1$
-						buf.append(srcPath.toString());
-						IPath rootPath = entry.getSourceAttachmentRootPath();
-						if (rootPath != null) {
-							buf.append(IPath.SEPARATOR);
-							buf.append(rootPath.toString());
-						}
-						buf.append(']'); //$NON-NLS-1$
-					}
-					return buf.toString();
-				case IRuntimeClasspathEntry.CONTAINER:
-					if (fLaunchConfuration != null) {
-						try {
-							IJavaProject project = JavaRuntime.getJavaProject(fLaunchConfuration);
-							if (project != null) {
-								IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-								return container.getDescription();
-							}
-						} catch (CoreException e) {
-							JDIDebugUIPlugin.log(e);
-						}
-					}
-					return entry.getPath().toString();
-			}	
-			return ""; //$NON-NLS-1$
-		}
-		
-		/**
-		 * @see IBaseLabelProvider#dispose()
-		 */
-		public void dispose() {
-			super.dispose();
-			lp.dispose();
-		}
-		
-		/**
-		 * Sets the launch configuration context for this label provider
-		 */
-		public void setLaunchConfiguration(ILaunchConfiguration configuration) {
-			fLaunchConfuration = configuration;
-		}
-
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java
deleted file mode 100644
index 13e0c21..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/RuntimeClasspathViewer.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jface.util.ListenerList;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A viewer that displays and manipulates runtime classpath entries.
- */
-public class RuntimeClasspathViewer extends TableViewer {
-	
-	/**
-	 * Whether enabled/editable.
-	 */
-	private boolean fEnabled = true;
-	
-	/**
-	 * Entry changed listeners
-	 */
-	private ListenerList fListeners = new ListenerList(3);
-	
-	/**
-	 * The launch configuration context for this viewer, or <code>null</code>
-	 */
-	private ILaunchConfiguration fLaunchConfiguration;
-	
-	/**
-	 * The runtime classpath entries displayed in this viewer
-	 */
-	protected List fEntries = new ArrayList();
-	
-	class ContentProvider implements IStructuredContentProvider {
-			
-		/**
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return getEntries();
-		}
-
-		/**
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/**
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-		
-	}
-		
-	/**
-	 * Creates a runtime classpath viewer with the given parent.
-	 *
-	 * @param parent the parent control
-	 */
-	public RuntimeClasspathViewer(Composite parent) {
-		super(parent);
-		setContentProvider(new ContentProvider());
-		RuntimeClasspathEntryLabelProvider lp = new RuntimeClasspathEntryLabelProvider();
-		lp.setLaunchConfiguration(fLaunchConfiguration);
-		setLabelProvider(lp);
-		setInput(fEntries);
-	}	
-
-	/**
-	 * Sets the entries in this viewer to the given runtime classpath
-	 * entries
-	 * 
-	 * @param entries runtime classpath entries
-	 */
-	public void setEntries(IRuntimeClasspathEntry[] entries) {
-		fEntries.clear();
-		for (int i = 0; i < entries.length; i++) {
-			fEntries.add(entries[i]);
-		}
-		setInput(fEntries);
-		notifyChanged();
-	}
-	
-	/**
-	 * Returns the entries in this viewer
-	 * 
-	 * @return the entries in this viewer
-	 */
-	public IRuntimeClasspathEntry[] getEntries() {
-		return (IRuntimeClasspathEntry[])fEntries.toArray(new IRuntimeClasspathEntry[fEntries.size()]);
-	}
-	
-	/**
-	 * Adds the given entries to the list. If there is no selection
-	 * in the list, the entries are added at the end of the list, 
-	 * otherwise the new entries are added before the (first) selected
-	 * entry. The new entries are selected.
-	 * 
-	 * @param entries additions
-	 */
-	public void addEntries(IRuntimeClasspathEntry[] entries) {
-		IStructuredSelection sel = (IStructuredSelection)getSelection();
-		if (sel.isEmpty()) {
-			for (int i = 0; i < entries.length; i++) {
-				fEntries.add(entries[i]);
-			}
-		} else {
-			int index = fEntries.indexOf(sel.getFirstElement());
-			for (int i = 0; i < entries.length; i++) {
-				fEntries.add(index, entries[i]);
-				index++;
-			}
-		}
-		setSelection(new StructuredSelection(entries));
-		refresh();
-		notifyChanged();
-	}	
-	
-	/**
-	 * Enables/disables this viewer. Note the control is not disabled, since
-	 * we still want the user to be able to scroll if required to see the
-	 * existing entries. Just actions should be disabled.
-	 */
-	public void setEnabled(boolean enabled) {
-		fEnabled = enabled;
-		// fire selection change to upate actions
-		setSelection(getSelection());
-	}
-	
-	/**
-	 * Returns whether this viewer is enabled
-	 */
-	public boolean isEnabled() {
-		return fEnabled;
-	}
-	
-	/**
-	 * Sets the launch configuration context for this viewer, if any
-	 */
-	public void setLaunchConfiguration(ILaunchConfiguration configuration) {
-		fLaunchConfiguration = configuration;
-		if (getLabelProvider() != null) {
-			((RuntimeClasspathEntryLabelProvider)getLabelProvider()).setLaunchConfiguration(configuration);
-		}
-	}
-	
-	public void addEntriesChangedListener(IEntriesChangedListener listener) {
-		fListeners.add(listener);
-	}
-	
-	public void removeEntriesChangedListener(IEntriesChangedListener listener) {
-		fListeners.remove(listener);
-	}
-	
-	protected void notifyChanged() {
-		Object[] listeners = fListeners.getListeners();
-		for (int i = 0; i < listeners.length; i++) {
-			((IEntriesChangedListener)listeners[i]).entriesChanged(this);
-		}
-	}
-	
-	/**
-	 * Returns the index of an equivalent entry, or -1 if none.
-	 * 
-	 * @return the index of an equivalent entry, or -1 if none
-	 */
-	public int indexOf(IRuntimeClasspathEntry entry) {
-		return fEntries.indexOf(entry);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceAttachmentBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceAttachmentBlock.java
deleted file mode 100644
index 2ec0579..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceAttachmentBlock.java
+++ /dev/null
@@ -1,624 +0,0 @@
- package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-
-import java.io.File;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.PixelConverter;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
-import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
-import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.VariablePathDialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * UI to set the source attachment archive and root.
- * Same implementation for both setting attachments for libraries from
- * variable entries and for normal (internal or external) jar.
- */
-public class SourceAttachmentBlock {
-	
-	private IStatusChangeListener fContext;
-	
-	private StringButtonDialogField fFileNameField;
-	private SelectionButtonDialogField fInternalButtonField;
-	
-	private StringButtonDialogField fPrefixField;
-	
-	private boolean fIsVariableEntry;
-	
-	private IStatus fNameStatus;
-	private IStatus fPrefixStatus;
-		
-	private IPath fJARPath;
-	
-	/**
-	 * The file to which the archive path points to.
-	 * Only set when the file exists.
-	 */
-	private File fResolvedFile; 
-
-	/**
-	 * The path to which the archive variable points.
-	 * Null if invalid path or not resolvable. Must not exist.
-	 */	
-	private IPath fFileVariablePath;
-		
-	private IWorkspaceRoot fRoot;
-	
-	private Control fSWTWidget;
-	private CLabel fFullPathResolvedLabel;
-	private CLabel fPrefixResolvedLabel;
-	
-	private IRuntimeClasspathEntry fOldEntry;
-	
-	public SourceAttachmentBlock(IWorkspaceRoot root, IStatusChangeListener context, IRuntimeClasspathEntry oldEntry) {
-		fContext= context;
-				
-		fRoot= root;
-		fOldEntry= oldEntry;
-		
-		// fIsVariableEntry specifies if the UI is for a variable entry
-		fIsVariableEntry= (oldEntry.getType() == IRuntimeClasspathEntry.VARIABLE);
-		
-		fNameStatus= new StatusInfo();
-		fPrefixStatus= new StatusInfo();
-		
-		fJARPath= (oldEntry != null) ? oldEntry.getPath() : Path.EMPTY;
-		
-		SourceAttachmentAdapter adapter= new SourceAttachmentAdapter();
-		
-		// create the dialog fields (no widgets yet)
-		if (fIsVariableEntry) {
-			fFileNameField= new VariablePathDialogField(adapter);
-			fFileNameField.setDialogFieldListener(adapter);
-			fFileNameField.setLabelText(LauncherMessages.getString("SourceAttachmentBlock.Ar&chive_variable_path__1")); //$NON-NLS-1$
-			fFileNameField.setButtonLabel(LauncherMessages.getString("SourceAttachmentBlock.E&xtension..._2")); //$NON-NLS-1$
-			((VariablePathDialogField)fFileNameField).setVariableButtonLabel(LauncherMessages.getString("SourceAttachmentBlock.&Variable..._3")); //$NON-NLS-1$
-		
-			fPrefixField= new VariablePathDialogField(adapter);
-			fPrefixField.setDialogFieldListener(adapter);
-			fPrefixField.setLabelText(LauncherMessages.getString("SourceAttachmentBlock.R&oot_variable_path__4")); //$NON-NLS-1$
-			fPrefixField.setButtonLabel(LauncherMessages.getString("SourceAttachmentBlock.Ex&tension..._3")); //$NON-NLS-1$
-			((VariablePathDialogField)fPrefixField).setVariableButtonLabel(LauncherMessages.getString("SourceAttachmentBlock.V&ariable..._4")); //$NON-NLS-1$
-			
-		} else {
-			fFileNameField= new StringButtonDialogField(adapter);
-			fFileNameField.setDialogFieldListener(adapter);
-			fFileNameField.setLabelText(LauncherMessages.getString("SourceAttachmentBlock.Ar&chive__7")); //$NON-NLS-1$
-			fFileNameField.setButtonLabel(LauncherMessages.getString("SourceAttachmentBlock.Browse_&File_System..._8")); //$NON-NLS-1$
-		
-			fInternalButtonField= new SelectionButtonDialogField(SWT.PUSH);
-			fInternalButtonField.setDialogFieldListener(adapter);
-			fInternalButtonField.setLabelText(LauncherMessages.getString("SourceAttachmentBlock.Browse_&Workspace..._9")); //$NON-NLS-1$
-			
-			fPrefixField= new StringButtonDialogField(adapter);
-			fPrefixField.setDialogFieldListener(adapter);
-			fPrefixField.setLabelText(LauncherMessages.getString("SourceAttachmentBlock.R&oot_Path__10")); //$NON-NLS-1$
-			fPrefixField.setButtonLabel(LauncherMessages.getString("SourceAttachmentBlock.&Browse..._11")); //$NON-NLS-1$
-
-		}	
-	
-		// set the old settings
-		setDefaults();
-
-	}
-	
-	public void setDefaults() {
-		if (fOldEntry != null && fOldEntry.getSourceAttachmentPath() != null) {
-			fFileNameField.setText(fOldEntry.getSourceAttachmentPath().toString());
-		} else {
-			fFileNameField.setText(""); //$NON-NLS-1$
-		}	
-				
-		if (fOldEntry != null && fOldEntry.getSourceAttachmentRootPath() != null) {
-			fPrefixField.setText(fOldEntry.getSourceAttachmentRootPath().toString());
-		} else {
-			fPrefixField.setText(""); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Gets the source attachment path chosen by the user
-	 */
-	public IPath getSourceAttachmentPath() {
-		if (fFileNameField.getText().length() == 0) {
-			return null;
-		}
-		return new Path(fFileNameField.getText());
-	}
-
-	/**
-	 * Gets the source attachment root chosen by the user
-	 */
-	public IPath getSourceAttachmentRootPath() {
-		if (getSourceAttachmentPath() == null) {
-			return null;
-		} else {
-			return new Path(fPrefixField.getText());
-		}
-	}
-	
-		
-	/**
-	 * Creates the control
-	 */
-	public Control createControl(Composite parent) {
-		PixelConverter converter= new PixelConverter(parent);
-		
-		fSWTWidget= parent;
-		
-		Composite composite= new Composite(parent, SWT.NONE);	
-		
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= 4;		
-		composite.setLayout(layout);
-		
-		int widthHint= converter.convertWidthInCharsToPixels(fIsVariableEntry ? 50 : 60);
-		
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 4;
-		
-		Label message= new Label(composite, SWT.LEFT);
-		message.setLayoutData(gd);
-		message.setText(MessageFormat.format(LauncherMessages.getString("SourceAttachmentBlock.Select_the_archive_file_(JAR_or_zip)_containing_the_source_for_____{0}______12"), new String[] {fJARPath.lastSegment()})); //$NON-NLS-1$
-				
-		if (fIsVariableEntry) {
-			DialogField.createEmptySpace(composite, 1);
-			gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			gd.widthHint= widthHint;
-			gd.horizontalSpan= 2;
-			Label desc= new Label(composite, SWT.LEFT + SWT.WRAP);
-			desc.setText(LauncherMessages.getString("SourceAttachmentBlock.Source_attachments_for_variable_entries_are_defined_by_variable_paths._The_first_segment_of_such_a_path_describes_a_variable_name,_the_rest_is_an_optional_path_extension._13")); //$NON-NLS-1$
-			desc.setLayoutData(gd);
-			DialogField.createEmptySpace(composite, 1);
-		}
-		// archive name field
-		fFileNameField.doFillIntoGrid(composite, 4);
-		setWidthHint(fFileNameField.getTextControl(null), widthHint);
-		Object ld= fFileNameField.getTextControl(null).getLayoutData();
-		if (ld instanceof GridData) {
-			((GridData)ld).grabExcessHorizontalSpace= true;
-		}
-		
-		if (!fIsVariableEntry) {
-			// aditional 'browse workspace' button for normal jars
-			DialogField.createEmptySpace(composite, 3);	
-			fInternalButtonField.doFillIntoGrid(composite, 1);
-		} else {
-			// label that shows the resolved path for variable jars
-			DialogField.createEmptySpace(composite, 1);	
-			fFullPathResolvedLabel= new CLabel(composite, SWT.LEFT);
-			fFullPathResolvedLabel.setText(getResolvedLabelString(fFileNameField.getText(), true));
-			fFullPathResolvedLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-			DialogField.createEmptySpace(composite, 2);			
-		}
-		
-		// prefix description
-		DialogField.createEmptySpace(composite, 1);
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.widthHint= widthHint;
-		gd.horizontalSpan= 2;
-		Label desc= new Label(composite, SWT.LEFT + SWT.WRAP);
-		desc.setText(LauncherMessages.getString("SourceAttachmentBlock.Define_the_root_of_the_package_structure_in_the_archive._For_example,_when_the_archive_contains_src/java/lang/Object.java,_the_root_path_would_be___src__._14")); //$NON-NLS-1$
-		desc.setLayoutData(gd);
-		DialogField.createEmptySpace(composite, 1);		
-		
-		// root path field	
-		fPrefixField.doFillIntoGrid(composite, 4);
-		setWidthHint(fPrefixField.getTextControl(null), widthHint);
-		
-		if (fIsVariableEntry) {
-			// label that shows the resolved path for variable jars
-			DialogField.createEmptySpace(composite, 1);	
-			fPrefixResolvedLabel= new CLabel(composite, SWT.LEFT);
-			fPrefixResolvedLabel.setText(getResolvedLabelString(fPrefixField.getText(), false));
-			fPrefixResolvedLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-			DialogField.createEmptySpace(composite, 2);
-		}
-		
-		fFileNameField.postSetFocusOnDialogField(parent.getDisplay());
-				
-		WorkbenchHelp.setHelp(composite, IJavaDebugHelpContextIds.SOURCE_ATTACHMENT_BLOCK);
-		return composite;
-	}
-	
-	protected void setWidthHint(Control control, int widthHint) {
-		Object ld= control.getLayoutData();
-		if (ld instanceof GridData) {
-			((GridData)ld).widthHint= widthHint;
-		}
-	}
-		
-	private class SourceAttachmentAdapter implements IStringButtonAdapter, IDialogFieldListener {
-		
-		// -------- IStringButtonAdapter --------
-		public void changeControlPressed(DialogField field) {
-			attachmentChangeControlPressed(field);			
-		}
-		
-		// ---------- IDialogFieldListener --------
-		public void dialogFieldChanged(DialogField field) {
-			attachmentDialogFieldChanged(field);
-		}
-	}
-	
-	private void attachmentChangeControlPressed(DialogField field) {
-		if (field == fFileNameField) {
-			IPath jarFilePath= chooseExtJarFile();
-			if (jarFilePath != null) {
-				fFileNameField.setText(jarFilePath.toString());
-			}
-		} else if (field == fPrefixField) {
-			IPath prefixPath= choosePrefix();
-			if (prefixPath != null) {
-				fPrefixField.setText(prefixPath.toString());
-			}
-		}		
-	}
-	
-	// ---------- IDialogFieldListener --------
-
-	private void attachmentDialogFieldChanged(DialogField field) {
-		if (field == fFileNameField) {
-			fNameStatus= updateFileNameStatus();
-		} else if (field == fInternalButtonField) {
-			IPath jarFilePath= chooseInternalJarFile(fFileNameField.getText());
-			if (jarFilePath != null) {
-				fFileNameField.setText(jarFilePath.toString());
-			}
-			return;
-		} else if (field == fPrefixField) {
-			fPrefixStatus= updatePrefixStatus();
-		} 
-		doStatusLineUpdate();
-	}	
-		
-	private void doStatusLineUpdate() {
-		fPrefixField.enableButton(canBrowsePrefix());
-		fFileNameField.enableButton(canBrowseFileName());
-		
-		// set the resolved path for variable jars
-		if (fFullPathResolvedLabel != null) {
-			fFullPathResolvedLabel.setText(getResolvedLabelString(fFileNameField.getText(), true));
-		}
-		if (fPrefixResolvedLabel != null) {
-			fPrefixResolvedLabel.setText(getResolvedLabelString(fPrefixField.getText(), false));
-		}
-		
-		IStatus status= StatusUtil.getMostSevere(new IStatus[] { fNameStatus, fPrefixStatus });
-		fContext.statusChanged(status);
-	}
-	
-	private boolean canBrowseFileName() {
-		if (!fIsVariableEntry) {
-			return true;
-		}
-		// to browse with a variable JAR, the variable name must point to a directory
-		if (fFileVariablePath != null) {
-			return fFileVariablePath.toFile().isDirectory();
-		}
-		return false;
-	}
-	
-	private boolean canBrowsePrefix() {
-		// can browse when the archive name is poiting to a existing file
-		// and (if variable) the prefix variable name is existing
-		if (fResolvedFile != null) {
-			if (fIsVariableEntry) {
-				// prefix has valid format, is resolvable and not empty
-				return fPrefixStatus.isOK() && fPrefixField.getText().length() > 0;
-			}
-			return true;
-		}
-		return false;
-	}	
-	
-	private String getResolvedLabelString(String path, boolean osPath) {
-		IPath resolvedPath= getResolvedPath(new Path(path));
-		if (resolvedPath != null) {
-			if (osPath) {
-				return resolvedPath.toOSString();
-			} else {
-				return resolvedPath.toString();
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}	
-	
-	private IPath getResolvedPath(IPath path) {
-		if (path != null) {
-			String varName= path.segment(0);
-			if (varName != null) {
-				IPath varPath= JavaCore.getClasspathVariable(varName);
-				if (varPath != null) {
-					return varPath.append(path.removeFirstSegments(1));
-				}
-			}
-		}
-		return null;
-	}	
-	
-		
-	private IStatus updatePrefixStatus() {
-		StatusInfo status= new StatusInfo();
-		
-		String prefix= fPrefixField.getText();
-		if (prefix.length() == 0) {
-			// no source attachment path
-			return status;
-		} else {
-			if (!Path.EMPTY.isValidPath(prefix)) {
-				status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_is_not_a_valid_path._15")); //$NON-NLS-1$
-				return status;
-			}
-			IPath path= new Path(prefix);
-			if (fIsVariableEntry) {
-				IPath resolvedPath= getResolvedPath(path);
-				if (resolvedPath == null) {
-					status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_is_not_a_valid_path._15")); //$NON-NLS-1$
-					return status;
-				}
-				if (resolvedPath.getDevice() != null) {
-					status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_variable_must_not_contain_a_device._17")); //$NON-NLS-1$
-					return status;
-				}
-			} else {
-				if (path.getDevice() != null) {
-					status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_must_not_contain_a_device._18")); //$NON-NLS-1$
-					return status;
-				}
-			}				
-		}
-		return status;
-	}
-	
-	private IStatus updateFileNameStatus() {
-		StatusInfo status= new StatusInfo();
-		fResolvedFile= null;
-		fFileVariablePath= null;
-		
-		String fileName= fFileNameField.getText();
-		if (fileName.length() == 0) {
-			// no source attachment
-			return status;
-		} else {
-			if (!Path.EMPTY.isValidPath(fileName)) {
-				status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_is_not_a_valid_path._15")); //$NON-NLS-1$
-				return status;
-			}
-			IPath filePath= new Path(fileName);
-			IPath resolvedPath;
-			if (fIsVariableEntry) {
-				if (filePath.getDevice() != null) {
-					status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_is_not_a_valid_path._15")); //$NON-NLS-1$
-					return status;
-				}
-				String varName= filePath.segment(0);
-				if (varName == null) {
-					status.setError(LauncherMessages.getString("SourceAttachmentBlock.Root_path_is_not_a_valid_path._15")); //$NON-NLS-1$
-					return status;
-				}
-				fFileVariablePath= JavaCore.getClasspathVariable(varName);
-				if (fFileVariablePath == null) {
-					status.setError(LauncherMessages.getString("SourceAttachmentBlock.Variable_in_the_archive_path_does_not_exist._22")); //$NON-NLS-1$
-					return status;
-				}
-				resolvedPath= fFileVariablePath.append(filePath.removeFirstSegments(1));
-				
-				if (resolvedPath.isEmpty()) {
-					status.setWarning(LauncherMessages.getString("SourceAttachmentBlock.Variable_in_the_archive_path_does_not_exist._22")); //$NON-NLS-1$
-					return status;
-				}
-				File file= resolvedPath.toFile();
-				if (!file.isFile()) {				
-					String message= MessageFormat.format(LauncherMessages.getString("SourceAttachmentBlock.The_archive_path_____{0}_____does_not_exist._24"), new String[] {resolvedPath.toOSString()}); //$NON-NLS-1$
-					status.setWarning(message);
-					return status;
-				}						
-				fResolvedFile= file;
-				
-			} else {
-				File file= filePath.toFile();
-				IResource res= fRoot.findMember(filePath);
-				if (res != null) {
-					file= res.getLocation().toFile();
-				}
-				if (!file.isFile()) {
-					String message=  MessageFormat.format(LauncherMessages.getString("SourceAttachmentBlock.The_archive_path_____{0}_____does_not_exist._24"), new String[] {filePath.toString()}); //$NON-NLS-1$
-					status.setError(message);
-					return status;
-				}
-				fResolvedFile= file;
-			}
-			
-		}
-		return status;
-	}
-	
-	/*
-	 * Opens a dialog to choose a jar from the file system.
-	 */
-	private IPath chooseExtJarFile() {
-		IPath currPath= new Path(fFileNameField.getText());
-		
-		if (currPath.isEmpty()) {
-			currPath= fJARPath;
-		}
-		IPath resolvedPath= currPath;
-		if (fIsVariableEntry) {
-			resolvedPath= getResolvedPath(currPath);
-			if (resolvedPath == null) {
-				resolvedPath= Path.EMPTY;
-			}
-		}
-		if (ArchiveFileFilter.isArchivePath(resolvedPath)) {
-			resolvedPath= resolvedPath.removeLastSegments(1);
-		}
-	
-		FileDialog dialog= new FileDialog(getShell());
-		dialog.setText(LauncherMessages.getString("SourceAttachmentBlock.JAR/ZIP_File_Selection_26")); //$NON-NLS-1$
-		dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$
-		dialog.setFilterPath(resolvedPath.toOSString());
-		String res= dialog.open();
-		if (res != null) {
-			IPath returnPath= new Path(res).makeAbsolute();
-			if (fIsVariableEntry) {
-				returnPath= modifyPath(returnPath, currPath.segment(0));
-			}
-			return returnPath;
-		}
-		return null;
-	}
-
-	/*
-	 * Opens a dialog to choose an internal jar.
-	 */	
-	private IPath chooseInternalJarFile(String initSelection) {
-		Class[] acceptedClasses= new Class[] { IFile.class };
-		TypedElementSelectionValidator validator= new TypedElementSelectionValidator(acceptedClasses, false);
-	
-		ViewerFilter filter= new ArchiveFileFilter(null);
-
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		IResource initSel= fRoot.findMember(new Path(initSelection));
-		if (initSel == null) {
-			initSel= fRoot.findMember(fJARPath);
-		}
-
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), lp, cp);
-		dialog.setAllowMultiple(false);
-		dialog.setValidator(validator);
-		dialog.addFilter(filter);
-		dialog.setTitle(LauncherMessages.getString("SourceAttachmentBlock.JAR/ZIP_File_Selection_26")); //$NON-NLS-1$
-		dialog.setMessage(LauncherMessages.getString("SourceAttachmentBlock.&Select_JAR/ZIP_file_containing_the_source__28")); //$NON-NLS-1$
-		dialog.setInput(fRoot);
-		dialog.setInitialSelection(initSel);
-		if (dialog.open() == dialog.OK) {
-			IFile file= (IFile) dialog.getFirstResult();
-			return file.getFullPath();
-		}
-		return null;
-	}
-	
-	/*
-	 * Opens a dialog to choose path in a zip file.
-	 */		
-	private IPath choosePrefix() {
-		if (fResolvedFile != null) {
-			IPath currPath= new Path(fPrefixField.getText());
-			String initSelection= null;
-			if (fIsVariableEntry) {
-				IPath resolvedPath= getResolvedPath(currPath);
-				if (resolvedPath != null) {
-					initSelection= resolvedPath.toString();
-				}
-			} else {
-				initSelection= currPath.toString();
-			}
-			try {
-				ZipFile zipFile= new ZipFile(fResolvedFile);			
-				ZipContentProvider contentProvider= new ZipContentProvider();
-				contentProvider.setInitialInput(zipFile);
-				ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), new ZipLabelProvider(), contentProvider); 
-				dialog.setAllowMultiple(false);
-				dialog.setTitle(LauncherMessages.getString("SourceAttachmentBlock.Package_Structure_Root_Selection_29")); //$NON-NLS-1$
-				dialog.setMessage(LauncherMessages.getString("SourceAttachmentBlock.Package_Structure_Root_Selection_29")); //$NON-NLS-1$
-				dialog.setInput(zipFile);
-				dialog.setInitialSelection(contentProvider.getSelectedNode(initSelection));
-				if (dialog.open() == dialog.OK) {
-					Object obj= dialog.getFirstResult();
-					IPath path= new Path(obj.toString());
-					if (fIsVariableEntry) {
-						path= modifyPath(path, currPath.segment(0));
-					}
-					return path;
-				}
-			} catch (IOException e) {
-				String title= LauncherMessages.getString("SourceAttachmentBlock.Problem_While_Opening_31"); //$NON-NLS-1$
-				String message= MessageFormat.format(LauncherMessages.getString("SourceAttachmentBlock.Problem_While_Opening_31"), new String[] {fResolvedFile.getPath()}); //$NON-NLS-1$
-				MessageDialog.openError(getShell(), title, message);
-				JDIDebugUIPlugin.log(e);
-			}				
-		
-		}
-		return null;
-	}
-	
-		
-	private Shell getShell() {
-		if (fSWTWidget != null) {
-			return fSWTWidget.getShell();
-		}
-		return JDIDebugUIPlugin.getActiveWorkbenchShell();			
-	}
-	
-	/**
-	 * Takes a path and replaces the beginning with a variable name
-	 * (if the beginning matches with the variables value)
-	 */
-	private IPath modifyPath(IPath path, String varName) {
-		if (varName == null || path == null) {
-			return null;
-		}
-		if (path.isEmpty()) {
-			return new Path(varName);
-		}
-		
-		IPath varPath= JavaCore.getClasspathVariable(varName);
-		if (varPath != null) {
-			if (varPath.isPrefixOf(path)) {
-				path= path.removeFirstSegments(varPath.segmentCount());
-			} else {
-				path= new Path(path.lastSegment());
-			}
-		} else {
-			path= new Path(path.lastSegment());
-		}
-		return new Path(varName).append(path);
-	}
-	
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java
deleted file mode 100644
index 9ddee55..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/SourceLookupBlock.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.SWTUtil;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddAdvancedAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddExternalFolderAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddExternalJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddFolderAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddProjectAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AddVariableAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AttachSourceAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveDownAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveUpAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RemoveAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
- 
-/**
- * Control used to edit the source lookup path for a Java launch configuration.
- */
-public class SourceLookupBlock extends JavaLaunchConfigurationTab implements ILaunchConfigurationTab {
-	
-	protected IJavaProject fProject;
-	protected ILaunchConfiguration fConfig;
-	
-	protected RuntimeClasspathViewer fPathViewer;
-	protected Button fDefaultButton;
-	protected List fActions = new ArrayList(10);
-	
-	/**
-	 * Creates and returns the source lookup control.
-	 * 
-	 * @param parent the parent widget of this control
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		comp.setLayoutData(gd);
-		
-		Label viewerLabel= new Label(comp, SWT.LEFT);
-		viewerLabel.setText(LauncherMessages.getString("SourceLookupBlock.&Source_Lookup_Path__1")); //$NON-NLS-1$
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		viewerLabel.setLayoutData(gd);
-		
-		fPathViewer = new RuntimeClasspathViewer(comp);
-		fPathViewer.addEntriesChangedListener(this);
-		gd = new GridData(GridData.FILL_BOTH);
-		fPathViewer.getControl().setLayoutData(gd);
-
-		Composite pathButtonComp = new Composite(comp, SWT.NONE);
-		GridLayout pathButtonLayout = new GridLayout();
-		pathButtonLayout.marginHeight = 0;
-		pathButtonLayout.marginWidth = 0;
-		pathButtonComp.setLayout(pathButtonLayout);
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		pathButtonComp.setLayoutData(gd);
-
-		createVerticalSpacer(comp, 2);
-						
-		fDefaultButton = new Button(comp, SWT.CHECK);
-		fDefaultButton.setText(LauncherMessages.getString("SourceLookupBlock.Use_defau&lt_source_lookup_path_1")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fDefaultButton.setLayoutData(gd);
-		fDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleDefaultButtonSelected();
-			}
-		});
-		
-		List advancedActions = new ArrayList(5);
-		
-		RuntimeClasspathAction action = new MoveUpAction(null);								
-		Button button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);
-		
-		action = new MoveDownAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new RemoveAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-		
-		action = new AddProjectAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new AddJarAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new AddExternalJarAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new AddFolderAction(null);								
-		advancedActions.add(action);
-
-		action = new AddExternalFolderAction(null);								
-		advancedActions.add(action);		
-
-		action = new AddVariableAction(null);								
-		advancedActions.add(action);		
-		
-		action = new AttachSourceAction(null);								
-		advancedActions.add(action);				
-									
-		IAction[] adv = (IAction[])advancedActions.toArray(new IAction[advancedActions.size()]);
-		action = new AddAdvancedAction(null, adv);
-		button = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);
-																
-		retargetActions(fPathViewer);
-				
-		setControl(comp);
-	}
-
-	/**
-	 * The "default" button has been toggled
-	 */
-	protected void handleDefaultButtonSelected() {
-		boolean def = fDefaultButton.getSelection();
-		if (def) {
-			try {
-				ILaunchConfiguration config = getLaunchConfiguration();
-				ILaunchConfigurationWorkingCopy wc = null;
-				if (config.isWorkingCopy()) {
-					wc= (ILaunchConfigurationWorkingCopy)config;
-				} else {
-					wc = config.getWorkingCopy();
-				}
-				performApply(wc);
-				IRuntimeClasspathEntry[] defs = JavaRuntime.computeUnresolvedSourceLookupPath(wc);
-				fPathViewer.setEntries(defs);
-			} catch (CoreException e) {
-				JDIDebugUIPlugin.log(e);
-			}
-		}
-		fPathViewer.setEnabled(!def);
-		updateLaunchConfigurationDialog();
-	}
-
-	/**
-	 * Creates and returns a button 
-	 * 
-	 * @param parent parent widget
-	 * @param label label
-	 * @param image image
-	 * @return Button
-	 */
-	protected Button createPushButton(
-		Composite parent,
-		String label,
-		Image image) {
-		return SWTUtil.createPushButton(parent, label, image);
-	}
-	
-	/**
-	 * Create some empty space 
-	 */
-	protected void createVerticalSpacer(Composite comp, int colSpan) {
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		label.setLayoutData(gd);
-	}	
-
-	/**
-	 * Adds the given action to the action collection in this tab
-	 */
-	protected void addAction(RuntimeClasspathAction action) {
-		fActions.add(action);
-	}
-	
-	/**
-	 * Re-targets actions to the given viewer
-	 */
-	protected void retargetActions(RuntimeClasspathViewer viewer) {
-		Iterator actions = fActions.iterator();
-		while (actions.hasNext()) {
-			RuntimeClasspathAction action = (RuntimeClasspathAction)actions.next();
-			action.setViewer(viewer);
-		}
-	}
-	
-	/**
-	 * Initializes this control based on the settings in the given
-	 * launch configuration.
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		try {
-			setLaunchConfiguration(config);
-			IJavaProject project = JavaRuntime.getJavaProject(config);
-			setProject(project);
-			boolean useDefault = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, true);
-			fDefaultButton.setSelection(useDefault);
-			IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(config);
-			fPathViewer.setEntries(entries);
-			fPathViewer.setEnabled(!useDefault);
-			fPathViewer.setLaunchConfiguration(config);
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-	}
-	
-	/**
-	 * Saves settings in the given working copy
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		boolean def = fDefaultButton.getSelection();		
-		if (def) {
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH, (List)null);
-		} else {
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, def);
-			try {
-				IRuntimeClasspathEntry[] entries = fPathViewer.getEntries();
-				List mementos = new ArrayList(entries.length);
-				for (int i = 0; i < entries.length; i++) {
-					mementos.add(entries[i].getMemento());
-				}
-				configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH, mementos);
-			} catch (CoreException e) {
-				JDIDebugUIPlugin.errorDialog(LauncherMessages.getString("SourceLookupBlock.Unable_to_save_source_lookup_path_1"), e); //$NON-NLS-1$
-			}	
-		}		
-	}	
-	
-	/**
-	 * Returns the entries visible in the viewer
-	 */
-	public IRuntimeClasspathEntry[] getEntries() {
-		return fPathViewer.getEntries();
-	}	
-	/**
-	 * Returns the Java project associated with the launch configuration
-	 * or <code>null</code> if none.
-	 * 
-	 * @return Java project or <code>null</code>
-	 */
-	protected IJavaProject getProject() {
-		return fProject;
-	}
-
-	/**
-	 * Sets the Java project associated with the launch configuration
-	 * or <code>null</code> if none.
-	 * 
-	 * @param project Java project or <code>null</code>
-	 */
-	private void setProject(IJavaProject project) {
-		fProject = project;
-	}
-	
-	/**
-	 * Sets the configuration associated with this source lookup
-	 * block.
-	 * 
-	 * @param configuration launch configuration
-	 */
-	private void setLaunchConfiguration(ILaunchConfiguration configuration) {
-		fConfig = configuration;
-	}
-	
-	/**
-	 * Sets the configuration associated with this source lookup
-	 * block.
-	 * 
-	 * @param configuration launch configuration
-	 */
-	protected ILaunchConfiguration getLaunchConfiguration() {
-		return fConfig;
-	}	
-
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("SourceLookupBlock.Source_1"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH, (String)null);
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH, (List)null);
-	}
-
-	/**
-	 * @see AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
-	 */
-	protected void updateLaunchConfigurationDialog() {
-		if (getLaunchConfigurationDialog() != null) {
-			super.updateLaunchConfigurationDialog();
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		fPathViewer.removeEntriesChangedListener(this);
-		super.dispose();
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/StandardVMCommandTab.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/StandardVMCommandTab.java
deleted file mode 100644
index 4f2c998..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/StandardVMCommandTab.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v0.5
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v05.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-**********************************************************************/
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-public class StandardVMCommandTab extends AbstractJavaCommandTab {
-
-	/**
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		Map attributeMap = new HashMap(1);
-		attributeMap.put(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, getCommand());
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, attributeMap);
-	}
-	
-	protected String getCommand() {
-		return "javaw";  //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/UnresolvedJREStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/UnresolvedJREStatusHandler.java
deleted file mode 100644
index 77a0231..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/UnresolvedJREStatusHandler.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-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.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * When a project's JRE cannot be resolved for building, this status handler
- * is called.
- */
-public class UnresolvedJREStatusHandler implements IStatusHandler {
-
-	protected ILaunchConfigurationWorkingCopy fConfig;
-	
-	class JREDialog extends ErrorDialog {
-		
-		private JavaJRETab fJRETab;
-			
-		public JREDialog(IStatus status) {
-			super(JDIDebugUIPlugin.getActiveWorkbenchShell(), LauncherMessages.getString("UnresolvedJREStatusHandler.Error_1"), LauncherMessages.getString("UnresolvedJREStatusHandler.Unable_to_resolve_system_library._Select_an_alternate_JRE._2"), status, IStatus.ERROR); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		/**
-		 * @see Dialog#createDialogArea(Composite)
-		 */
-		protected Control createDialogArea(Composite parent) {
-			Composite comp = (Composite)super.createDialogArea(parent);
-			
-			fJRETab = new JavaJRETab();
-			fJRETab.setVMSpecificArgumentsVisible(false);
-			fJRETab.createControl(comp);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			fJRETab.getControl().setLayoutData(gd);
-			fJRETab.setDefaults(fConfig);
-			fJRETab.initializeFrom(fConfig);
-			
-			return comp;
-		}
-
-		/**
-		 * @see Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			fJRETab.performApply(fConfig);
-			super.okPressed();
-		}
-	}
-	
-	/**
-	 * @param source source is an instance of <code>IJavaProject</code>
-	 * @return an instance of <code>IVMInstall</code> or <code>null</code>
-	 * 
-	 * @see IStatusHandler#handleStatus(IStatus, Object)
-	 */
-	public Object handleStatus(final IStatus status, Object source) throws CoreException {
-		ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		fConfig = type.newInstance(null, "TEMP_CONFIG"); //$NON-NLS-1$
-
-		Runnable r = new Runnable() {
-			public void run() {
-				JREDialog dialog = new JREDialog(status);
-				dialog.open();				
-			}
-		};
-		JDIDebugUIPlugin.getStandardDisplay().syncExec(r);
-		
-		IVMInstall vm = null;
-		String typeId = fConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-		String name = fConfig.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME, (String)null);
-		if (typeId == null) {
-			vm = JavaRuntime.getDefaultVMInstall();
-		} else {
-			IVMInstallType vmType = JavaRuntime.getVMInstallType(typeId);
-			if (vmType != null) {
-				vm = vmType.findVMInstallByName(name);
-			}
-		}
-		return vm;
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java
deleted file mode 100644
index 075cef3..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMConnectTimeoutStatusHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Prompts the user to continue waiting for a connection
- * from a debuggable VM.
- */
-public class VMConnectTimeoutStatusHandler implements IStatusHandler {
-
-	/**
-	 * @see IStatusHandler#handleStatus(IStatus, Object)
-	 */
-	public Object handleStatus(IStatus status, Object source) throws CoreException {
-		final boolean[] result = new boolean[1];
-		JDIDebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
-			public void run() {
-				String title= LauncherMessages.getString("VMConnectTimeoutStatusHandler.Java_Application_1"); //$NON-NLS-1$
-				String message= LauncherMessages.getString("jdkLauncher.error.timeout"); //$NON-NLS-1$
-				result[0]= (MessageDialog.openQuestion(JDIDebugUIPlugin.getActiveWorkbenchShell(), title, message));
-			}
-		});
-		return new Boolean(result[0]);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMContentProvider.java
deleted file mode 100644
index 009a91e..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMContentProvider.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLabelProvider.java
deleted file mode 100644
index 2ed9d5c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLabelProvider.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLibraryBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLibraryBlock.java
deleted file mode 100644
index d8d08df..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMLibraryBlock.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-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.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.SWTUtil;
-import org.eclipse.jdt.internal.debug.ui.actions.AddExternalJarAction;
-import org.eclipse.jdt.internal.debug.ui.actions.AttachSourceAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveDownAction;
-import org.eclipse.jdt.internal.debug.ui.actions.MoveUpAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RemoveAction;
-import org.eclipse.jdt.internal.debug.ui.actions.RuntimeClasspathAction;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-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.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
- 
-/**
- * Control used to edit the libraries associated with a VM install
- */
-public class VMLibraryBlock implements IEntriesChangedListener {
-	
-	protected IVMInstall fVmInstall;
-	protected IVMInstallType fVmInstallType;
-	protected File fHome;
-	// used to make buttons all the same width
-	protected Button fAddJarButton;
-	
-	protected RuntimeClasspathViewer fPathViewer;
-	protected Button fDefaultButton;
-	protected List fActions = new ArrayList(10);
-	
-	protected AddVMDialog fDialog = null;
-	protected boolean fInCallback = false;
-	
-	/**
-	 * Constructor for VMLibraryBlock.
-	 */
-	public VMLibraryBlock(AddVMDialog dialog) {
-		fDialog = dialog;
-	}
-
-	/**
-	 * Creates and returns the source lookup control.
-	 * 
-	 * @param parent the parent widget of this control
-	 */
-	public Control createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		comp.setLayoutData(gd);
-		
-		fPathViewer = new RuntimeClasspathViewer(comp);
-		gd = new GridData(GridData.FILL_BOTH);
-		fPathViewer.getControl().setLayoutData(gd);
-		fPathViewer.addEntriesChangedListener(this);
-
-		Composite pathButtonComp = new Composite(comp, SWT.NONE);
-		GridLayout pathButtonLayout = new GridLayout();
-		pathButtonLayout.marginHeight = 0;
-		pathButtonLayout.marginWidth = 0;
-		pathButtonComp.setLayout(pathButtonLayout);
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		pathButtonComp.setLayoutData(gd);
-
-		createVerticalSpacer(comp, 2);
-						
-		fDefaultButton = new Button(comp, SWT.CHECK);
-		fDefaultButton.setText(LauncherMessages.getString("VMLibraryBlock.Use_default_system_libraries_1")); //$NON-NLS-1$
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		fDefaultButton.setLayoutData(gd);
-		fDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleDefaultButtonSelected();
-			}
-		});
-		
-		RuntimeClasspathAction action = new MoveUpAction(null);								
-		Button button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);
-		
-		action = new MoveDownAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-
-		action = new RemoveAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-		
-		action = new AddExternalJarAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-		fAddJarButton = button;
-		
-		action = new AttachSourceAction(null);								
-		button  = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		addAction(action);		
-		fAddJarButton = button;		
-														
-		retargetActions(fPathViewer);
-				
-		return comp;
-	}
-
-	/**
-	 * The "default" button has been toggled
-	 */
-	protected void handleDefaultButtonSelected() {
-		update();
-	}
-
-	/**
-	 * Creates and returns a button 
-	 * 
-	 * @param parent parent widget
-	 * @param label label
-	 * @param image image
-	 * @return Button
-	 */
-	protected Button createPushButton(
-		Composite parent,
-		String label,
-		Image image) {
-		return SWTUtil.createPushButton(parent, label, image);
-	}
-	
-	/**
-	 * Create some empty space 
-	 */
-	protected void createVerticalSpacer(Composite comp, int colSpan) {
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		label.setLayoutData(gd);
-	}	
-
-	/**
-	 * Adds the given action to the action collection in this tab
-	 */
-	protected void addAction(RuntimeClasspathAction action) {
-		fActions.add(action);
-	}
-	
-	/**
-	 * Re-targets actions to the given viewer
-	 */
-	protected void retargetActions(RuntimeClasspathViewer viewer) {
-		Iterator actions = fActions.iterator();
-		while (actions.hasNext()) {
-			RuntimeClasspathAction action = (RuntimeClasspathAction)actions.next();
-			action.setViewer(viewer);
-		}
-	}
-	
-	/**
-	 * Initializes this control based on the settings in the given
-	 * vm install and type.
-	 * 
-	 * @param vm vm or <code>null</code> if none
-	 * @param type type of vm install
-	 */
-	public void initializeFrom(IVMInstall vm, IVMInstallType type) {
-		setVMInstall(vm);
-		setVMInstallType(type);
-		if (vm != null) {
-			setHomeDirectory(vm.getInstallLocation());	
-		}
-		fDefaultButton.setSelection(vm == null || vm.getLibraryLocations() == null);
-		if (isDefaultSystemLibrary()) {
-			update();
-		} else {
-			LibraryLocation[] libs = vm.getLibraryLocations();
-			IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[libs.length];
-			for (int i = 0; i < libs.length; i++) {
-				entries[i] = JavaRuntime.newArchiveRuntimeClasspathEntry(libs[i].getSystemLibraryPath());
-				entries[i].setSourceAttachmentPath(libs[i].getSystemLibrarySourcePath());
-				entries[i].setSourceAttachmentRootPath(libs[i].getPackageRootPath());
-			}
-			fPathViewer.setEntries(entries);
-			fPathViewer.setEnabled(true);						
-		}
-	}
-	
-	/**
-	 * Sets the home directory of the VM Install the user has chosen
-	 */
-	public void setHomeDirectory(File file) {
-		fHome = file;
-	}
-	
-	/**
-	 * Returns the home directory
-	 */
-	protected File getHomeDirectory() {
-		return fHome;
-	}
-	
-	/**
-	 * Updates libraries based on settings
-	 */
-	public void update() {
-		boolean useDefault = fDefaultButton.getSelection();
-		LibraryLocation[] libs = null;
-		if (useDefault) {
-			if (getHomeDirectory() == null) {
-				libs = new LibraryLocation[0];
-			} else {
-				libs = getVMInstallType().getDefaultLibraryLocations(getHomeDirectory());
-			}
-			IRuntimeClasspathEntry[] entries = new IRuntimeClasspathEntry[libs.length];
-			for (int i = 0; i < libs.length; i++) {
-				entries[i] = JavaRuntime.newArchiveRuntimeClasspathEntry(libs[i].getSystemLibraryPath());
-				entries[i].setSourceAttachmentPath(libs[i].getSystemLibrarySourcePath());
-				entries[i].setSourceAttachmentRootPath(libs[i].getPackageRootPath());
-			}
-			fPathViewer.setEntries(entries);
-		}
-		fPathViewer.setEnabled(!useDefault);		
-		IStatus status = null;
-		if (getEntries().length == 0 && !isDefaultSystemLibrary()) {
-			status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR,
-				LauncherMessages.getString("VMLibraryBlock.Libraries_cannot_be_empty._1"), null); //$NON-NLS-1$
-		} else {
-			status = new StatusInfo();
-		}		
-		fDialog.setSystemLibraryStatus(status);
-		fDialog.updateStatusLine();
-	}
-	
-	/**
-	 * Saves settings in the given working copy
-	 */
-	public void performApply(IVMInstall vm) {
-		boolean def = fDefaultButton.getSelection();		
-		if (def) {
-			vm.setLibraryLocations(null);
-		} else {
-			IRuntimeClasspathEntry[] entries = fPathViewer.getEntries();
-			LibraryLocation[] libs = new LibraryLocation[entries.length];
-			for (int i = 0; i < entries.length; i++) {
-				IPath lib = entries[i].getPath();
-				IPath src = entries[i].getSourceAttachmentPath();
-				if (src == null) {
-					src = Path.EMPTY;
-				}
-				IPath root = entries[i].getSourceAttachmentRootPath();
-				if (root == null) {
-					root = Path.EMPTY;
-				}
-				libs[i] = new LibraryLocation(lib, src, root);
-			}
-			vm.setLibraryLocations(libs);
-		}		
-	}	
-	
-	/**
-	 * Returns the entries visible in the viewer
-	 */
-	public IRuntimeClasspathEntry[] getEntries() {
-		return fPathViewer.getEntries();
-	}	
-
-	/**
-	 * Sets the vm install associated with this library block.
-	 * 
-	 * @param vm vm install
-	 */
-	private void setVMInstall(IVMInstall vm) {
-		fVmInstall = vm;
-	}
-	
-	/**
-	 * Returns the vm install associated with this library block.
-	 * 
-	 * @return vm install
-	 */
-	protected IVMInstall getVMInstall() {
-		return fVmInstall;
-	}	
-	
-	/**
-	 * Returns whether the default system libraries are to be used
-	 */
-	public boolean isDefaultSystemLibrary() {
-		return fDefaultButton.getSelection();
-	}
-
-	/**
-	 * Sets the vm install type associated with this library block.
-	 * 
-	 * @param type vm install type
-	 */
-	private void setVMInstallType(IVMInstallType type) {
-		fVmInstallType = type;
-	}
-	
-	/**
-	 * Returns the vm install type associated with this library block.
-	 * 
-	 * @return vm install
-	 */
-	protected IVMInstallType getVMInstallType() {
-		return fVmInstallType;
-	}	
-	/**
-	 * @see IEntriesChangedListener#entriesChanged(RuntimeClasspathViewer)
-	 */
-	public void entriesChanged(RuntimeClasspathViewer viewer) {
-		if (!fInCallback) {
-			fInCallback = true;
-			update();
-			fInCallback = false;
-		}
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMPreferencePage.java
deleted file mode 100644
index 96f30eb..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMPreferencePage.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMStandin.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMStandin.java
deleted file mode 100644
index bc94ae1..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/VMStandin.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java
deleted file mode 100644
index a5d16a0..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryBlock.java
+++ /dev/null
@@ -1,416 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.io.File;
-
-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.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.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * A control for setting the working directory associated with a launch
- * configuration.
- */
-public class WorkingDirectoryBlock extends JavaLaunchConfigurationTab {
-			
-	// Working directory UI widgets
-	protected Label fWorkingDirLabel;
-	
-	// Local directory
-	protected Button fLocalDirButton;
-	protected Text fWorkingDirText;
-	protected Button fWorkingDirBrowseButton;
-	
-	
-	// Workspace directory
-	protected Button fWorkspaceDirButton;
-	protected Text fWorkspaceDirText;
-	protected Button fWorkspaceDirBrowseButton;
-		
-	// use default button
-	protected Button fUseDefaultWorkingDirButton;
-	
-	/**
-	 * The last launch config this tab was initialized from
-	 */
-	protected ILaunchConfiguration fLaunchConfiguration;
-	
-	/**
-	 * @see ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-						
-		Composite workingDirComp = new Composite(parent, SWT.NONE);
-		WorkbenchHelp.setHelp(workingDirComp, IJavaDebugHelpContextIds.WORKING_DIRECTORY_BLOCK);;		
-		GridLayout workingDirLayout = new GridLayout();
-		workingDirLayout.numColumns = 3;
-		workingDirLayout.marginHeight = 0;
-		workingDirLayout.marginWidth = 0;
-		workingDirComp.setLayout(workingDirLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		workingDirComp.setLayoutData(gd);
-		setControl(workingDirComp);
-		
-		fWorkingDirLabel = new Label(workingDirComp, SWT.NONE);
-		fWorkingDirLabel.setText(LauncherMessages.getString("JavaArgumentsTab.Wor&king_directory__2")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		fWorkingDirLabel.setLayoutData(gd);
-		
-		fLocalDirButton = createRadioButton(workingDirComp, LauncherMessages.getString("WorkingDirectoryBlock.&Local_directory__1")); //$NON-NLS-1$
-		fLocalDirButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleLocationButtonSelected();
-			}
-		});
-		
-		fWorkingDirText = new Text(workingDirComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fWorkingDirText.setLayoutData(gd);
-		fWorkingDirText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fWorkingDirBrowseButton = createPushButton(workingDirComp, LauncherMessages.getString("JavaArgumentsTab.&Browse_3"), null); //$NON-NLS-1$
-		fWorkingDirBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleWorkingDirBrowseButtonSelected();
-			}
-		});
-		
-		fWorkspaceDirButton = createRadioButton(workingDirComp, LauncherMessages.getString("WorkingDirectoryBlock.Works&pace__2")); //$NON-NLS-1$
-		fWorkspaceDirButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleLocationButtonSelected();
-			}
-		});		
-		
-		fWorkspaceDirText = new Text(workingDirComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fWorkspaceDirText.setLayoutData(gd);
-		fWorkspaceDirText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fWorkspaceDirBrowseButton = createPushButton(workingDirComp, LauncherMessages.getString("WorkingDirectoryBlock.B&rowse..._3"), null); //$NON-NLS-1$
-		fWorkspaceDirBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleWorkspaceDirBrowseButtonSelected();
-			}
-		});		
-				
-		fUseDefaultWorkingDirButton = new Button(workingDirComp,SWT.CHECK);
-		fUseDefaultWorkingDirButton.setText(LauncherMessages.getString("JavaArgumentsTab.Use_de&fault_working_directory_4")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		fUseDefaultWorkingDirButton.setLayoutData(gd);
-		fUseDefaultWorkingDirButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleUseDefaultWorkingDirButtonSelected();
-			}
-		});
-				
-	}
-					
-	/**
-	 * @see ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-	}
-		
-	/**
-	 * Show a dialog that lets the user select a working directory
-	 */
-	protected void handleWorkingDirBrowseButtonSelected() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setMessage(LauncherMessages.getString("JavaArgumentsTab.Select_a_&working_directory_for_the_launch_configuration__7")); //$NON-NLS-1$
-		String currentWorkingDir = fWorkingDirText.getText();
-		if (!currentWorkingDir.trim().equals("")) { //$NON-NLS-1$
-			File path = new File(currentWorkingDir);
-			if (path.exists()) {
-				dialog.setFilterPath(currentWorkingDir);
-			}			
-		}
-		
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null) {
-			fWorkingDirText.setText(selectedDirectory);
-		}		
-	}
-
-	/**
-	 * Show a dialog that lets the user select a working directory from 
-	 * the workspace
-	 */
-	protected void handleWorkspaceDirBrowseButtonSelected() {
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(),
-																	   ResourcesPlugin.getWorkspace().getRoot(),
-																	   false,
-																	   LauncherMessages.getString("WorkingDirectoryBlock.Select_a_&workspace_relative_working_directory__4")); //$NON-NLS-1$
-		
-		IContainer currentContainer = getContainer();
-		if (currentContainer != null) {
-			IPath path = currentContainer.getFullPath();
-			dialog.setInitialSelections(new Object[] {path});
-		}
-		
-		dialog.showClosedProjects(false);
-		dialog.open();
-		Object[] results = dialog.getResult();		
-		if ((results != null) && (results.length > 0) && (results[0] instanceof IPath)) {
-			IPath path = (IPath)results[0];
-			String containerName = path.makeRelative().toString();
-			fWorkspaceDirText.setText(containerName);
-		}			
-	}
-	
-	/**
-	 * Returns the selected workspace container,or <code>null</code>
-	 */
-	protected IContainer getContainer() {
-		IResource res = getResource();
-		if (res instanceof IContainer) {
-			return (IContainer)res;
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the selected workspace resource, or <code>null</code>
-	 */
-	protected IResource getResource() {
-		IPath path = new Path(fWorkspaceDirText.getText());
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		return root.findMember(path);
-	}	
-	
-	/**
-	 * The "local directory" or "workspace directory" button has been selected.
-	 */
-	protected void handleLocationButtonSelected() {
-		if (!isDefaultWorkingDirectory()) {
-			boolean local = isLocalWorkingDirectory();
-			fWorkingDirText.setEnabled(local);
-			fWorkingDirBrowseButton.setEnabled(local);
-			fWorkspaceDirText.setEnabled(!local);
-			fWorkspaceDirBrowseButton.setEnabled(!local);
-		}
-		updateLaunchConfigurationDialog();
-	}
-		
-	/**
-	 * The default working dir check box has been toggled.
-	 */
-	protected void handleUseDefaultWorkingDirButtonSelected() {
-		if (isDefaultWorkingDirectory()) {
-			setDefaultWorkingDir();
-			fLocalDirButton.setEnabled(false);
-			fWorkingDirText.setEnabled(false);
-			fWorkingDirBrowseButton.setEnabled(false);
-			fWorkspaceDirButton.setEnabled(false);
-			fWorkspaceDirText.setEnabled(false);
-			fWorkspaceDirBrowseButton.setEnabled(false);
-		} else {
-			fLocalDirButton.setEnabled(true);
-			fWorkspaceDirButton.setEnabled(true);
-			handleLocationButtonSelected();
-		}
-	}
-	
-	/**
-	 * Sets the default working directory
-	 */
-	protected void setDefaultWorkingDir() {
-		try {
-			ILaunchConfiguration config = getLaunchConfiguration();
-			if (config != null) {
-				IJavaProject javaProject = JavaRuntime.getJavaProject(config);
-				if (javaProject != null) {
-					fWorkspaceDirText.setText(javaProject.getPath().makeRelative().toOSString());
-					fLocalDirButton.setSelection(false);
-					fWorkspaceDirButton.setSelection(true);
-					return;
-				}
-			}
-		} catch (CoreException ce) {
-		}
-		
-		fWorkingDirText.setText(System.getProperty("user.dir")); //$NON-NLS-1$
-		fLocalDirButton.setSelection(true);
-		fWorkspaceDirButton.setSelection(false);		
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-		
-		if (isLocalWorkingDirectory()) {
-			String workingDirPath = fWorkingDirText.getText().trim();
-			if (workingDirPath.length() > 0) {
-				File dir = new File(workingDirPath);
-				if (!dir.exists()) {
-					setErrorMessage(LauncherMessages.getString("JavaArgumentsTab.Working_directory_does_not_exist_10")); //$NON-NLS-1$
-					return false;
-				}
-				if (!dir.isDirectory()) {
-					setErrorMessage(LauncherMessages.getString("JavaArgumentsTab.Working_directory_is_not_a_directory_11")); //$NON-NLS-1$
-					return false;
-				}
-			}
-		} else {
-			if (getContainer() == null) {
-				setErrorMessage(LauncherMessages.getString("WorkingDirectoryBlock.Specified_project_or_folder_does_not_exist._5")); //$NON-NLS-1$
-				return false;
-			}
-		}
-		
-		return true;
-	}
-
-	/**
-	 * Defaults are empty.
-	 * 
-	 * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, (String)null);
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null);
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		setLaunchConfiguration(configuration);
-		try {			
-			String wd = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null); //$NON-NLS-1$
-			fWorkspaceDirText.setText(""); //$NON-NLS-1$
-			fWorkingDirText.setText(""); //$NON-NLS-1$
-			if (wd == null) {
-				fUseDefaultWorkingDirButton.setSelection(true);
-			} else {
-				IPath path = new Path(wd);
-				if (path.isAbsolute()) {
-					fWorkingDirText.setText(wd);
-					fLocalDirButton.setSelection(true);
-					fWorkspaceDirButton.setSelection(false);
-				} else {
-					fWorkspaceDirText.setText(wd);
-					fWorkspaceDirButton.setSelection(true);
-					fLocalDirButton.setSelection(false);
-				}
-				fUseDefaultWorkingDirButton.setSelection(false);
-			}
-			handleUseDefaultWorkingDirButtonSelected();
-		} catch (CoreException e) {
-			setErrorMessage(LauncherMessages.getString("JavaArgumentsTab.Exception_occurred_reading_configuration___15") + e.getStatus().getMessage()); //$NON-NLS-1$
-			JDIDebugUIPlugin.log(e);
-		}
-	}
-
-	/**
-	 * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		String wd = null;
-		if (!isDefaultWorkingDirectory()) {
-			if (isLocalWorkingDirectory()) {
-				wd = getAttributeValueFrom(fWorkingDirText);
-			} else {
-				IPath path = new Path(fWorkspaceDirText.getText());
-				path = path.makeRelative();
-				wd = path.toString();
-			}
-		} 
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, wd);
-	}
-
-	/**
-	 * Retuns the string in the text widget, or <code>null</code> if empty.
-	 * 
-	 * @return text or <code>null</code>
-	 */
-	protected String getAttributeValueFrom(Text text) {
-		String content = text.getText().trim();
-		if (content.length() > 0) {
-			return content;
-		}
-		return null;
-	}
-	
-	/**
-	 * @see ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return LauncherMessages.getString("WorkingDirectoryBlock.Working_Directory_8"); //$NON-NLS-1$
-	}	
-	
-	/**
-	 * Returns whether the default working directory is to be used
-	 */
-	protected boolean isDefaultWorkingDirectory() {
-		return fUseDefaultWorkingDirButton.getSelection();
-	}
-	
-	/**
-	 * Returns whether the working directory is local
-	 */
-	protected boolean isLocalWorkingDirectory() {
-		return fLocalDirButton.getSelection();
-	}
-
-	/**
-	 * Sets the java project currently specified by the
-	 * given launch config, if any.
-	 */
-	protected void setLaunchConfiguration(ILaunchConfiguration config) {
-		fLaunchConfiguration = config;
-	}	
-	
-	/**
-	 * Returns the current java project context
-	 */
-	protected ILaunchConfiguration getLaunchConfiguration() {
-		return fLaunchConfiguration;
-	}
-	
-}
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryStatusHandler.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryStatusHandler.java
deleted file mode 100644
index 96f7b13..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/WorkingDirectoryStatusHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Prompts the user to re-launch when a working directory
- * is not supported by the Eclipse runtime.
- */
-public class WorkingDirectoryStatusHandler implements IStatusHandler {
-
-	/**
-	 * @see IStatusHandler#handleStatus(IStatus, Object)
-	 */
-	public Object handleStatus(IStatus status, Object source) throws CoreException {
-		final boolean[] result = new boolean[1];
-		JDIDebugUIPlugin.getStandardDisplay().syncExec(new Runnable() {
-			public void run() {
-				String title= LauncherMessages.getString("WorkingDirectoryStatusHandler.Java_Application_1"); //$NON-NLS-1$
-				String message= LauncherMessages.getString("JDKDebugLauncher.Setting_a_working_directory"); //$NON-NLS-1$
-				result[0]= (MessageDialog.openQuestion(JDIDebugUIPlugin.getActiveWorkbenchShell(), title, message));
-			}
-		});
-		return new Boolean(result[0]);
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipContentProvider.java
deleted file mode 100644
index 81d2fd5..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipContentProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.zip.ZipFile;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * An adapter for presenting a zip file in a tree viewer.
- */
-class ZipContentProvider implements ITreeContentProvider {
-
-	private ZipTreeNode fTree;
-	private ZipFile fZipFile;
-	
-	ZipTreeNode getSelectedNode(String initialSelection) {
-		ZipTreeNode node= null;
-		if (initialSelection != null) {
-			node= fTree.findNode(initialSelection);
-		}
-		if (node == null) {
-			node= fTree.findNode(""); //$NON-NLS-1$
-		}
-		return node;
-	}
-	
-	void setInitialInput(ZipFile file){
-		fTree= createTree(file);
-	}
-	
-	private ZipTreeNode createTree(ZipFile zipFile){
-		if (zipFile.equals(fZipFile))
-			return fTree;
-		fZipFile= zipFile;
-		return ZipTreeNode.newZipTree(zipFile);
-	}
-	
-	/* non java-doc
-	 * @see ITreeContentProvider#inputChanged
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (newInput instanceof ZipFile)
-			fTree= createTree((ZipFile)newInput);
-		else{
-			fTree= null;	
-			fZipFile= null;
-		}	
-	}
-
-	/* non java-doc
-	  * @see ITreeContentProvider#getParent
-	  */
-	public Object getParent(Object element) {
-		return ((ZipTreeNode) element).getParent();
-	}
-
-	/* non java-doc
-	 * @see ITreeContentProvider#hasChildren
-	 */
-	public boolean hasChildren(Object element) {
-		return ((ZipTreeNode) element).hasChildren();
-	}
-
-	/* non java-doc
-	 * @see ITreeContentProvider#getChildren
-	 */
-	public Object[] getChildren(Object element) {
-		return ((ZipTreeNode) element).getChildren();
-	}
-
-	/* non java-doc
-	 * @see ITreeContentProvider#getElements
-	 */
-	public Object[] getElements(Object zipFile) {
-		if (fTree == null && zipFile instanceof ZipFile){
-			fTree= createTree((ZipFile)zipFile);
-		}	
-		return fTree.getChildren();
-	}
-
-	/* non java-doc
-	 * @see IContentProvider#dispose
-	 */	
-	public void dispose() {
-		fTree= null;
-		fZipFile= null;
-	}
-}
-
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipLabelProvider.java
deleted file mode 100644
index 6fafd83..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipLabelProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-class ZipLabelProvider extends LabelProvider {
-	
-	private final Image IMG_JAR= JavaUI.getSharedImages().getImage(org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_JAR);
-	private final Image IMG_FOLDER= PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
-	
-	public Image getImage(Object element) {
-		if (element == null || !(element instanceof ZipTreeNode))
-			return super.getImage(element);
-		if (((ZipTreeNode)element).representsZipFile())
-			return IMG_JAR;
-		else 
-			return IMG_FOLDER;
-	}
-
-	public String getText(Object element) {
-		if (element == null || !(element instanceof ZipTreeNode))
-			return super.getText(element);
-		return ((ZipTreeNode) element).getName();
-	}
-}
-
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipTreeNode.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipTreeNode.java
deleted file mode 100644
index 8148c17..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/ZipTreeNode.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.debug.ui.launcher;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- *  Tree representing the structure of a zip file
- */
-class ZipTreeNode {
-	private ZipTreeNode fParent;
-	private List fChildren;
-	private String fName;
-	private boolean fRepresentsZip= false;
-	private static final String SEGMENT_SEPARATOR= "/"; //$NON-NLS-1$
-
-	private ZipTreeNode(ZipTreeNode parent, String name) {
-		fParent= parent;
-		fChildren= new ArrayList(0);
-		fName= name;
-	}
-
-	String getName() {
-		return fName;
-	}
-
-	boolean representsZipFile(){
-		return fRepresentsZip;
-	}
-
-	boolean hasChildren() {
-		return fChildren != null && !fChildren.isEmpty();
-	}
-
-	Object[] getChildren() {
-		return fChildren.toArray();
-	}
-
-	Object getParent() {
-		return fParent;
-	}
-
-	private static int separatorIndex(String name){
-		return name.indexOf(SEGMENT_SEPARATOR);
-	}
-	
-	private static String getFirstSegment(String name){
-		if (separatorIndex(name) == -1)
-			return name;
-		else 
-			return name.substring(0, separatorIndex(name));
-	}
-	
-	private static String getTail(String name){
-		return name.substring(separatorIndex(name) + 1);
-	}
-	
-	private boolean isRoot(){
-		return fName == null;
-	}
-	
-	/*
-	 * finds the node (in the tree )
-	 * whose name corresponds to the parameter
-	 */
-	ZipTreeNode findNode(String name){
-		if (isRoot())
-			return ((ZipTreeNode)fChildren.get(0)).findNode(name);
-
-		if (representsZipFile() && "".equals(name)) //$NON-NLS-1$
-			return this;
-	
-		if (!representsZipFile() && separatorIndex(name) == -1){
-			if (name.equals(fName))
-				return this;
-			else 
-				return null;	
-		}
-				
-		String firstSegment= getFirstSegment(name);
-		if (!representsZipFile() && !firstSegment.equals(fName))
-			return null;
-		
-		Object[] kids= getChildren();
-		String tail= getTail(name);
-		
-		for (int i=0; i < kids.length; i++) {
-			ZipTreeNode found;
-			if (representsZipFile())
-				found= ((ZipTreeNode)kids[i]).findNode(name);
-			else 
-				found= ((ZipTreeNode)kids[i]).findNode(tail);
-			if (found != null)
-				return found;
-		}
-		
-		return null;
-	}
-	
-	void insert(String name) {
-		if ("".equals(name) || separatorIndex(name) == -1) //$NON-NLS-1$
-			return;
-		String firstSegment= getFirstSegment(name);
-		Object[] kids= getChildren();
-		String tail= getTail(name);
-		for (int i= 0; i < kids.length; i++) {
-			ZipTreeNode each= (ZipTreeNode) kids[i];
-			if (each.getName().equals(firstSegment)) {
-				each.insert(tail);
-				return;
-			}
-		}
-		ZipTreeNode newKid= new ZipTreeNode(this, firstSegment);
-		fChildren.add(newKid);
-		newKid.insert(tail);
-	}
-
-	private StringBuffer toStringBuffer() {
-		if (fName == null || representsZipFile()) //top level
-			return new StringBuffer();
-		else
-			return fParent.toStringBuffer().append(fName).append(SEGMENT_SEPARATOR);
-	}
-
-	/* non java-doc
-	  * debugging only
-	  */
-	public String toString() {
-		//empty package root
-		if (representsZipFile())
-			return ""; //$NON-NLS-1$
-		StringBuffer sb= toStringBuffer();
-		return sb.deleteCharAt(sb.length() - 1).toString();
-	}
-
-	static ZipTreeNode newZipTree(ZipFile file) {
-		//the top level node is the only one with fName == null
-		ZipTreeNode topLevel= new ZipTreeNode(null, null);
-		ZipTreeNode zipNode= new ZipTreeNode(topLevel, file.getName());
-		zipNode.fRepresentsZip= true;
-		Enumeration all= file.entries();
-		while (all.hasMoreElements()) {
-			ZipEntry each= (ZipEntry) all.nextElement();
-			zipNode.insert(each.getName().substring(0, each.getName().lastIndexOf(SEGMENT_SEPARATOR) + 1));
-		}
-		List l= new ArrayList(1);
-		l.add(zipNode);
-		topLevel.fChildren= l;
-		
-		return topLevel;
-	}
-}
-
-
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ISnippetStateChangedListener.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ISnippetStateChangedListener.java
deleted file mode 100644
index a03390d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ISnippetStateChangedListener.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-

-/**

- * A listener interested in snippet evaluation state changes.

- */

-public interface ISnippetStateChangedListener {

-	

-	/**

-	 * Informs about the changed snippet evaluation state

-	 */

-	void snippetStateChanged(JavaSnippetEditor editor);

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
deleted file mode 100644
index 9ccb426..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetCompletionProcessor.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.Arrays;

-

-import org.eclipse.swt.widgets.Shell;

-

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.jface.text.ITextViewer;

-import org.eclipse.jface.text.contentassist.ICompletionProposal;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.text.contentassist.IContextInformation;

-import org.eclipse.jface.text.contentassist.IContextInformationValidator;

-

-import org.eclipse.jdt.core.JavaModelException;

-

-import org.eclipse.jdt.internal.corext.template.ContextType;

-import org.eclipse.jdt.internal.corext.template.ContextTypeRegistry;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.ui.text.java.IJavaCompletionProposal;

-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposalComparator;

-import org.eclipse.jdt.internal.ui.text.java.JavaParameterListValidator;

-import org.eclipse.jdt.internal.ui.text.java.ResultCollector;

-import org.eclipse.jdt.internal.ui.text.template.TemplateEngine;

-

-/**

- * Java snippet completion processor.

- */

-public class JavaSnippetCompletionProcessor implements IContentAssistProcessor {

-	

-	private ResultCollector fCollector;

-	private JavaSnippetEditor fEditor;

-	private IContextInformationValidator fValidator;

-	private TemplateEngine fTemplateEngine;

-	private JavaCompletionProposalComparator fComparator;

-	

-	private char[] fProposalAutoActivationSet;

-			

-	public JavaSnippetCompletionProcessor(JavaSnippetEditor editor) {

-		fCollector= new ResultCollector();

-		fEditor= editor;

-		ContextType contextType= ContextTypeRegistry.getInstance().getContextType("java"); //$NON-NLS-1$

-		if (contextType != null) {

-			fTemplateEngine= new TemplateEngine(contextType);

-		}

-		

-		fComparator= new JavaCompletionProposalComparator();

-	}

-	

-	/**

-	 * @see IContentAssistProcessor#getErrorMessage()

-	 */

-	public String getErrorMessage() {

-		return fCollector.getErrorMessage();

-	}

-

-	/**

-	 * @see IContentAssistProcessor#getContextInformationValidator()

-	 */

-	public IContextInformationValidator getContextInformationValidator() {

-		if (fValidator == null) {

-			fValidator= new JavaParameterListValidator();

-		}

-		return fValidator;

-	}

-

-	/**

-	 * @see IContentAssistProcessor#getContextInformationAutoActivationCharacters()

-	 */

-	public char[] getContextInformationAutoActivationCharacters() {

-		return null;

-	}

-

-	/**

-	 * @see IContentAssistProcessor#computeContextInformation(ITextViewer, int)

-	 */

-	public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {

-		return null;

-	}

-	

-	/**

-	 * @see IContentAssistProcessor#computeProposals(ITextViewer, int)

-	 */

-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int position) {

-		try {

-			fCollector.reset(position, fEditor.findJavaProject(), null);

-			fEditor.codeComplete(fCollector);

-		} catch (JavaModelException x) {

-			Shell shell= viewer.getTextWidget().getShell();

-			ErrorDialog.openError(shell, SnippetMessages.getString("CompletionProcessor.errorTitle"), SnippetMessages.getString("CompletionProcessor.errorMessage"), x.getStatus()); //$NON-NLS-2$ //$NON-NLS-1$

-			JDIDebugUIPlugin.log(x);

-		}

-		

-		IJavaCompletionProposal[] results= fCollector.getResults();

-		

-		if (fTemplateEngine != null) {

-			try {

-				fTemplateEngine.reset();

-				fTemplateEngine.complete(viewer, position, null);

-			} catch (JavaModelException x) {

-				JDIDebugUIPlugin.log(x);

-				Shell shell= viewer.getTextWidget().getShell();

-				ErrorDialog.openError(shell, SnippetMessages.getString("CompletionProcessor.errorTitle"), SnippetMessages.getString("CompletionProcessor.errorMessage"), x.getStatus()); //$NON-NLS-2$ //$NON-NLS-1$

-			}			

-		

-			IJavaCompletionProposal[] templateResults= fTemplateEngine.getResults();

-

-			// concatenate arrays

-			IJavaCompletionProposal[] total= new IJavaCompletionProposal[results.length + templateResults.length];

-			System.arraycopy(templateResults, 0, total, 0, templateResults.length);

-			System.arraycopy(results, 0, total, templateResults.length, results.length);

-			results= total;

-		}

-		return order(results);

-	}

-	

-	/**

-	 * Order the given proposals.

-	 */

-	private ICompletionProposal[] order(IJavaCompletionProposal[] proposals) {

-		Arrays.sort(proposals, fComparator);

-		return proposals;	

-	}	

-	

-	/**

-	 * @see IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()

-	 */

-	public char[] getCompletionProposalAutoActivationCharacters() {

-		return fProposalAutoActivationSet;

-	}

-	

-	/**

-	 * Sets this processor's set of characters triggering the activation of the

-	 * completion proposal computation.

-	 * 

-	 * @param activationSet the activation set

-	 */

-	public void setCompletionProposalAutoActivationCharacters(char[] activationSet) {

-		fProposalAutoActivationSet= activationSet;

-	}

-	

-	/**

-	 * Tells this processor to order the proposals alphabetically.

-	 * 

-	 * @param order <code>true</code> if proposals should be ordered.

-	 */

-	public void orderProposalsAlphabetically(boolean order) {

-		fComparator.setOrderAlphabetically(order);

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
deleted file mode 100644
index 8e40c3d..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetEditor.java
+++ /dev/null
@@ -1,1144 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.io.ByteArrayOutputStream;

-import java.io.PrintStream;

-import java.lang.reflect.InvocationTargetException;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IWorkspace;

-import org.eclipse.core.resources.IncrementalProjectBuilder;

-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.QualifiedName;

-import org.eclipse.core.runtime.Status;

-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.debug.core.model.IBreakpoint;

-import org.eclipse.debug.core.model.IDebugElement;

-import org.eclipse.debug.core.model.IDebugTarget;

-import org.eclipse.debug.core.model.IStackFrame;

-import org.eclipse.debug.core.model.IThread;

-import org.eclipse.debug.core.model.IValue;

-import org.eclipse.debug.ui.DebugUITools;

-import org.eclipse.debug.ui.IDebugModelPresentation;

-import org.eclipse.debug.ui.IDebugUIConstants;

-import org.eclipse.debug.ui.IValueDetailListener;

-import org.eclipse.jdt.core.ICompletionRequestor;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IJavaProject;

-import org.eclipse.jdt.core.JavaCore;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.core.dom.Message;

-import org.eclipse.jdt.core.eval.IEvaluationContext;

-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.IJavaType;

-import org.eclipse.jdt.debug.core.IJavaValue;

-import org.eclipse.jdt.debug.core.JDIDebugModel;

-import org.eclipse.jdt.debug.eval.EvaluationManager;

-import org.eclipse.jdt.debug.eval.IClassFileEvaluationEngine;

-import org.eclipse.jdt.debug.eval.IEvaluationListener;

-import org.eclipse.jdt.debug.eval.IEvaluationResult;

-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;

-import org.eclipse.jdt.internal.debug.ui.JDIContentAssistPreference;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.internal.debug.ui.JDISourceViewer;

-import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;

-import org.eclipse.jdt.internal.debug.ui.JavaDebugOptionsManager;

-import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;

-import org.eclipse.jdt.internal.ui.JavaPlugin;

-import org.eclipse.jdt.launching.IVMInstall;

-import org.eclipse.jdt.launching.JavaRuntime;

-import org.eclipse.jdt.ui.IContextMenuConstants;

-import org.eclipse.jdt.ui.text.JavaTextTools;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.text.BadLocationException;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.jface.text.contentassist.ContentAssistant;

-import org.eclipse.jface.text.contentassist.IContentAssistant;

-import org.eclipse.jface.text.source.ISourceViewer;

-import org.eclipse.jface.text.source.IVerticalRuler;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.swt.custom.BusyIndicator;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IFileEditorInput;

-import org.eclipse.ui.IViewPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.part.EditorActionBarContributor;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.texteditor.AbstractTextEditor;

-import org.eclipse.ui.texteditor.IDocumentProvider;

-import org.eclipse.ui.texteditor.ITextEditorActionConstants;

-import org.eclipse.ui.texteditor.TextOperationAction;

-

-import com.sun.jdi.InvocationException;

-import com.sun.jdi.ObjectReference;

-

-/**

- * An editor for Java snippets.

- */

-public class JavaSnippetEditor extends AbstractTextEditor implements IDebugEventFilter, IEvaluationListener, IValueDetailListener {			

-	public static final String IMPORTS_CONTEXT = "SnippetEditor.imports"; //$NON-NLS-1$

-	

-	public final static int RESULT_DISPLAY= 1;

-	public final static int RESULT_RUN= 2;

-	public final static int RESULT_INSPECT= 3;

-	

-	private int fResultMode; // one of the RESULT_* constants

-	

-	private IJavaProject fJavaProject;

-	private IEvaluationContext fEvaluationContext;

-	private IDebugTarget fVM;

-	private String[] fLaunchedClassPath;

-	private String fLaunchedWorkingDir;

-	private IVMInstall fLaunchedVM;

-	private List fSnippetStateListeners;	

-	

-	private boolean fEvaluating;

-	private IJavaThread fThread;

-	

-	private int fSnippetStart;

-	private int fSnippetEnd;

-	

-	private String[] fImports= null;

-	

-	private Image fOldTitleImage= null;

-	private IClassFileEvaluationEngine fEngine= null;

-	

-	/**

-	 * The debug model presentation used for computing toString

-	 */

-	private IDebugModelPresentation fPresentation= DebugUITools.newDebugModelPresentation(JDIDebugModel.getPluginIdentifier());

-	/**

-	 * The result of a toString evaluation returned asynchronously by the

-	 * debug model.

-	 */

-	private String fResult;

-	

-	/**

-	 * A thread that waits to have a 

-	 * thread to perform an evaluation in.

-	 */

-	private static class WaitThread extends Thread {

-		/**

-		 * The display used for event dispatching.

-		 */

-		private Display fDisplay;

-		

-		/**

-		 * Indicates whether to continue event queue dispatching.

-		 */

-		private volatile boolean fContinueEventDispatching = true;

-		

-		private Object fLock;

-		/**

-		 * Creates a "wait" thread

-		 * 

-		 * @param display the display to be used to read and dispatch events

-		 * @param lock the monitor to wait on

-		 */

-		private WaitThread(Display display, Object lock) {

-			super("Snippet Wait Thread"); //$NON-NLS-1$

-			fDisplay = display;

-			fLock= lock;

-		}

-		public void run() {

-			try {

-				synchronized (fLock) {

-					//should be notified out of #setThread(IJavaThread)

-					fLock.wait(10000);	

-				}

-			} catch (InterruptedException e) {

-			} finally {

-				// Make sure that all events in the asynchronous event queue

-				// are dispatched.

-				fDisplay.syncExec(new Runnable() {

-					public void run() {

-						// do nothing

-					}

-				});

-				

-				// Stop event dispatching

-				fContinueEventDispatching= false;

-				

-				// Force the event loop to return from sleep () so that

-				// it stops event dispatching.

-				fDisplay.asyncExec(null);

-			}	

-		}

-		/**

-		 * Processes events.

-		 */

-		protected void block() {

-			if (fDisplay == Display.getCurrent()) {

-				while (fContinueEventDispatching) {

-					if (!fDisplay.readAndDispatch())

-						fDisplay.sleep();

-				}

-			}

-		}		

-	}

-	

-	public JavaSnippetEditor() {

-		super();

-		setDocumentProvider(JDIDebugUIPlugin.getDefault().getSnippetDocumentProvider());

-		setSourceViewerConfiguration(new JavaSnippetViewerConfiguration(JavaPlugin.getDefault().getJavaTextTools(), this));		

-		fSnippetStateListeners= new ArrayList(4);

-		setPreferenceStore(JavaPlugin.getDefault().getPreferenceStore());

-		setEditorContextMenuId("#JavaSnippetEditorContext"); //$NON-NLS-1$

-		setRulerContextMenuId("#JavaSnippetRulerContext"); //$NON-NLS-1$

-	}

-	

-	protected void doSetInput(IEditorInput input) throws CoreException {

-		super.doSetInput(input);

-		String property= getPage().getPersistentProperty(new QualifiedName(JDIDebugUIPlugin.getUniqueIdentifier(), IMPORTS_CONTEXT));

-		if (property != null) {

-			fImports = JavaDebugOptionsManager.parseList(property);

-		}

-	}

-		

-	public void dispose() {

-		shutDownVM();

-		fPresentation.dispose();

-		fSnippetStateListeners= Collections.EMPTY_LIST;

-		super.dispose();

-	}

-	

-	/**

-	 * Actions for the editor popup menu

-	 * @see AbstractTextEditor#createActions

-	 */

-	protected void createActions() {

-		super.createActions();

-		setAction("Run", new RunSnippetAction(this)); //$NON-NLS-1$

-		setAction("ContentAssistProposal", new TextOperationAction(SnippetMessages.getBundle(), "SnippetEditor.ContentAssistProposal.", this, ISourceViewer.CONTENTASSIST_PROPOSALS));			 //$NON-NLS-2$ //$NON-NLS-1$

-		setAction("Stop", new StopAction(this));  //$NON-NLS-1$

-		setAction("SelectImports", new SelectImportsAction(this));  //$NON-NLS-1$

-	} 

-	

-	/**

-	 * @see AbstractTextEditor#editorContextMenuAboutToShow(MenuManager)

-	 */

-	protected void editorContextMenuAboutToShow(IMenuManager menu) {

-		super.editorContextMenuAboutToShow(menu);

-		addGroup(menu, ITextEditorActionConstants.GROUP_EDIT, IContextMenuConstants.GROUP_GENERATE);		

-		addGroup(menu, ITextEditorActionConstants.GROUP_FIND, IContextMenuConstants.GROUP_SEARCH);		

-		addGroup(menu, IContextMenuConstants.GROUP_SEARCH,  IContextMenuConstants.GROUP_SHOW);

-		addAction(menu, IContextMenuConstants.GROUP_ADDITIONS, "Run"); //$NON-NLS-1$

-		addAction(menu, IContextMenuConstants.GROUP_ADDITIONS, "Stop"); //$NON-NLS-1$

-		addAction(menu, IContextMenuConstants.GROUP_ADDITIONS, "SelectImports"); //$NON-NLS-1$

-	}

-

-	protected boolean isVMLaunched() {

-		return fVM != null;

-	}

-	

-	public boolean isEvaluating() {

-		return fEvaluating;

-	}

-	

-	public void evalSelection(int resultMode) {

-		if (!isInJavaProject()) {

-			reportNotInJavaProjectError();

-			return;

-		}

-		if (isEvaluating()) {

-			return;

-		}

-		evaluationStarts();

-

-		fResultMode= resultMode;

-		buildAndLaunch();

-		

-		if (fVM == null) {

-			evaluationEnds();

-			return;

-		}

-		fireEvalStateChanged();

-

-		ITextSelection selection= (ITextSelection) getSelectionProvider().getSelection();

-		String snippet= selection.getText();

-		fSnippetStart= selection.getOffset();

-		fSnippetEnd= fSnippetStart + selection.getLength();

-		

-		evaluate(snippet);			

-	}	

-	

-	protected void buildAndLaunch() {

-		IJavaProject javaProject= getJavaProject();

-		if (javaProject == null) {

-			return;

-		}

-		boolean build = !javaProject.getProject().getWorkspace().isAutoBuilding()

-			|| !javaProject.hasBuildState();

-		

-		if (build) {

-			IRunnableWithProgress r= new IRunnableWithProgress() {

-				public void run(IProgressMonitor pm) throws InvocationTargetException {

-					try {

-						getJavaProject().getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, pm);

-					} catch (CoreException e) {

-						throw new InvocationTargetException(e);

-					}

-				}

-			};

-			try {

-				new ProgressMonitorDialog(getShell()).run(true, false, r);		

-			} catch (InterruptedException e) {

-				JDIDebugUIPlugin.log(e);

-				evaluationEnds();

-				return;

-			} catch (InvocationTargetException e) {

-				JDIDebugUIPlugin.log(e);

-				evaluationEnds();

-				return;

-			}

-		}

-

-		boolean cpChange= classPathHasChanged();

-		if (!cpChange) {

-			cpChange = workingDirHasChanged();

-		}

-		if (!cpChange) {

-			cpChange = vmHasChanged();

-		}

-		boolean launch= fVM == null || cpChange;

-

-		if (cpChange) {

-			shutDownVM();

-		}

-	

-		if (launch) {

-			launchVM();

-			fVM= ScrapbookLauncher.getDefault().getDebugTarget(getPage());

-		}

-	}

-	

-	protected void setImports(String[] imports) {

-		fImports= imports;

-		String serialized= null;

-		if (imports != null) {

-			serialized= JavaDebugOptionsManager.serializeList(imports);

-		}

-		// persist

-		try {

-			getPage().setPersistentProperty(new QualifiedName(JDIDebugUIPlugin.getUniqueIdentifier(), IMPORTS_CONTEXT), serialized);

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-			ErrorDialog.openError(getShell(), SnippetMessages.getString("SnippetEditor.error.imports"), null, e.getStatus()); //$NON-NLS-1$

-		}

-	}

-	

-	protected String[] getImports() {

-		return fImports;

-	}

-			

-	protected IEvaluationContext getEvaluationContext() {

-		if (fEvaluationContext == null) {

-			IJavaProject project= getJavaProject();

-			if (project != null) {

-				fEvaluationContext= project.newEvaluationContext();

-			}

-		}

-		if (fEvaluationContext != null) {

-			if (getImports() != null) {		

-				fEvaluationContext.setImports(getImports());

-			} else {

-				fEvaluationContext.setImports(new String[]{});

-			}

-		}

-		return fEvaluationContext;

-	}

-	

-	protected IJavaProject getJavaProject() {

-		if (fJavaProject == null) {

-			try {

-				fJavaProject = findJavaProject();

-			} catch (JavaModelException e) {

-				JDIDebugUIPlugin.log(e);

-				showError(e.getStatus());

-			}

-		}

-		return fJavaProject;

-	}

-	

-	protected void shutDownVM() {

-		DebugPlugin.getDefault().removeDebugEventFilter(this);

-

-		// The real shut down

-		IDebugTarget target= fVM;

-		if (fVM != null) {

-			try {

-				IBreakpoint bp = ScrapbookLauncher.getDefault().getMagicBreakpoint(fVM);

-				if (bp != null) {

-					fVM.breakpointRemoved(bp, null);

-				}

-				if (getThread() != null) {

-					getThread().resume();

-				}

-				fVM.terminate();

-			} catch (DebugException e) {

-				JDIDebugUIPlugin.log(e);

-				ErrorDialog.openError(getShell(), SnippetMessages.getString("SnippetEditor.error.shutdown"), null, e.getStatus()); //$NON-NLS-1$

-				return;

-			}

-			vmTerminated();

-			ScrapbookLauncher.getDefault().cleanup(target);

-		}

-	}

-	

-	/**

-	 * The VM has terminated, update state

-	 */

-	protected void vmTerminated() {

-		fVM= null;

-		fThread= null;

-		fEvaluationContext= null;

-		fLaunchedClassPath= null;

-		if (fEngine != null) {

-			fEngine.dispose();

-		}

-		fEngine= null;

-		fireEvalStateChanged();

-	}

-	

-	public void addSnippetStateChangedListener(ISnippetStateChangedListener listener) {

-		if (!fSnippetStateListeners.contains(listener)) {

-			fSnippetStateListeners.add(listener);

-		}

-	}

-	

-	public void removeSnippetStateChangedListener(ISnippetStateChangedListener listener) {

-		if (fSnippetStateListeners != null) {

-			fSnippetStateListeners.remove(listener);

-		}

-	}

-

-	protected void fireEvalStateChanged() {

-		Runnable r= new Runnable() {

-			public void run() {

-				Shell shell= getShell();

-				if (shell != null && !shell.isDisposed()) {

-					List v= new ArrayList(fSnippetStateListeners);

-					for (int i= 0; i < v.size(); i++) {

-						ISnippetStateChangedListener l= (ISnippetStateChangedListener) v.get(i);

-						l.snippetStateChanged(JavaSnippetEditor.this);

-					}

-				}

-			}

-		};

-		Shell shell= getShell();

-		if (shell != null) {

-			getShell().getDisplay().asyncExec(r);

-		}

-	}

-	

-	protected void evaluate(String snippet) {

-		if (getThread() == null) {

-			WaitThread eThread= new WaitThread(Display.getCurrent(), this);

-			eThread.start();

-			eThread.block();

-		}

-		if (getThread() == null) {

-			IStatus status = new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), IJavaDebugUIConstants.INTERNAL_ERROR, 

-				SnippetMessages.getString("SnippetEditor.error.nocontext"), null); //$NON-NLS-1$

-			ErrorDialog.openError(getShell(), SnippetMessages.getString("SnippetEditor.error.evaluating"), null, status); //$NON-NLS-1$

-			evaluationEnds();

-			return;

-		}

-		try {

-			getEvaluationEngine().evaluate(snippet,getThread(), this, true);

-		} catch (DebugException e) {

-			JDIDebugUIPlugin.log(e);

-			ErrorDialog.openError(getShell(), SnippetMessages.getString("SnippetEditor.error.evaluating"), null, e.getStatus()); //$NON-NLS-1$

-			evaluationEnds();

-		}

-	}

-	

-	/**

-	 * @see IEvaluationListener#evaluationComplete(IEvaluationResult)

-	 */

-	public void evaluationComplete(final IEvaluationResult result) {

-		Runnable r = new Runnable() {

-			public void run() {

-				boolean severeErrors= false;

-				if (result.hasErrors()) {

-					Message[] errors = result.getErrors();

-					int count= errors.length;

-					if (count == 0) {

-						showException(result.getException());

-					} else {

-						severeErrors= showAllErrors(errors);

-						if (!severeErrors) {

-							//warnings only..check for exception

-							if (result.getException() != null) {

-								showException(result.getException());

-							}

-						}

-					}

-				} 

-				final IJavaValue value= result.getValue();

-				if (value != null && !severeErrors) {

-					switch (fResultMode) {

-					case RESULT_DISPLAY:

-						Runnable r = new Runnable() {

-							public void run() {

-								displayResult(value, result.getThread());

-							}

-						};

-						getSite().getShell().getDisplay().asyncExec(r);

-						break;

-					case RESULT_INSPECT:

-						String snippet= result.getSnippet().trim();

-						int snippetLength= snippet.length();

-						if (snippetLength > 30) {

-							snippet = snippet.substring(0, 15) + SnippetMessages.getString("SnippetEditor.ellipsis") + snippet.substring(snippetLength - 15, snippetLength);  //$NON-NLS-1$

-						}

-						snippet= snippet.replace('\n', ' ');

-						snippet= snippet.replace('\r', ' ');

-						snippet= snippet.replace('\t', ' ');

-						showExpressionView();

-						JavaInspectExpression exp = new JavaInspectExpression(snippet, value);

-						DebugPlugin.getDefault().getExpressionManager().addExpression(exp);

-						break;

-					case RESULT_RUN:

-						// no action

-						break;

-					}

-				}

-				evaluationEnds();

-			}

-		};

-		Control control= getVerticalRuler().getControl();

-		if (!control.isDisposed()) {

-			control.getDisplay().asyncExec(r);

-		}		

-	}

-	

-	/**

-	 * Make the expression view visible or open one

-	 * if required.

-	 */

-	protected void showExpressionView() {

-		IWorkbenchPage page = JDIDebugUIPlugin.getDefault().getActivePage();

-		if (page != null) {

-			IViewPart part = page.findView(IDebugUIConstants.ID_EXPRESSION_VIEW);

-			if (part == null) {

-				try {

-					page.showView(IDebugUIConstants.ID_EXPRESSION_VIEW);

-				} catch (PartInitException e) {

-					JDIDebugUIPlugin.log(e);

-					showError(e.getStatus());

-				}

-			} else {

-				page.bringToTop(part);

-			}

-		}

-	}

-		

-	protected void codeComplete(ICompletionRequestor requestor) throws JavaModelException {

-		IDocument d= getSourceViewer().getDocument();

-		ITextSelection selection= (ITextSelection)getSelectionProvider().getSelection();

-		int start= selection.getOffset();

-		String snippet= d.get();	

-		IEvaluationContext e= getEvaluationContext();

-		if (e != null) {

-			e.codeComplete(snippet, start, requestor);

-		}

-	}

-		 

-	protected IJavaElement[] codeResolve() throws JavaModelException {

-		ISourceViewer viewer= getSourceViewer();

-		if (viewer == null) {

-			return null;

-		}

-		IDocument d= viewer.getDocument();

-		ITextSelection selection= (ITextSelection) getSelectionProvider().getSelection();

-		int start= selection.getOffset();

-		int len= selection.getLength();

-		

-		String snippet= d.get();	

-		IEvaluationContext e= getEvaluationContext();

-		if (e != null) {

-			return e.codeSelect(snippet, start, len);

-		}

-		return null;

-	}	

-	

-	protected void showError(IStatus status) {

-		evaluationEnds();

-		if (!status.isOK()) {

-			ErrorDialog.openError(getShell(), SnippetMessages.getString("SnippetEditor.error.evaluating2"), null, status); //$NON-NLS-1$

-		}

-	}

-	

-	protected void showError(String message) {

-		Status status= new Status(IStatus.ERROR, JDIDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, message, null);

-		showError(status);

-	}

-	

-	public void displayResult(IJavaValue result, IJavaThread thread) {

-		StringBuffer resultString= new StringBuffer();

-		try {

-			IJavaType type = result.getJavaType();

-			if (type != null) {

-				String sig= type.getSignature();

-				if ("V".equals(sig)) { //$NON-NLS-1$

-					resultString.append(SnippetMessages.getString("SnippetEditor.noreturnvalue")); //$NON-NLS-1$

-				} else {

-					if (sig != null) {

-						resultString.append(SnippetMessages.getFormattedString("SnippetEditor.typename", result.getReferenceTypeName())); //$NON-NLS-1$

-					} else {

-						resultString.append(" "); //$NON-NLS-1$

-					}   

-					resultString.append(evaluateToString(result, thread));

-				}

-			} else {

-				resultString.append(result.getValueString());

-			}

-		} catch(DebugException e) {

-			JDIDebugUIPlugin.log(e);

-			ErrorDialog.openError(getShell(), SnippetMessages.getString("SnippetEditor.error.toString"), null, e.getStatus()); //$NON-NLS-1$

-		}

-			

-		try {

-			getSourceViewer().getDocument().replace(fSnippetEnd, 0, resultString.toString());

-		} catch (BadLocationException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		

-		selectAndReveal(fSnippetEnd, resultString.length());

-	}

-	

-	/**

-	 * Returns the result of evaluating 'toString' on the given

-	 * value.

-	 * 

-	 * @param value object or primitive data type the 'toString'

-	 *  is required for

-	 * @param thread the thread in which to evaluate 'toString'

-	 * @return the result of evaluating toString

-	 * @exception DebugException if an exception occurs during the

-	 *  evaluation.

-	 */

-	protected synchronized String evaluateToString(IJavaValue value, IJavaThread thread) throws DebugException {

-		fResult= null;

-		fPresentation.computeDetail(value, this);

-		if (fResult == null) {

-			try {

-				wait(10000);

-			} catch (InterruptedException e) {

-				return SnippetMessages.getString("SnippetEditor.error.interrupted"); //$NON-NLS-1$

-			}

-		}

-		return fResult;

-	}

-	

-	/**

-	 * @see IValueDetailListener#detailComputed(IValue, String)

-	 */

-	public synchronized void detailComputed(IValue value, final String result) {

-		fResult= result;

-		this.notifyAll();

-	}

-	

-	protected boolean showAllErrors(Message[] errors) {

-		IDocument document = getSourceViewer().getDocument();

-		String delimiter = document.getLegalLineDelimiters()[0];

-		int insertionPoint = fSnippetStart;

-		try {

-			insertionPoint = document.getLineOffset(document.getLineOfOffset(fSnippetStart));

-		} catch (BadLocationException ble) {

-			JDIDebugUIPlugin.log(ble);

-		}

-		int firstInsertionPoint = insertionPoint;

-		boolean severeError=false;

-		for (int i = 0; i < errors.length; i++) {

-			Message error= errors[i];

-			//only show problems that are greater severity than a warning

-			insertionPoint = showOneError(document, error, insertionPoint, delimiter);

-			severeError= true;

-		}

-		if (severeError) {

-			selectAndReveal(firstInsertionPoint, insertionPoint - firstInsertionPoint);

-			fSnippetStart = insertionPoint;

-		}

-		return severeError;

-	}

-

-	protected int showOneError(IDocument document, Message problem, int insertionPoint, String delimiter) {

-		String message= SnippetMessages.getString("SnippetEditor.error.unqualified"); //$NON-NLS-1$

-		message= problem.getMessage() + delimiter;

-		try {

-			document.replace(insertionPoint, 0, message);

-		} catch (BadLocationException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return insertionPoint += message.length();

-	}	

-

-	protected void showException(Throwable exception) {

-		if (exception instanceof DebugException) {

-			DebugException de = (DebugException)exception;

-			Throwable t= de.getStatus().getException();

-			if (t != null) {

-				// show underlying exception

-				showUnderlyingException(t);

-				return;

-			}

-		}

-		ByteArrayOutputStream bos= new ByteArrayOutputStream();

-		PrintStream ps= new PrintStream(bos, true);

-		exception.printStackTrace(ps);

-		try {

-			getSourceViewer().getDocument().replace(fSnippetEnd, 0, bos.toString());

-		} catch (BadLocationException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		selectAndReveal(fSnippetEnd, bos.size());

-	}

-	

-	protected void showUnderlyingException(Throwable t) {

-		if (t instanceof InvocationException) {

-			InvocationException ie= (InvocationException)t;

-			ObjectReference ref= ie.exception();

-			String eName= ref.referenceType().name();

-			String message= SnippetMessages.getFormattedString("SnippetEditor.exception", eName); //$NON-NLS-1$

-			try {

-				getSourceViewer().getDocument().replace(fSnippetEnd, 0, message);

-			} catch (BadLocationException e) {

-				JDIDebugUIPlugin.log(e);

-			}

-			selectAndReveal(fSnippetEnd, message.length());

-		} else {

-			showException(t);

-		}

-	}

-	

-	protected IJavaProject findJavaProject() throws JavaModelException {

-		Object input= getEditorInput();

-		if (input instanceof IFileEditorInput) {

-			IFileEditorInput file= (IFileEditorInput)input;

-			IProject p= file.getFile().getProject();

-			try {

-				if (p.getNature(JavaCore.NATURE_ID) != null) {

-					return JavaCore.create(p);

-				}

-			} catch (CoreException ce) {

-				throw new JavaModelException(ce);

-			}

-		}

-		return null;

-	}

-		

-	protected boolean classPathHasChanged() {

-		String[] classpath= getClassPath(getJavaProject());

-		if (fLaunchedClassPath != null && !classPathsEqual(fLaunchedClassPath, classpath)) {

-			MessageDialog.openWarning(getShell(), SnippetMessages.getString("SnippetEditor.warning"), SnippetMessages.getString("SnippetEditor.warning.cpchange")); //$NON-NLS-2$ //$NON-NLS-1$

-			return true;

-		}

-		return false;

-	}

-	

-	protected boolean workingDirHasChanged() {

-		String wd = getWorkingDirectoryAttribute();

-		boolean changed = false;

-		if (wd == null || fLaunchedWorkingDir == null) {

-			if (wd != fLaunchedWorkingDir) {

-				changed = true;

-			}

-		} else {

-			if (!wd.equals(fLaunchedWorkingDir)) {

-				changed = true;

-			}

-		}

-		if (changed && fVM != null) {

-			MessageDialog.openWarning(getShell(), SnippetMessages.getString("SnippetEditor.Warning_1"), SnippetMessages.getString("SnippetEditor.The_working_directory_has_changed._Restarting_the_evaluation_context._2")); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		return changed;

-	}

-	

-	protected boolean vmHasChanged() {

-		IVMInstall vm = getVMInstall();

-		boolean changed = false;

-		if (vm == null || fLaunchedVM == null) {

-			if (vm != fLaunchedVM) {

-				changed = true;

-			}

-		} else {

-			if (!vm.equals(fLaunchedVM)) {

-				changed = true;

-			}

-		}

-		if (changed && fVM != null) {

-			MessageDialog.openWarning(getShell(), SnippetMessages.getString("SnippetEditor.Warning_1"), SnippetMessages.getString("SnippetEditor.The_JRE_has_changed._Restarting_the_evaluation_context._2")); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-		return changed;

-	}

-			

-	protected boolean classPathsEqual(String[] path1, String[] path2) {

-		if (path1.length != path2.length) {

-			return false;

-		}

-		for (int i= 0; i < path1.length; i++) {

-			if (!path1[i].equals(path2[i])) {

-				return false;

-			}

-		}

-		return true;

-	}

-		

-	protected synchronized void evaluationStarts() {

-		if (fThread != null) {

-			try {

-				IThread thread = fThread;

-				fThread = null;

-				thread.resume();

-			} catch (DebugException e) {

-				JDIDebugUIPlugin.log(e);

-				showException(e);

-				return;

-			}

-		}		

-		fEvaluating = true;

-		setTitleImage();

-		fireEvalStateChanged();

-		showStatus(SnippetMessages.getString("SnippetEditor.evaluating")); //$NON-NLS-1$

-		getSourceViewer().setEditable(false);

-	}

-	

-	/** 

-	 * Sets the tab image to indicate whether in the process of

-	 * evaluating or not.

-	 */

-	protected void setTitleImage() {

-		Image image=null;

-		if (fEvaluating) {

-			fOldTitleImage= getTitleImage();

-			image= JavaDebugImages.get(JavaDebugImages.IMG_OBJS_SNIPPET_EVALUATING);

-		} else {

-			image= fOldTitleImage;

-			fOldTitleImage= null;

-		}

-		if (image != null) {

-			setTitleImage(image);

-		}

-	}

-		

-	protected void evaluationEnds() {

-		fEvaluating= false;

-		setTitleImage();

-		fireEvalStateChanged();

-		showStatus(""); //$NON-NLS-1$

-		getSourceViewer().setEditable(true);

-	}

-	

-	protected void showStatus(String message) {

-		IEditorSite site=(IEditorSite)getSite();

-		EditorActionBarContributor contributor= (EditorActionBarContributor)site.getActionBarContributor();

-		contributor.getActionBars().getStatusLineManager().setMessage(message);

-	}

-	

-	protected String[] getClassPath(IJavaProject project) {

-		try {

-			return JavaRuntime.computeDefaultRuntimeClassPath(project);

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-			return new String[0];

-		}

-	}

-	

-	protected Shell getShell() {

-		return getSite().getShell();

-	}

-	

-	/**

-	 * @see IDebugEventFilter#filterDebugEvents(DebugEvent[])

-	 */	

-	public DebugEvent[] filterDebugEvents(DebugEvent[] events) {

-		for (int i = 0; i < events.length; i++) {

-			DebugEvent e = events[i];

-			Object source = e.getSource();

-			if (source instanceof IDebugElement) {

-				IDebugElement de = (IDebugElement)source;

-				if (de instanceof IDebugTarget) {

-					if (de.getDebugTarget().equals(fVM)) {

-						if (e.getKind() == DebugEvent.TERMINATE) {

-							setThread(null);

-							Runnable r = new Runnable() {

-								public void run() {

-									vmTerminated();

-								}

-							};

-							getShell().getDisplay().asyncExec(r);

-						}

-					}

-				} else if (de instanceof IJavaThread) {

-					if (e.getKind() == DebugEvent.SUSPEND) {

-						IJavaThread jt = (IJavaThread)de;

-						try {

-							IJavaStackFrame f= (IJavaStackFrame)jt.getTopStackFrame();

-							if (f != null) {

-								IBreakpoint[] bps = jt.getBreakpoints();

-								if (e.getDetail() == DebugEvent.STEP_END && f.getLineNumber() == 14 

-									&& f.getDeclaringTypeName().equals("org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain1") //$NON-NLS-1$

-									&& jt.getDebugTarget() == fVM) { 

-									setThread(jt);

-								} else if (e.getDetail() == DebugEvent.BREAKPOINT &&  bps.length > 0 && bps[0].equals(ScrapbookLauncher.getDefault().getMagicBreakpoint(jt.getDebugTarget()))) {

-									// locate the 'eval' method and step over

-									IStackFrame[] frames = jt.getStackFrames();

-									for (int j = 0; j < frames.length; j++) {

-										IJavaStackFrame frame = (IJavaStackFrame)frames[j];

-										if (frame.getReceivingTypeName().equals("org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain1") && frame.getName().equals("eval")) { //$NON-NLS-1$ //$NON-NLS-2$

-											frame.stepOver();

-											return null;

-										}

-									}

-								}

-							}

-						} catch (DebugException ex) {

-							JDIDebugUIPlugin.log(ex);

-						}

-					}

-				}

-			}

-		}

-		return events;

-	}

-	

-	/**

-	 * @see AbstractTextEditor#affectsTextPresentation(PropertyChangeEvent)

-	 */

-	protected boolean affectsTextPresentation(PropertyChangeEvent event) {

-		JavaTextTools textTools= JavaPlugin.getDefault().getJavaTextTools();

-		return textTools.affectsBehavior(event);

-	}

-	

-	/**

-	 * @see AbstractTextEditor#handlePreferenceStoreChanged(PropertyChangeEvent)

-	 */

-	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {

-		JDISourceViewer isv= (JDISourceViewer) getSourceViewer();

-			if (isv != null) {

-				IContentAssistant assistant= isv.getContentAssistant();

-				if (assistant instanceof ContentAssistant) {

-					JDIContentAssistPreference.changeConfiguration((ContentAssistant) assistant, event);

-				}				

-				

-				super.handlePreferenceStoreChanged(event);

-			}

-	}

-	

-	protected IJavaThread getThread() {

-		return fThread;

-	}

-	

-	/**

-	 * Sets the thread to perform any evaluations in.

-	 * Notifies the WaitThread waiting on getting an evaluation thread

-	 * to perform an evaluation.

-	 */

-	protected synchronized void setThread(IJavaThread thread) {

-		fThread= thread;

-		notifyAll();

-	}

-	

-	protected void launchVM() {

-		DebugPlugin.getDefault().addDebugEventFilter(this);

-		fLaunchedClassPath = getClassPath(getJavaProject());

-		fLaunchedWorkingDir = getWorkingDirectoryAttribute();

-		fLaunchedVM = getVMInstall();

-		Runnable r = new Runnable() {

-			public void run() {

-				ScrapbookLauncher.getDefault().launch(getPage());

-			}

-		};

-		BusyIndicator.showWhile(getShell().getDisplay(), r);

-	}

-	

-	protected IFile getPage() {

-		return ((FileEditorInput)getEditorInput()).getFile();

-	}

-	

-	/**

-	 * Updates all selection dependent actions.

-	 */

-	protected void updateSelectionDependentActions() {

-		super.updateSelectionDependentActions();

-		fireEvalStateChanged();

-	}

-	

-   /**

-    * Terminates existing VM on a rename of the editor

-	* @see WorkbenchPart#setTitle

- 	*/

-	protected void setTitle(String title) {

-		if(isVMLaunched()) {

-			shutDownVM();

-		}

-		super.setTitle(title);

-	}

-	

-	/**

-	 * Returns whether this editor has been opened on a resource that

-	 * is in a Java project.

-	 */

-	protected boolean isInJavaProject() {

-		try {

-			return findJavaProject() != null;

-		} catch (JavaModelException jme) {

-			JDIDebugUIPlugin.log(jme);

-		}

-		return false;

-	}

-	

-	/**

-	 * Displays an error dialog indicating that evaluation

-	 * cannot occur outside of a Java Project.

-	 */

-	protected void reportNotInJavaProjectError() {

-		String projectName= null;

-		Object input= getEditorInput();

-		if (input instanceof IFileEditorInput) {

-			IFileEditorInput file= (IFileEditorInput)input;

-			IProject p= file.getFile().getProject();

-			projectName= p.getName();

-		}

-		String message= ""; //$NON-NLS-1$

-		if (projectName != null) {

-			message = projectName + SnippetMessages.getString("JavaSnippetEditor._is_not_a_Java_Project._n_1"); //$NON-NLS-1$

-		}

-		showError(message + SnippetMessages.getString("JavaSnippetEditor.Unable_to_perform_evaluation_outside_of_a_Java_Project_2")); //$NON-NLS-1$

-	}

-	

-	/**

-	 * Asks the user for the workspace path

-	 * of a file resource and saves the document there.

-	 */

-	protected void performSaveAs(IProgressMonitor progressMonitor) {

-		Shell shell= getSite().getShell();

-		SaveAsDialog dialog= new SaveAsDialog(shell);

-		dialog.open();

-		IPath path= dialog.getResult();

-		

-		if (path == null) {

-			if (progressMonitor != null)

-				progressMonitor.setCanceled(true);

-			return;

-		}

-			

-		IWorkspace workspace= ResourcesPlugin.getWorkspace();

-		IFile file= workspace.getRoot().getFile(path);

-		final IEditorInput newInput= new FileEditorInput(file);

-		

-		WorkspaceModifyOperation op= new WorkspaceModifyOperation() {

-			public void execute(final IProgressMonitor monitor) throws CoreException {

-				IDocumentProvider dp= getDocumentProvider();

-				dp.saveDocument(monitor, newInput, dp.getDocument(getEditorInput()), true);

-			}

-		};

-		

-		boolean success= false;

-		try {

-			getDocumentProvider().aboutToChange(newInput);

-			new ProgressMonitorDialog(shell).run(false, true, op);

-			success= true;

-		} catch (InterruptedException x) {

-		} catch (InvocationTargetException x) {

-			JDIDebugUIPlugin.log(x);

-			String title= SnippetMessages.getString("JavaSnippetEditor.Problems_During_Save_As..._3");  //$NON-NLS-1$

-			String msg= SnippetMessages.getString("JavaSnippetEditor.Save_could_not_be_completed.__4") +  x.getTargetException().getMessage(); //$NON-NLS-1$

-			MessageDialog.openError(shell, title, msg);

-		} finally {

-			getDocumentProvider().changed(newInput);

-			if (success) {

-				setInput(newInput);

-			}

-		}

-		

-		if (progressMonitor != null) {

-			progressMonitor.setCanceled(!success);

-		}

-	}

-	

-	/**

-	 * @see IEditorPart#isSaveAsAllowed()

-	 */

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-	

-	protected IClassFileEvaluationEngine getEvaluationEngine() {

-		if (fEngine == null) {

-			IPath outputLocation =	getJavaProject().getProject().getPluginWorkingLocation(JDIDebugUIPlugin.getDefault().getDescriptor());

-			java.io.File f = new java.io.File(outputLocation.toOSString());

-			fEngine = EvaluationManager.newClassFileEvaluationEngine(getJavaProject(), (IJavaDebugTarget)getThread().getDebugTarget(), f);

-		}

-		if (getImports() != null) {

-			fEngine.setImports(getImports());

-		} else {

-			fEngine.setImports(new String[]{});

-		}

-		return fEngine;

-	}

-	

-	/**

-	 * @see AbstractTextEditor#createSourceViewer(Composite, IVerticalRuler, int)

-	 */

-	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {

-		return new JDISourceViewer(parent, ruler, styles);

-	}

-	

-	/**

-	 * Returns the working directory attribute for this scrapbook

-	 */

-	protected String getWorkingDirectoryAttribute() {

-		try {

-			return ScrapbookLauncher.getWorkingDirectoryAttribute(getPage());

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return null;

-	}

-	

-	/**

-	 * Returns the vm install for this scrapbook

-	 */

-	protected IVMInstall getVMInstall() {

-		try {

-			return ScrapbookLauncher.getVMInstall(getPage());

-		} catch (CoreException e) {

-			JDIDebugUIPlugin.log(e);

-		}

-		return null;

-	}	

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetViewerConfiguration.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetViewerConfiguration.java
deleted file mode 100644
index 29e178c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/JavaSnippetViewerConfiguration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-

-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jdt.internal.debug.ui.JDIContentAssistPreference;

-import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;

-import org.eclipse.jdt.ui.text.JavaTextTools;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.contentassist.ContentAssistant;

-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

-import org.eclipse.jface.text.contentassist.IContentAssistant;

-import org.eclipse.jface.text.source.ISourceViewer;

-

-/**

- *  The source viewer configuration for the Java snippet editor.

- */

-public class JavaSnippetViewerConfiguration extends JavaSourceViewerConfiguration {

-	

-	public JavaSnippetViewerConfiguration(JavaTextTools tools, JavaSnippetEditor editor) {

-		super(tools, editor);

-	}

-	

-	/**

-	 * @see JDIViewerConfiguration#getContentAssistantProcessor()

-	 */

-	public IContentAssistProcessor getContentAssistantProcessor() {

-		return new JavaSnippetCompletionProcessor((JavaSnippetEditor)getEditor());

-	}

-	

-	/**

-	 * @see SourceViewerConfiguration#getContentAssistant(ISourceViewer)

-	 */

-	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {

-

-		ContentAssistant assistant = new ContentAssistant();

-		assistant.setContentAssistProcessor(

-			getContentAssistantProcessor(),

-			IDocument.DEFAULT_CONTENT_TYPE);

-

-		JDIContentAssistPreference.configure(assistant, getColorManager());

-

-		assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE);

-		assistant.setInformationControlCreator(

-			getInformationControlCreator(sourceViewer));

-

-		return assistant;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/RunSnippetAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/RunSnippetAction.java
deleted file mode 100644
index a676c1c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/RunSnippetAction.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Runs a snippet
- */
-public class RunSnippetAction extends SnippetAction implements IWorkbenchWindowActionDelegate, IPartListener {
-	
-	private IWorkbenchWindow fWindow;
-	private IAction fAction;
-	
-	public RunSnippetAction(JavaSnippetEditor editor) {
-		super(editor);
-		setText(SnippetMessages.getString("RunAction.label")); //$NON-NLS-1$
-		setToolTipText(SnippetMessages.getString("RunAction.tooltip")); //$NON-NLS-1$
-		setDescription(SnippetMessages.getString("RunAction.description")); //$NON-NLS-1$
-		setImageDescriptor(JavaDebugImages.DESC_TOOL_RUNSNIPPET);
-		setDisabledImageDescriptor(JavaDebugImages.DESC_TOOL_RUNSNIPPET_DISABLED);
-		setHoverImageDescriptor(JavaDebugImages.DESC_TOOL_RUNSNIPPET_HOVER);
-	}
-	
-	public RunSnippetAction() {
-		super(null);
-	}
-	
-	/**
-	 * @see IAction#run()
-	 */
-	public void run() {
-		getEditor().evalSelection(JavaSnippetEditor.RESULT_RUN);
-	} 
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		getWindow().getPartService().removePartListener(this);
-	}
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		setWindow(window);
-		IWorkbenchPage page= window.getActivePage();
-		if (page != null) {
-			if (page.getActiveEditor() instanceof JavaSnippetEditor) {
-				setEditor((JavaSnippetEditor)page.getActiveEditor());
-				update();
-			}
-		}
-		window.getPartService().addPartListener(this);
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		run();
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		setAction(action);
-		update();
-		
-	}
-	
-	protected IWorkbenchWindow getWindow() {
-		return fWindow;
-	}
-		
-	protected void setWindow(IWorkbenchWindow window) {
-		fWindow = window;
-	}
-	
-	protected IAction getAction() {
-		return fAction;
-	}
-
-	protected void setAction(IAction action) {
-		fAction = action;
-	}
-	
-	public void setEnabled(boolean enabled) {
-		if (getAction() == null) {
-			super.setEnabled(enabled);
-		} else {
-			getAction().setEnabled(enabled);
-		}
-	}
-	/**
-	 * @see IPartListener#partActivated(IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		if (part instanceof JavaSnippetEditor) {
-			setEditor((JavaSnippetEditor)part);
-		} else {
-			setEditor(null);
-		}
-	}
-
-	/**
-	 * @see IPartListener#partBroughtToTop(IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {
-	}
-
-	/**
-	 * @see IPartListener#partClosed(IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part == getEditor()) {
-			setEditor(null);
-		}
-	}
-
-	/**
-	 * @see IPartListener#partDeactivated(IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-	}
-
-	/**
-	 * @see IPartListener#partOpened(IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {
-	}
-
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
deleted file mode 100644
index 280bd16..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookLauncher.java
+++ /dev/null
@@ -1,441 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;
- 
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IFile;
-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.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
-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.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.IDebugTarget;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Support for launching scrapbook using launch configurations.
- */
-
-public class ScrapbookLauncher implements IDebugEventSetListener {
-	
-	public static final String SCRAPBOOK_LAUNCH = IJavaDebugUIConstants.PLUGIN_ID + ".scrapbook_launch"; //$NON-NLS-1$
-	
-	public static final String SCRAPBOOK_FILE_PATH = IJavaDebugUIConstants.PLUGIN_ID + ".scrapbook_file_path"; //$NON-NLS-1$
-	
-	/**
-	 * Persistent property associated with snippet files specifying working directory.
-	 * Same format as the associated launch configuration attribute
-	 * <code>ATTR_WORKING_DIR</code>.
-	 */
-	public static final QualifiedName SNIPPET_EDITOR_LAUNCH_CONFIG_HANDLE_MEMENTO = new QualifiedName(IJavaDebugUIConstants.PLUGIN_ID, "snippet_editor_launch_config"); //$NON-NLS-1$
-		
-	private IJavaLineBreakpoint fMagicBreakpoint;
-	
-	private HashMap fScrapbookToVMs = new HashMap(10);
-	private HashMap fVMsToBreakpoints = new HashMap(10);
-	private HashMap fVMsToScrapbooks = new HashMap(10);
-	
-	private static ScrapbookLauncher fgDefault = null;
-	
-	private ScrapbookLauncher() {
-		//see getDefault()
-	}
-	
-	public static ScrapbookLauncher getDefault() {
-		if (fgDefault == null) {
-			fgDefault = new ScrapbookLauncher();
-		}
-		return fgDefault;
-	}
-	
-	/**
-	 * Launches a VM for the given srapbook page, in debug mode.
-	 * Returns an existing launch if the page is already running.
-	 * 
-	 * @param file scrapbook page file
-	 * @return resulting launch, or <code>null</code> on failure
-	 */
-	protected ILaunch launch(IFile page) {
-
-		// clean up orphaned launch cofigs
-		cleanupLaunchConfigurations();
-							
-		if (!page.getFileExtension().equals("jpage")) { //$NON-NLS-1$
-			showNoPageDialog();
-			return null;
-		}
-		
-		IDebugTarget vm = getDebugTarget(page);
-		if (vm != null) {
-			//already launched
-			return vm.getLaunch();
-		}
-		
-		IJavaProject javaProject= JavaCore.create(page.getProject());
-			
-		URL pluginInstallURL= JDIDebugUIPlugin.getDefault().getDescriptor().getInstallURL();
-		URL jarURL = null;
-		try {
-			jarURL = new URL(pluginInstallURL, "snippetsupport.jar"); //$NON-NLS-1$
-			jarURL = Platform.asLocalURL(jarURL);
-		} catch (MalformedURLException e) {
-			JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Exception_occurred_launching_scrapbook_1"), e); //$NON-NLS-1$
-			return null;
-		} catch (IOException e) {
-			JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Exception_occurred_launching_scrapbook_1"), e); //$NON-NLS-1$
-			return null;
-		}
-		
-		List cp = new ArrayList(3);
-		IRuntimeClasspathEntry supportEntry = JavaRuntime.newArchiveRuntimeClasspathEntry(new Path(jarURL.getFile()));
-		cp.add(supportEntry);
-		// get bootpath entries
-		try {
-			IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedRuntimeClasspath(javaProject);
-			for (int i = 0; i < entries.length; i++) {
-				if (entries[i].getClasspathProperty() != IRuntimeClasspathEntry.USER_CLASSES) {
-					cp.add(entries[i]);
-				}
-			}
-			IRuntimeClasspathEntry[] classPath = (IRuntimeClasspathEntry[])cp.toArray(new IRuntimeClasspathEntry[cp.size()]);
-			
-			return doLaunch(javaProject, page, classPath);
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Unable_to_launch_scrapbook_VM_6"), e); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	private ILaunch doLaunch(IJavaProject p, IFile page, IRuntimeClasspathEntry[] classPath) {
-		try {
-			if (fVMsToScrapbooks.isEmpty()) {
-				// register for debug events if a scrapbook is not currently running
-				DebugPlugin.getDefault().addDebugEventListener(this);
-			}
-			ILaunchConfiguration config = null;
-			ILaunchConfigurationWorkingCopy wc = null;
-			try {
-				config = getLaunchConfigurationTemplate(page);
-				if (config != null) {
-					wc = config.getWorkingCopy();		
-				}
-			} catch (CoreException e) {
-				config = null;
-				wc = null;
-				JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Unable_to_retrieve_scrapbook_runtime_settings._Settings_will_revert_to_default._1"), e); //$NON-NLS-1$
-			}
-			
-			if (config == null) {
-				config = createLaunchConfigurationTemplate(page);
-				wc = config.getWorkingCopy();
-			}							
-			
-						
-			IPath outputLocation =	p.getProject().getPluginWorkingLocation(JDIDebugUIPlugin.getDefault().getDescriptor());
-			File f = outputLocation.toFile();
-			URL u = null;
-			try {
-				u = getEncodedURL(f);
-			} catch (MalformedURLException e) {
-				JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Exception_occurred_launching_scrapbook_1"),e); //$NON-NLS-1$
-				return null;
-			}
-			String[] defaultClasspath = JavaRuntime.computeDefaultRuntimeClassPath(p);
-			String[] urls = new String[defaultClasspath.length + 1];
-			urls[0] = u.toExternalForm();
-			for (int i = 0; i < defaultClasspath.length; i++) {
-				f = new File(defaultClasspath[i]);
-				try {
-					urls[i + 1] = getEncodedURL(f).toExternalForm();
-				} catch (MalformedURLException e) {
-					JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Exception_occurred_launching_scrapbook_1"), e);				 //$NON-NLS-1$
-				 	return null;
-				}
-			}
-			
-			// convert to mementos 
-			List classpathList= new ArrayList(classPath.length);
-			for (int i = 0; i < classPath.length; i++) {
-				classpathList.add(classPath[i].getMemento());
-			}
-			
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, classpathList);
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, p.getElementName());
-			
-			StringBuffer urlsString = new StringBuffer();
-			for (int i = 0; i < urls.length; i++) {
-				urlsString.append(' ');
-				urlsString.append(urls[i]);
-			}
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, urlsString.toString());
-			wc.setAttribute(SCRAPBOOK_LAUNCH, SCRAPBOOK_LAUNCH);
-			
-			config = wc.doSave();
-			
-			ILaunch launch = config.launch(ILaunchManager.DEBUG_MODE, null);
-			if (launch != null) {
-				IDebugTarget dt = launch.getDebugTarget();
-				IBreakpoint magicBreakpoint = createMagicBreakpoint("org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain"); //$NON-NLS-1$
-				fScrapbookToVMs.put(page, dt);
-				fVMsToScrapbooks.put(dt, page);
-				fVMsToBreakpoints.put(dt, magicBreakpoint);
-				dt.breakpointAdded(magicBreakpoint);
-				launch.setAttribute(SCRAPBOOK_LAUNCH, SCRAPBOOK_LAUNCH);
-				return launch;
-			}
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("ScrapbookLauncher.Unable_to_launch_scrapbook_VM_6"), e); //$NON-NLS-1$
-		}
-		return null;
-	}
-	
-	/**
-	 * Creates an "invisible" line breakpoint. 
-	 */
-	IBreakpoint createMagicBreakpoint(String typeName) throws CoreException{
-	
-		fMagicBreakpoint= JDIDebugModel.createLineBreakpoint(ResourcesPlugin.getWorkspace().getRoot(), typeName, 51, -1, -1, 0, false, null);
-		fMagicBreakpoint.setPersisted(false);
-		return fMagicBreakpoint;
-	}
-
-	/**
-	 * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-	 */
-	public void handleDebugEvents(DebugEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			DebugEvent event = events[i];
-			if (event.getSource() instanceof IDebugTarget && event.getKind() == DebugEvent.TERMINATE) {
-				cleanup((IDebugTarget)event.getSource());
-			}
-		}
-	}
-	
-	/**
-	 * Returns the debug target associated with the given
-	 * scrapbook page, or <code>null</code> if none.
-	 * 
-	 * @param page file representing scrapbook page
-	 * @return associated debug target or <code>null</code>
-	 */
-	public IDebugTarget getDebugTarget(IFile page) {
-		return (IDebugTarget)fScrapbookToVMs.get(page);
-	}
-	
-	/**
-	 * Returns the magic breakpoint associated with the given
-	 * scrapbook VM. The magic breakpoint is the location at
-	 * which an evaluation begins.
-	 * 
-	 * @param target a scrapbook debug target 
-	 * @return the breakpoint at which an evaluation begins
-	 *  or <code>null</code> if none
-	 */
-	public IBreakpoint getMagicBreakpoint(IDebugTarget target) {
-		return (IBreakpoint)fVMsToBreakpoints.get(target);
-	}
-	
-	protected void showNoPageDialog() {
-		String title= SnippetMessages.getString("ScrapbookLauncher.error.title"); //$NON-NLS-1$
-		String msg= SnippetMessages.getString("ScrapbookLauncher.error.pagenotfound"); //$NON-NLS-1$
-		MessageDialog.openError(JDIDebugUIPlugin.getActiveWorkbenchShell(),title, msg);
-	}
-	
-	protected void cleanup(IDebugTarget target) {
-		Object page = fVMsToScrapbooks.get(target);
-		if (page != null) {
-			fVMsToScrapbooks.remove(target);
-			fScrapbookToVMs.remove(page);
-			fVMsToBreakpoints.remove(target);
-			ILaunch launch = target.getLaunch();
-			if (launch != null) {
-				getLaunchManager().removeLaunch(launch);
-			}
-			if (fVMsToScrapbooks.isEmpty()) {
-				// no need to listen to events if no scrapbooks running
-				DebugPlugin.getDefault().removeDebugEventListener(this);
-			}
-		}
-	}
-	
-	protected URL getEncodedURL(File file) throws MalformedURLException {
-		//looking at File.toURL the delimiter is always '/' 
-		// NOT File.separatorChar
-		String urlDelimiter= "/"; //$NON-NLS-1$
-		String unencoded= file.toURL().toExternalForm();
-		StringBuffer encoded= new StringBuffer();
-		StringTokenizer tokenizer= new StringTokenizer(unencoded, urlDelimiter);
-		
-		encoded.append(tokenizer.nextToken()); //file:
-		encoded.append(urlDelimiter);
-		encoded.append(tokenizer.nextToken()); //drive letter and ':'
-		
-		while (tokenizer.hasMoreElements()) {
-			encoded.append(urlDelimiter);
-			String token= tokenizer.nextToken();
-			encoded.append(URLEncoder.encode(token));
-		}
-		if (file.isDirectory()) {
-			encoded.append(urlDelimiter);
-		}
-		return new URL(encoded.toString());
-	}
-	
-	/**
-	 * Returns the launch configuration used as a template for launching the
-	 * given scrapbook file, or <code>null</code> if none. The template contains
-	 * working directory and JRE settings to use when launching the scrapbook.
-	 */
-	public static ILaunchConfiguration getLaunchConfigurationTemplate(IFile file) throws CoreException {
-		String memento = getLaunchConfigMemento(file);
-		if (memento != null) {
-			return getLaunchManager().getLaunchConfiguration(memento);
-		}
-		return null;
-	}
-	
-	/**
-	 * Creates and saves template launch configuration for the given scrapbook file.
-	 */
-	public static ILaunchConfiguration createLaunchConfigurationTemplate(IFile page) throws CoreException {
-		ILaunchConfigurationType lcType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-		String name = page.getName() + "-Scrapbook-" + System.currentTimeMillis(); //$NON-NLS-1$
-		ILaunchConfigurationWorkingCopy wc = lcType.newInstance(null, name);
-		wc.setAttribute(IDebugUIConstants.ATTR_PRIVATE, true);
-		wc.setAttribute(IDebugUIConstants.ATTR_TARGET_DEBUG_PERSPECTIVE, IDebugUIConstants.PERSPECTIVE_NONE);		
-		wc.setAttribute(IDebugUIConstants.ATTR_TARGET_RUN_PERSPECTIVE, IDebugUIConstants.PERSPECTIVE_NONE);		
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.eclipse.jdt.internal.debug.ui.snippeteditor.ScrapbookMain"); //$NON-NLS-1$			
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, page.getProject().getName());
-		wc.setAttribute(SCRAPBOOK_LAUNCH, SCRAPBOOK_LAUNCH);
-		wc.setAttribute(SCRAPBOOK_FILE_PATH, page.getFullPath().toString());
-		
-		ILaunchConfiguration config = wc.doSave();
-		setLaunchConfigMemento(page, config.getMemento());
-		return config;		
-	}	
-		
-	/**
-	 * Returns the handle memento for the given scrapbook's launch configuration
-	 * template, or <code>null</code> if none.
-	 */
-	private static String getLaunchConfigMemento(IFile file) {
-		try {
-			return file.getPersistentProperty(SNIPPET_EDITOR_LAUNCH_CONFIG_HANDLE_MEMENTO);
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-		return null;
-	}	
-	
-	/**
-	 * Returns the handle memento for the given scrapbook's launch configuration
-	 * template, or <code>null</code> if none.
-	 */
-	private static void setLaunchConfigMemento(IFile file, String memento) {
-		try {
-			file.setPersistentProperty(SNIPPET_EDITOR_LAUNCH_CONFIG_HANDLE_MEMENTO, memento);
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.log(e);
-		}
-	}	
-
-	/**
-	 * Returns the launch manager.
-	 */
-	protected static ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Returns the working directory attribute for the given snippet file,
-	 * possibly <code>null</code>.
-	 * 
-	 * @exception CoreException if unable to retrieve the attribute
-	 */
-	public static String getWorkingDirectoryAttribute(IFile file) throws CoreException {
-		ILaunchConfiguration config = getLaunchConfigurationTemplate(file);
-		if (config != null) {
-			return config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String)null);
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the VM install used to launch the given snippet file.
-	 * 
-	 * @exception CoreException if unable to retrieve the attribute
-	 */
-	public static IVMInstall getVMInstall(IFile file) throws CoreException {
-		ILaunchConfiguration config = getLaunchConfigurationTemplate(file);
-		if (config == null) {
-			IJavaProject pro = JavaCore.create(file.getProject());
-			return JavaRuntime.getVMInstall(pro);
-		} else {
-			return JavaRuntime.computeVMInstall(config);
-		}
-	}	
-	
-	/**
-	 * Deletes any scrapbook launch configurations for scrapbooks that
-	 * have been deleted. Rather than listening to all resource deltas,
-	 * configs are deleted each time a scrapbook is launched - which is
-	 * infrequent.
-	 */
-	public void cleanupLaunchConfigurations() {
-		try {
-			ILaunchConfigurationType lcType = getLaunchManager().getLaunchConfigurationType(IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION);
-			ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations(lcType);
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			for (int i = 0; i < configs.length; i++) {
-				String path = configs[i].getAttribute(SCRAPBOOK_FILE_PATH, (String)null);
-				if (path != null) {
-					IPath pagePath = new Path(path);
-					IResource res = root.findMember(pagePath);
-					if (res == null) {
-						// config without a page - delete it
-						configs[i].delete();
-					}
-				}
-			}
-		} catch (CoreException e) {
-			// log quietly
-			JDIDebugUIPlugin.log(e);
-		}
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain.java
deleted file mode 100644
index ff68aa2..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain1.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain1.java
deleted file mode 100644
index a025305..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/ScrapbookMain1.java
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java
deleted file mode 100644
index e5a81fd..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-import org.eclipse.jdt.ui.ISharedImages;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jface.dialogs.Dialog;

-

-public class SelectImportsAction extends SnippetAction {

-	

-	public SelectImportsAction(JavaSnippetEditor editor) {

-		super(editor);

-		setText(SnippetMessages.getString("SelectImports.label")); //$NON-NLS-1$

-		setToolTipText(SnippetMessages.getString("SelectImports.tooltip")); //$NON-NLS-1$

-		setDescription(SnippetMessages.getString("SelectImports.description")); //$NON-NLS-1$

-		ISharedImages sharedImages= JavaUI.getSharedImages();

-		setImageDescriptor(sharedImages.getImageDescriptor(sharedImages.IMG_OBJS_IMPCONT));

-	}

-	

-	/**

-	 * @see IAction#run()

-	 */

-	public void run() {

-		if (!getEditor().isInJavaProject()) {

-			getEditor().reportNotInJavaProjectError();

-			return;

-		}

-		chooseImports();

-	} 

-	

-	private void chooseImports() {

-		String[] imports= getEditor().getImports();

-		Dialog dialog= new SelectImportsDialog(getEditor(), imports);

-		dialog.open();		

-	}

-	

-	/**

-	 * @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)

-	 */

-	public void snippetStateChanged(JavaSnippetEditor editor) {

-		setEnabled(editor != null && !editor.isEvaluating());

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
deleted file mode 100644
index 51f1354..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */ 
- 
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.internal.debug.ui.ExceptionHandler;
-import org.eclipse.jdt.internal.debug.ui.Filter;
-import org.eclipse.jdt.internal.debug.ui.FilterLabelProvider;
-import org.eclipse.jdt.internal.debug.ui.FilterViewerSorter;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ColumnLayoutData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-public class SelectImportsDialog extends TitleAreaDialog {
-
-	private String[] fImports;
-	private Button fAddPackageButton;
-	private Button fAddTypeButton;
-	private Button fRemoveImportsButton;
-	private TableViewer fImportsViewer;
-	private Table fImportsTable;
-	private JavaSnippetEditor fEditor;
-	
-	private ImportsContentProvider fImportContentProvider;
-	
-	/**
-	 * Content provider for the table.  Content consists of instances of Filter.
-	 */	
-	protected class ImportsContentProvider implements IStructuredContentProvider {
-		
-		private TableViewer fViewer;
-		private List fImportNames;
-		
-		public ImportsContentProvider(TableViewer viewer) {
-			fViewer = viewer;
-			populateImports();
-		}
-		
-		protected void populateImports() {
-			fImportNames= new ArrayList(1);
-			if (fImports != null) {
-				for (int i = 0; i < fImports.length; i++) {
-					String name = fImports[i];
-					addImport(name);
-				}
-			}
-		}
-		
-		protected void addImport(String name) {
-			Filter imprt = new Filter(name, false);
-			if (!fImportNames.contains(imprt)) {
-				fImportNames.add(imprt);
-				fViewer.add(imprt);
-			}
-		}
-		
-		
-		protected void removeImports(Object[] imports) {
-			for (int i = 0; i < imports.length; i++) {
-				Filter imprt = (Filter)imports[i];
-				fImportNames.remove(imprt);
-			}
-			fViewer.remove(imports);
-		}
-		
-		/**
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return fImportNames.toArray();
-		}
-		
-		/**
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-		
-		/**
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}		
-	}
-	
-	public SelectImportsDialog(JavaSnippetEditor editor, String[] imports) {
-		super(editor.getShell());
-		fEditor= editor;
-		fImports= imports;
-	}
-	
-	private void createImportButtons(Composite container) {
-		// button container
-		Composite buttonContainer = new Composite(container, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-		GridLayout buttonLayout = new GridLayout();
-		buttonLayout.numColumns = 1;
-		buttonLayout.marginHeight = 0;
-		buttonLayout.marginWidth = 0;
-		buttonContainer.setLayout(buttonLayout);
-		
-		// Add type button
-		fAddTypeButton = new Button(buttonContainer, SWT.PUSH);
-		fAddTypeButton.setText(SnippetMessages.getString("SelectImportsDialog.Add_&Type_1")); //$NON-NLS-1$
-		fAddTypeButton.setToolTipText(SnippetMessages.getString("SelectImportsDialog.Choose_a_Type_to_Add_as_an_Import_2")); //$NON-NLS-1$
-		gd = getButtonGridData(fAddTypeButton);
-		fAddTypeButton.setLayoutData(gd);
-		fAddTypeButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				addType();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		
-		// Add package button
-		fAddPackageButton = new Button(buttonContainer, SWT.PUSH);
-		fAddPackageButton.setText(SnippetMessages.getString("SelectImportsDialog.Add_&Package_3")); //$NON-NLS-1$
-		fAddPackageButton.setToolTipText(SnippetMessages.getString("SelectImportsDialog.Choose_a_Package_to_Add_as_an_Import_4")); //$NON-NLS-1$
-		gd = getButtonGridData(fAddPackageButton);
-		fAddPackageButton.setLayoutData(gd);
-		fAddPackageButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				addPackage();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		
-		// Remove button
-		fRemoveImportsButton = new Button(buttonContainer, SWT.PUSH);
-		fRemoveImportsButton.setText(SnippetMessages.getString("SelectImportsDialog.&Remove_5")); //$NON-NLS-1$
-		fRemoveImportsButton.setToolTipText(SnippetMessages.getString("SelectImportsDialog.Remove_All_Selected_Imports_6")); //$NON-NLS-1$
-		gd = getButtonGridData(fRemoveImportsButton);
-		fRemoveImportsButton.setLayoutData(gd);
-		fRemoveImportsButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent se) {
-				removeImports();
-			}
-			public void widgetDefaultSelected(SelectionEvent se) {
-			}
-		});
-		fRemoveImportsButton.setEnabled(false);
-		
-	}
-	
-	private GridData getButtonGridData(Button button) {
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		GC gc = new GC(button);
-		gc.setFont(button.getFont());
-		FontMetrics fontMetrics= gc.getFontMetrics();
-		gc.dispose();
-		int widthHint= Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint= Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		
-		gd.heightHint= Dialog.convertVerticalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_HEIGHT);
-		return gd;
-	}
-		
-	private void removeImports() {
-		IStructuredSelection selection = (IStructuredSelection)fImportsViewer.getSelection();		
-		fImportContentProvider.removeImports(selection.toArray());
-	}
-	
-	private void addPackage() {
-		Shell shell= fAddPackageButton.getDisplay().getActiveShell();
-		SelectionDialog dialog = null;
-		try {
-			IJavaProject project= fEditor.getJavaProject();
-			List projects= new ArrayList();
-			projects.add(project);
-			IPackageFragmentRoot[] roots= project.getAllPackageFragmentRoots();
-			for (int i = 0; i < roots.length; i++) {
-				IPackageFragmentRoot root = roots[i];
-				projects.add(root.getParent());
-			}
-			dialog = JDIDebugUIPlugin.createAllPackagesDialog(shell, (IJavaProject[])projects.toArray(new IJavaProject[projects.size()]), false);
-		} catch (JavaModelException jme) {
-			String title= SnippetMessages.getString("SelectImportsDialog.Add_package_as_import_7"); //$NON-NLS-1$
-			String message= SnippetMessages.getString("SelectImportsDialog.Could_not_open_package_selection_dialog_8");  //$NON-NLS-1$
-			ExceptionHandler.handle(jme, title, message);
-			return;			
-		}
-	
-		dialog.setTitle(SnippetMessages.getString("SelectImportsDialog.Add_package_as_import_7"));  //$NON-NLS-1$
-		dialog.setMessage(SnippetMessages.getString("SelectImportsDialog.&Select_a_package_to_add_as_an_Import_10")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID) {
-			return;
-		}
-		Object[] packages= dialog.getResult();
-		if (packages != null && packages.length > 0) {
-			IJavaElement pkg = (IJavaElement)packages[0];
-			String filter = pkg.getElementName();
-			filter += ".*"; //$NON-NLS-1$
-			fImportContentProvider.addImport(filter);
-		}		
-	}
-				
-	private void addType() {
-		Shell shell= fAddTypeButton.getDisplay().getActiveShell();
-		SelectionDialog dialog= null;
-		try {
-			dialog= JavaUI.createTypeDialog(shell, new ProgressMonitorDialog(shell),
-				SearchEngine.createJavaSearchScope(new IJavaElement[]{fEditor.getJavaProject()}, true), IJavaElementSearchConstants.CONSIDER_TYPES, false);
-		} catch (JavaModelException jme) {
-			String title= SnippetMessages.getString("SelectImportsDialog.Add_Type_as_Import_12"); //$NON-NLS-1$
-			String message= SnippetMessages.getString("SelectImportsDialog.Could_not_open_class_selection_dialog_13"); //$NON-NLS-1$
-			ExceptionHandler.handle(jme, title, message);
-			return;
-		}
-	
-		dialog.setTitle(SnippetMessages.getString("SelectImportsDialog.Add_Type_as_Import_12")); //$NON-NLS-1$
-		dialog.setMessage(SnippetMessages.getString("SelectImportsDialog.&Select_a_type_to_add_to_add_as_an_import_15")); //$NON-NLS-1$
-		if (dialog.open() == IDialogConstants.CANCEL_ID) {
-			return;
-		}
-		
-		Object[] types= dialog.getResult();
-		if (types != null && types.length > 0) {
-			IType type = (IType)types[0];
-			fImportContentProvider.addImport(type.getFullyQualifiedName());
-		}		
-	}
-	
-	/**
-	 * Creates composite control and sets the default layout data.
-	 *
-	 * @param parent  the parent of the new composite
-	 * @param numColumns  the number of columns for the new composite
-	 * @param labelText  the text label of the new composite
-	 * @return the newly-created composite
-	 */
-	private Composite createLabelledComposite(Composite parent, int numColumns, String labelText) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		
-		//GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		comp.setLayout(layout);
-
-		//GridData
-		GridData gd= new GridData();
-		gd.verticalAlignment = GridData.FILL;
-		gd.horizontalAlignment = GridData.FILL;
-		comp.setLayoutData(gd);
-		
-		//Label
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(labelText);
-		gd = new GridData();
-		gd.horizontalSpan = numColumns;
-		label.setLayoutData(gd);
-
-		return comp;
-	}
-	/**
-	 * @see Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogComp = (Composite)super.createDialogArea(parent);
-		// top level container
-		Composite outer = new Composite(dialogComp, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		topLayout.marginHeight = 5;
-		topLayout.marginWidth = 0;
-		outer.setLayout(topLayout);
-		
-		setTitle(MessageFormat.format(SnippetMessages.getString("SelectImportsDialog.Manage_the_Java_Snippet_Editor_Imports_for___{0}__1"), new String[]{fEditor.getPage().getName()})); //$NON-NLS-1$
-		
-		GridData gd = new GridData();
-		gd.verticalAlignment = GridData.FILL;
-		gd.horizontalAlignment = GridData.FILL;
-		outer.setLayoutData(gd);
-		
-		// filter table
-		fImportsTable= new Table(outer, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-		
-		TableLayout tableLayout= new TableLayout();
-		ColumnLayoutData[] columnLayoutData= new ColumnLayoutData[1];
-		columnLayoutData[0]= new ColumnWeightData(100);		
-		tableLayout.addColumnData(columnLayoutData[0]);
-		fImportsTable.setLayout(tableLayout);
-		new TableColumn(fImportsTable, SWT.NONE);
-
-		fImportsViewer = new TableViewer(fImportsTable);
-		fImportsViewer.setLabelProvider(new FilterLabelProvider());
-		fImportsViewer.setSorter(new FilterViewerSorter());
-		fImportContentProvider = new ImportsContentProvider(fImportsViewer);
-		fImportsViewer.setContentProvider(fImportContentProvider);
-		// input just needs to be non-null
-		fImportsViewer.setInput(this);
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gd.widthHint = 100;
-		gd.heightHint= 300;
-		fImportsViewer.getTable().setLayoutData(gd);
-		fImportsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = event.getSelection();
-				if (selection.isEmpty()) {
-					fRemoveImportsButton.setEnabled(false);
-				} else {
-					fRemoveImportsButton.setEnabled(true);					
-				}
-			}
-		});		
-		
-		createImportButtons(outer);
-		return outer;
-	}
-
-	/**
-	 * @see Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		String[] imports= null;
-		Object[] results= fImportContentProvider.getElements(null);
-		if (results != null && results.length > 0) {
-			imports= new String[results.length];
-			for (int i = 0; i < results.length; i++) {
-				Filter imprt = (Filter)results[i];
-				imports[i]= imprt.getName();
-			}
-		}
-		fEditor.setImports(imports);
-		super.okPressed();
-	}
-	
-	/**
-	 * Sets the title for the dialog and establishes the help context.
-	 * 
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell);
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(SnippetMessages.getString("SelectImportsDialog.Java_Snippet_Imports_18")); //$NON-NLS-1$
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetAction.java
deleted file mode 100644
index 33766c3..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.text.ITextSelection;

-

-/**

- * Base class for evaluation state dependent actions and

- * supports to retarget the action to a different viewer.

- */

-public abstract class SnippetAction extends Action implements ISnippetStateChangedListener {

-		

-	private JavaSnippetEditor fEditor;

-	

-	public SnippetAction(JavaSnippetEditor editor) {

-		setEditor(editor);

-	}

-		

-	public void setEditor(JavaSnippetEditor editor) {

-		if (fEditor != null) {

-			fEditor.removeSnippetStateChangedListener(this);

-		}

-		fEditor= editor;

-		if (fEditor != null) {

-			fEditor.addSnippetStateChangedListener(this);

-			snippetStateChanged(fEditor);

-		}

-	} 

-	

-	/**

-	 * @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)

-	 */

-	public void snippetStateChanged(JavaSnippetEditor editor) {

-		if (editor != null && !editor.isEvaluating()) {

-			update();

-		} else {

-			setEnabled(false);

-		}

-	}

-	

-	protected boolean textHasContent(String text) {

-		int length= text.length();

-		if (length > 0) {

-			for (int i= 0; i < length; i++) {

-				if (Character.isLetterOrDigit(text.charAt(i))) {

-					return true;

-				}

-			}

-		}

-		return false;

-	}

-	

-	/**

-	 * Updates the enabled state based on the current text selection.

-	 */

-	protected void update() {

-		if (fEditor != null) {

-			ITextSelection selection= (ITextSelection)fEditor.getSelectionProvider().getSelection();

-			String text= selection.getText();

-			boolean enabled= false;

-			if (text != null) {

-				enabled= textHasContent(text);

-			} 

-			setEnabled(enabled);

-		} else {

-			setEnabled(false);

-		}

-	}

-	

-	protected JavaSnippetEditor getEditor() {

-		return fEditor;

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorActionContributor.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorActionContributor.java
deleted file mode 100644
index 7dc3889..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorActionContributor.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;

-import org.eclipse.jdt.internal.ui.javaeditor.BasicEditorActionContributor;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbenchActionConstants;

-

-/**

- * Contributions of the Java Snippet Editor to the Workbench's tool and menu bar.

- */

-public class SnippetEditorActionContributor extends BasicEditorActionContributor {

- 	

-	protected JavaSnippetEditor fSnippetEditor;

-	

-	private RunSnippetAction fRunSnippetAction;

-	private StopAction fStopAction;

-	private SelectImportsAction fSelectImportsAction;

-	private SnippetOpenOnSelectionAction fOpenOnSelectionAction;

-	private SnippetOpenHierarchyOnSelectionAction fOpenOnTypeSelectionAction;

-	

-	public SnippetEditorActionContributor() {

-		super();

-	}

-	

-	/**

-	 * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)

-	 */

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		

-		if (fRunSnippetAction == null) {

-			toolBarManager.add(new Separator(IJavaDebugUIConstants.EVALUATION_GROUP));

-			return;

-		}

-		super.contributeToToolBar(toolBarManager);

-		

-		toolBarManager.add(fRunSnippetAction);

-		toolBarManager.add(fStopAction);

-		toolBarManager.add(fSelectImportsAction);

-		toolBarManager.update(false);

-	}

-			

-	/**

-	 *	@see EditorActionBarContributor#contributeToMenu(IMenuManager)

-	 */

-	public void contributeToMenu(IMenuManager menu) {

-		if (fOpenOnSelectionAction == null) {

-			return;

-		}

-		super.contributeToMenu(menu);

-		

-		IMenuManager navigateMenu= menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE);

-		if (navigateMenu != null) {

-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fOpenOnSelectionAction);

-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fOpenOnTypeSelectionAction);

-			navigateMenu.setVisible(true);

-		}

-	}

-	

-	/**

-	 *	@see IEditorActionBarContributor#setActiveEditor(IEditorPart)

-	 */

-	public void setActiveEditor(IEditorPart part) {

-		

-		super.setActiveEditor(part);

-		fSnippetEditor= null;

-		if (part instanceof JavaSnippetEditor) {

-			fSnippetEditor= (JavaSnippetEditor) part;

-			if (fOpenOnSelectionAction == null) {

-				initializeActions();

-				contributeToMenu(getActionBars().getMenuManager());

-				contributeToToolBar(getActionBars().getToolBarManager());

-			}

-		}

-

-		if (fOpenOnSelectionAction != null) {

-			fStopAction.setEditor(fSnippetEditor);		

-			fRunSnippetAction.setEditor(fSnippetEditor);

-			fSelectImportsAction.setEditor(fSnippetEditor);

-			fOpenOnSelectionAction.setEditor(fSnippetEditor);

-			fOpenOnTypeSelectionAction.setEditor(fSnippetEditor);

-		}

-			

-		updateStatus(fSnippetEditor);			

-	}

-	 

-	protected void initializeActions() {

-		 

-		fOpenOnSelectionAction= new SnippetOpenOnSelectionAction(fSnippetEditor);

-		fOpenOnTypeSelectionAction= new SnippetOpenHierarchyOnSelectionAction(fSnippetEditor);

-		fRunSnippetAction= new RunSnippetAction(fSnippetEditor);

-		fStopAction= new StopAction(fSnippetEditor);

-		fSelectImportsAction= new SelectImportsAction(fSnippetEditor);

-	}	

-	

-	protected void updateStatus(JavaSnippetEditor editor) {

-		String message= ""; //$NON-NLS-1$

-		if (editor != null && editor.isEvaluating()) {

-			message= SnippetMessages.getString("SnippetActionContributor.evalMsg");  //$NON-NLS-1$

-		} 

-		getActionBars().getStatusLineManager().setMessage(message);

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
deleted file mode 100644
index ea83054..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetEditorPropertyPage.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.WorkingDirectoryBlock;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-/**
- * Page to set working directory property on scrapbook page.
- */
-public class SnippetEditorPropertyPage extends PropertyPage {
-	
-
-
-	private WorkingDirectoryBlock fWorkingDirBlock = new WorkingDirectoryBlock();
-	
-	private JavaJRETab fJRETab = new JavaJRETab();
-	
-	// launch config template for this scrapbook file
-	private ILaunchConfiguration fConfig;
-	private ILaunchConfigurationWorkingCopy fWorkingCopy;
-	
-	private Proxy fProxy;
-
-	class Proxy implements ILaunchConfigurationDialog {
-		/**
-		 * @see ILaunchConfigurationDialog#generateName(String)
-		 */
-		public String generateName(String name) {
-			return null;
-		}
-
-		/**
-		 * @see ILaunchConfigurationDialog#getMode()
-		 */
-		public String getMode() {
-			return ILaunchManager.DEBUG_MODE;
-		}
-
-		/**
-		 * @see ILaunchConfigurationDialog#getTabs()
-		 */
-		public ILaunchConfigurationTab[] getTabs() {
-			return new ILaunchConfigurationTab[] {fWorkingDirBlock};
-		}
-
-		/**
-		 * @see ILaunchConfigurationDialog#getActiveTab()
-		 */
-		public ILaunchConfigurationTab getActiveTab() {
-			return fWorkingDirBlock;
-		}
-
-		/**
-		 * @see ILaunchConfigurationDialog#setName(String)
-		 */
-		public void setName(String name) {
-		}
-
-		/**
-		 * @see ILaunchConfigurationDialog#updateButtons()
-		 */
-		public void updateButtons() {
-			
-		}
-
-		/**
-		 * @see ILaunchConfigurationDialog#updateMessage()
-		 */
-		public void updateMessage() {
-			setValid(isValid());
-			setMessage(getMessage());
-			setErrorMessage(getErrorMessage());
-		}
-
-		/**
-		 * @see IRunnableContext#run(boolean, boolean, IRunnableWithProgress)
-		 */
-		public void run(
-			boolean fork,
-			boolean cancelable,
-			IRunnableWithProgress runnable)
-			throws InvocationTargetException, InterruptedException {
-		}
-
-	}
-		
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 1;
-		comp.setLayout(topLayout);				
-		
-		// fake launch config dialog
-		fProxy = new Proxy();
-		
-		try {
-			fConfig = ScrapbookLauncher.getLaunchConfigurationTemplate(getFile());
-			if (fConfig != null) {
-				fWorkingCopy = fConfig.getWorkingCopy();
-			}
-		} catch (CoreException e) {
-			// unable to retrieve launch config, create a new one
-			fConfig = null;
-			fWorkingCopy = null;
-			JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("SnippetEditorPropertyPage.Unable_to_retrieve_scrapbook_runtime_settings._Settings_will_revert_to_defaults._1"), e); //$NON-NLS-1$
-		}
-
-		if (fConfig == null) {
-			try {
-				fConfig = ScrapbookLauncher.createLaunchConfigurationTemplate(getFile());
-				fWorkingCopy = fConfig.getWorkingCopy();
-			} catch (CoreException e) {
-				JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("SnippetEditorPropertyPage.Unable_to_create_launch_configuration_for_scrapbook_file_2"), e); //$NON-NLS-1$
-			}
-		}
-				
-		fWorkingDirBlock.setLaunchConfigurationDialog(fProxy);
-		fWorkingDirBlock.createControl(comp);		
-		fWorkingDirBlock.initializeFrom(fConfig);
-		
-		fJRETab.setLaunchConfigurationDialog(fProxy);
-		fJRETab.setVMSpecificArgumentsVisible(false);
-		fJRETab.createControl(comp);
-		
-		fWorkingDirBlock.initializeFrom(fConfig);
-		fJRETab.initializeFrom(fConfig);
-		
-		return comp;
-	}
-	
-	/**
-	 * Returns the snippet page (file)
-	 */
-	protected IFile getFile() {
-		return (IFile)getElement();
-	}
-	
-	/**
-	 * @see PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		fWorkingDirBlock.setDefaults(fWorkingCopy);
-		fJRETab.setDefaults(fWorkingCopy);
-		fWorkingDirBlock.initializeFrom(fWorkingCopy);
-		fJRETab.initializeFrom(fWorkingCopy);
-	}
-	
-	/**
-	 * @see IPreferencePage#isValid()
-	 */
-	public boolean isValid() {
-		return fWorkingDirBlock.isValid(fConfig);
-	}
-
-	/**
-	 * @see IDialogPage#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		String message = fWorkingDirBlock.getErrorMessage();
-		if (message == null) {
-			return fJRETab.getErrorMessage();
-		}
-		return message;
-	}
-
-	/**
-	 * @see IMessageProvider#getMessage()
-	 */
-	public String getMessage() {
-		String message = fWorkingDirBlock.getMessage();
-		if (message == null) {
-			return fJRETab.getMessage();
-		}
-		return message;
-	}
-
-	/**
-	 * @see IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		fWorkingDirBlock.performApply(fWorkingCopy);
-		fJRETab.performApply(fWorkingCopy);
-		try {
-			if (!fWorkingCopy.contentsEqual(fConfig)) {
-				fConfig = fWorkingCopy.doSave();
-				fWorkingCopy = fConfig.getWorkingCopy();
-			}
-		} catch (CoreException e) {
-			JDIDebugUIPlugin.errorDialog(SnippetMessages.getString("SnippetEditorPropertyPage.Unable_to_save_scrapbook_settings._3"), e); //$NON-NLS-1$
-		}
-		return super.performOk();
-	}
-}
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetFileDocumentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetFileDocumentProvider.java
deleted file mode 100644
index e73c6b0..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetFileDocumentProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jdt.internal.ui.JavaPlugin;

-import org.eclipse.jdt.ui.text.JavaTextTools;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.IDocumentPartitioner;

-import org.eclipse.ui.editors.text.FileDocumentProvider;

-

-public class SnippetFileDocumentProvider extends FileDocumentProvider {

-	

-	/**

-	 * @see AbstractDocumentProvider#createDocument(Object)

-	 */ 

-	protected IDocument createDocument(Object element) throws CoreException {

-		IDocument document= super.createDocument(element);

-		JavaTextTools tools= JavaPlugin.getDefault().getJavaTextTools();

-		IDocumentPartitioner partitioner= tools.createDocumentPartitioner();

-		partitioner.connect(document);

-		document.setDocumentPartitioner(partitioner);

-		return document;

-	}		

-}

-

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.java
deleted file mode 100644
index 59e3afd..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-public class SnippetMessages {

-

-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.debug.ui.snippeteditor.SnippetMessages";//$NON-NLS-1$

-

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-	private SnippetMessages() {

-	}

-

-	public static String getString(String key) {

-		try {

-			return fgResourceBundle.getString(key);

-		} catch (MissingResourceException e) {

-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

-		}

-	}

-	

-	/**

-	 * Gets a string from the resource bundle and formats it with the argument

-	 * 

-	 * @param key	the string used to get the bundle value, must not be null

-	 */

-	public static String getFormattedString(String key, Object arg) {

-		String format= null;

-		try {

-			format= fgResourceBundle.getString(key);

-		} catch (MissingResourceException e) {

-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$

-		}

-		if (arg == null)

-			arg= ""; //$NON-NLS-1$

-		return MessageFormat.format(format, new Object[] { arg });

-	}

-

-	static ResourceBundle getBundle() {

-		return fgResourceBundle;

-	}

-}

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.properties
deleted file mode 100644
index 0f04c10..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetMessages.properties
+++ /dev/null
@@ -1,92 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial implementation

-######################################################################

-

-CompletionProcessor.errorMessage=Cannot access the snippet page

-CompletionProcessor.errorTitle=Problem Accessing Page

-

-JavaSnippetEditor._is_not_a_Java_Project._n_1=\ is not a Java Project.\n

-JavaSnippetEditor.Problems_During_Save_As..._3=Problems During Save As...

-JavaSnippetEditor.Save_could_not_be_completed.__4=Save could not be completed. 

-JavaSnippetEditor.Unable_to_perform_evaluation_outside_of_a_Java_Project_2=Unable to perform evaluation outside of a Java Project

-

-RunAction.description=Run the selected code

-RunAction.label=R&un Snippet

-RunAction.tooltip=Run the Selected Code

-

-ScrapbookLauncher.error.pagenotfound=Could not find a scrapbook page to launch

-ScrapbookLauncher.error.title=Java Scrapbook Launcher

-ScrapbookLauncher.Exception_occurred_launching_scrapbook_1=Exception occurred launching scrapbook

-ScrapbookLauncher.Unable_to_launch_scrapbook_VM_6=Unable to launch scrapbook VM

-

-SelectImports.description=Sets the Import Declarations with which Code is Run

-SelectImports.label=Set Impo&rts

-SelectImports.tooltip=Sets the Import Declarations for Running Code

-

-SelectImportsDialog.&Remove_5=&Remove

-SelectImportsDialog.&Select_a_package_to_add_as_an_Import_10=&Select a package to add as an import:

-SelectImportsDialog.&Select_a_type_to_add_to_add_as_an_import_15=&Select a type to add as an import:

-SelectImportsDialog.Add_&Package_3=Add &Package...

-SelectImportsDialog.Add_&Type_1=Add &Type...

-SelectImportsDialog.Add_package_as_import_7=Add Package as Import

-SelectImportsDialog.Add_Type_as_Import_12=Add Type as Import

-SelectImportsDialog.Choose_a_Package_to_Add_as_an_Import_4=Choose a Package to Add as an Import

-SelectImportsDialog.Choose_a_Type_to_Add_as_an_Import_2=Choose a Type to Add as an Import

-SelectImportsDialog.Could_not_open_class_selection_dialog_13=Could not open class selection dialog

-SelectImportsDialog.Could_not_open_package_selection_dialog_8=Could not open package selection dialog

-SelectImportsDialog.Java_Snippet_Imports_18=Java Snippet Imports

-SelectImportsDialog.Manage_the_Java_Snippet_Editor_Imports_for___{0}__1=Manage the Java Snippet Editor Imports for \"{0}\"

-SelectImportsDialog.Remove_All_Selected_Imports_6=Remove All Selected Imports

-

-SnippetActionContributor.evalMsg=Evaluating...

-

-SnippetEditor.ContentAssistProposal.description=Content Assist

-SnippetEditor.ContentAssistProposal.label=Co&ntent Assist@Ctrl+Space

-SnippetEditor.ContentAssistProposal.tooltip=Content Assist

-SnippetEditor.ellipsis=...

-SnippetEditor.error.evaluating=Problems evaluating expression

-SnippetEditor.error.evaluating2=Error during evaluation

-SnippetEditor.error.imports=Error setting imports for page

-SnippetEditor.error.interrupted=\ (Evaluation interrupted)

-SnippetEditor.error.nocontext=Evaluation failed: internal error - unable to obtain an execution context.

-SnippetEditor.error.shutdown=Cannot shutdown VM

-SnippetEditor.error.toString=Problems evaluating toString of expression

-SnippetEditor.error.unqualified=Unqualified Error

-SnippetEditor.evaluating=Evaluating...

-SnippetEditor.exception=An exception occurred during evaluation:  {0}

-SnippetEditor.noreturnvalue=\ (No explicit return value)

-SnippetEditor.typename= ({0}) 

-SnippetEditor.warning.cpchange=The class path of the Project has changed. Restarting the evaluation context.

-SnippetEditor.warning=Warning

-SnippetEditor.Warning_1=Warning

-SnippetEditor.The_working_directory_has_changed._Restarting_the_evaluation_context._2=The working directory has changed. Restarting the evaluation context.

-SnippetEditor.The_JRE_has_changed._Restarting_the_evaluation_context._2=The JRE has changed. Restarting the evaluation context.

-

-SnippetOpenHierarchyOnSelectionAction.description=Show the type hierarchy of the selected element

-SnippetOpenHierarchyOnSelectionAction.label=Open Type Hie&rarchy@F4

-SnippetOpenHierarchyOnSelectionAction.tooltip=Show the type hierarchy of the selected element

-SnippetOpenHierarchyOnSelectionDialog.message=&Select the type to open:

-SnippetOpenHierarchyOnSelectionDialog.title=Open Type Hierarchy

-

-SnippetOpenOnSelectionAction.description=Open an editor on the selected element

-SnippetOpenOnSelectionAction.label=&Open Declaration@F3

-SnippetOpenOnSelectionAction.tooltip=Open an editor on the selected element

-SnippetOpenOnSelectionDialog.message=&Select or enter the element to open:

-SnippetOpenOnSelectionDialog.title=Open on Selection

-

-StopAction.description=Stop the evaluation and terminate the evaluation context

-StopAction.label=St&op Evaluation

-StopAction.tooltip=Stop the Evaluation

-

-ScrapbookLauncher.Unable_to_retrieve_scrapbook_runtime_settings._Settings_will_revert_to_default._1=Unable to retrieve scrapbook runtime settings. Settings will revert to default.

-

-SnippetEditorPropertyPage.Unable_to_retrieve_scrapbook_runtime_settings._Settings_will_revert_to_defaults._1=Unable to retrieve scrapbook runtime settings. Settings will revert to defaults.

-SnippetEditorPropertyPage.Unable_to_create_launch_configuration_for_scrapbook_file_2=Unable to create launch configuration for scrapbook file

-SnippetEditorPropertyPage.Unable_to_save_scrapbook_settings._3=Unable to save scrapbook settings.

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenHierarchyOnSelectionAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenHierarchyOnSelectionAction.java
deleted file mode 100644
index dcaca8c..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenHierarchyOnSelectionAction.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.ISourceReference;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.ui.JavaElementLabelProvider;

-import org.eclipse.jdt.ui.actions.OpenTypeHierarchyAction;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.ElementListSelectionDialog;

-

-/**

- * This action opens a Java editor on the element represented by text selection of

- * the connected java source editor. In addition, if the element is a type, it also 

- * opens shows the element in the type hierarchy viewer.

- */

-public class SnippetOpenHierarchyOnSelectionAction extends OpenTypeHierarchyAction {

-	

-	private JavaSnippetEditor fEditor;

-	private String fDialogTitle;

-	private String fDialogMessage;

-	

-	public SnippetOpenHierarchyOnSelectionAction(JavaSnippetEditor editor) {

-		super(editor.getSite());

-		fEditor= editor;

-		setResources();

-	}

-	

-	protected void setResources() {

-		setText(SnippetMessages.getString("SnippetOpenHierarchyOnSelectionAction.label")); //$NON-NLS-1$

-		setDescription(SnippetMessages.getString("SnippetOpenHierarchyOnSelectionAction.tooltip")); //$NON-NLS-1$

-		setToolTipText(SnippetMessages.getString("SnippetOpenHierarchyOnSelectionAction.description")); //$NON-NLS-1$

-		setDialogTitle(SnippetMessages.getString("SnippetOpenHierarchyOnSelectionDialog.title")); //$NON-NLS-1$

-		setDialogMessage(SnippetMessages.getString("SnippetOpenHierarchyOnSelectionDialog.message")); //$NON-NLS-1$

-	}

-	

-	protected void setDialogTitle(String title) {

-		fDialogTitle= title;

-	}

-	

-	protected void setDialogMessage(String message) {

-		fDialogMessage= message;

-	}

-	

-	public void run() {

-		if (fEditor == null) {

-			return;

-		}

-		try {

-			IJavaElement[] result= fEditor.codeResolve();

-			if (result != null && result.length > 0) {

-				IJavaElement chosen= selectJavaElement(filterResolveResults(result), getShell(), fDialogTitle, fDialogMessage);

-				if (chosen != null) {

-					run(new StructuredSelection(chosen));

-					return;

-				}

-			}

-		} catch (JavaModelException x) {

-			JDIDebugUIPlugin.log(x);

-		}

-		

-		getShell().getDisplay().beep();		

-	}

-	

-	protected void setEditor(JavaSnippetEditor contentEditor) {

-		fEditor= contentEditor;

-	}

-	

-	/**

-	 * Filters out source references from the given code resolve results.

-	 * A utility method that can be called by subclassers. 

-	 */

-	protected List filterResolveResults(IJavaElement[] codeResolveResults) {

-		int nResults= codeResolveResults.length;

-		List refs= new ArrayList(nResults);

-		for (int i= 0; i < nResults; i++) {

-			if (codeResolveResults[i] instanceof ISourceReference)

-				refs.add(codeResolveResults[i]);

-		}

-		return refs;

-	}

-			

-

-	/**

-	 * Shows a dialog for resolving an ambigous java element.

-	 * Utility method that can be called by subclassers.

-	 */

-	protected IJavaElement selectJavaElement(List elements, Shell shell, String title, String message) {

-		

-		int nResults= elements.size();

-		

-		if (nResults == 0)

-			return null;

-		

-		if (nResults == 1)

-			return (IJavaElement) elements.get(0);

-		

-		int flags= JavaElementLabelProvider.SHOW_DEFAULT

-						| JavaElementLabelProvider.SHOW_QUALIFIED

-						| JavaElementLabelProvider.SHOW_ROOT;

-						

-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(shell, new JavaElementLabelProvider(flags));

-		dialog.setTitle(title);

-		dialog.setMessage(message);

-		dialog.setElements(elements.toArray());

-		

-		if (dialog.open() == dialog.OK) {

-			Object[] selection= dialog.getResult();

-			if (selection != null && selection.length > 0) {

-				nResults= selection.length;

-				for (int i= 0; i < nResults; i++) {

-					Object current= selection[i];

-					if (current instanceof IJavaElement)

-						return (IJavaElement) current;

-				}

-			}

-		}		

-		return null;

-	}

-}

-

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenOnSelectionAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenOnSelectionAction.java
deleted file mode 100644
index 07fe818..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SnippetOpenOnSelectionAction.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.ISourceReference;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;

-import org.eclipse.jdt.ui.JavaElementLabelProvider;

-import org.eclipse.jdt.ui.actions.OpenAction;

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.ui.dialogs.ElementListSelectionDialog;

-

-/**

- * This action opens a Java editor on the element represented by text selection of

- * the code snippet.

- */

-public class SnippetOpenOnSelectionAction extends OpenAction {

-	

-	protected JavaSnippetEditor fEditor;

-	private String fDialogTitle;

-	private String fDialogMessage;

-	

-	public SnippetOpenOnSelectionAction(JavaSnippetEditor editor) {

-		super(editor.getSite());

-		fEditor= editor;

-		setResources();

-	}

-	

-	protected void setResources() {

-		setText(SnippetMessages.getString("SnippetOpenOnSelectionAction.label")); //$NON-NLS-1$

-		setDescription(SnippetMessages.getString("SnippetOpenOnSelectionAction.tooltip")); //$NON-NLS-1$

-		setToolTipText(SnippetMessages.getString("SnippetOpenOnSelectionAction.description")); //$NON-NLS-1$

-		setDialogTitle(SnippetMessages.getString("SnippetOpenOnSelectionDialog.title")); //$NON-NLS-1$

-		setDialogMessage(SnippetMessages.getString("SnippetOpenOnSelectionDialog.message")); //$NON-NLS-1$

-	}

-	

-	protected void setDialogTitle(String title) {

-		fDialogTitle= title;

-	}

-	

-	protected void setDialogMessage(String message) {

-		fDialogMessage= message;

-	}

-	

-	protected void setEditor(JavaSnippetEditor contentEditor) {

-		fEditor= contentEditor;

-	}

-	

-	/**

-	 * Shows a dialog for resolving an ambigous java element.

-	 * Utility method that can be called by subclassers.

-	 */

-	protected IJavaElement selectJavaElement(List elements, Shell shell, String title, String message) {

-		

-		int nResults= elements.size();

-		

-		if (nResults == 0)

-			return null;

-		

-		if (nResults == 1)

-			return (IJavaElement) elements.get(0);

-		

-		int flags= JavaElementLabelProvider.SHOW_DEFAULT

-						| JavaElementLabelProvider.SHOW_QUALIFIED

-						| JavaElementLabelProvider.SHOW_ROOT;

-						

-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(shell, new JavaElementLabelProvider(flags));

-		dialog.setTitle(title);

-		dialog.setMessage(message);

-		dialog.setElements(elements.toArray());

-		

-		if (dialog.open() == dialog.OK) {

-			Object[] selection= dialog.getResult();

-			if (selection != null && selection.length > 0) {

-				nResults= selection.length;

-				for (int i= 0; i < nResults; i++) {

-					Object current= selection[i];

-					if (current instanceof IJavaElement)

-						return (IJavaElement) current;

-				}

-			}

-		}		

-		return null;

-	}

-	

-	

-	/**

-	 * Filters out source references from the given code resolve results.

-	 * A utility method that can be called by subclassers. 

-	 */

-	protected List filterResolveResults(IJavaElement[] codeResolveResults) {

-		int nResults= codeResolveResults.length;

-		List refs= new ArrayList(nResults);

-		for (int i= 0; i < nResults; i++) {

-			if (codeResolveResults[i] instanceof ISourceReference)

-				refs.add(codeResolveResults[i]);

-		}

-		return refs;

-	}

-			

-	public void run() {

-		if (fEditor == null) {

-			return;

-		}

-		try {

-			IJavaElement[] result= fEditor.codeResolve();

-			if (result != null && result.length > 0) {

-				IJavaElement chosen= selectJavaElement(filterResolveResults(result), getShell(), fDialogTitle, fDialogMessage);

-				if (chosen != null) {

-					run(new StructuredSelection(chosen));

-					return;

-				}

-			}

-		} catch (JavaModelException x) {

-			JDIDebugUIPlugin.log(x);

-		}

-		

-		getShell().getDisplay().beep();		

-	}

-	/**

-	 * @see SelectionDispatchAction#selectionChanged(ITextSelection)

-	 */

-	protected void selectionChanged(ITextSelection selection) {

-		setEnabled(fEditor != null);

-	}

-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java
deleted file mode 100644
index cdd5709..0000000
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/StopAction.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jdt.internal.debug.ui.snippeteditor;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.jdt.internal.debug.ui.JavaDebugImages;

-

-/**

- * Stops the VM used to run a snippet.

- *

- */

-public class StopAction extends SnippetAction {

-	

-	public StopAction(JavaSnippetEditor editor) {

-		super(editor);

-		

-		setText(SnippetMessages.getString("StopAction.label"));  //$NON-NLS-1$

-		setToolTipText(SnippetMessages.getString("StopAction.tooltip")); //$NON-NLS-1$

-		setDescription(SnippetMessages.getString("StopAction.description"));  //$NON-NLS-1$

-

-		setImageDescriptor(JavaDebugImages.DESC_TOOL_TERMSNIPPET);

-		setDisabledImageDescriptor(JavaDebugImages.DESC_TOOL_TERMSNIPPET_DISABLED);

-		setHoverImageDescriptor(JavaDebugImages.DESC_TOOL_TERMSNIPPET_HOVER);

-	}

-	

-	/**

-	 * @see IAction#run()

-	 */

-	public void run() {

-		getEditor().shutDownVM();

-	}

-	

-	/**

-	 * @see ISnippetStateChangedListener#snippetStateChanged(JavaSnippetEditor)

-	 */

-	public void snippetStateChanged(JavaSnippetEditor editor) {

-		setEnabled(editor != null && editor.isVMLaunched());

-	}

-}

diff --git a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
index 5a4920e..83129be 100644
--- a/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
+++ b/org.eclipse.jdt.debug/jdi/org/eclipse/jdi/internal/connect/PacketReceiveManager.java
@@ -1,215 +1,213 @@
-package org.eclipse.jdi.internal.connect;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.InterruptedIOException;

-import java.util.LinkedList;

-import java.util.ListIterator;

-

-import org.eclipse.jdi.TimeoutException;

-import org.eclipse.jdi.internal.VirtualMachineImpl;

-import org.eclipse.jdi.internal.jdwp.JdwpCommandPacket;

-import org.eclipse.jdi.internal.jdwp.JdwpPacket;

-import org.eclipse.jdi.internal.jdwp.JdwpReplyPacket;

-

-import com.sun.jdi.VMDisconnectedException;

-

-/**

- * This class implements a thread that receives packets from the Virtual Machine.

- *

- */

-public class PacketReceiveManager extends PacketManager {

-	/** Generic timeout value for not blocking. */

-	public static final int TIMEOUT_NOT_BLOCKING = 0;

-	/** Generic timeout value for infinite timeout. */

-	public static final int TIMEOUT_INFINITE = -1;

-

-	/** Virtual Machine. */

-	private VirtualMachineImpl fVM;

-	/** Input Stream from Virtual Machine. */

-	private InputStream fInStream;

-	/** List of Command packets received from Virtual Machine. */

-	private LinkedList fCommandPackets;

-	/** List of Reply packets received from Virtual Machine. */

-	private LinkedList fReplyPackets;

-

-	/** 

-	 * Create a new thread that receives packets from the Virtual Machine.

-	 */

-	public PacketReceiveManager(ConnectorImpl connector) {

-		super(connector);

-		try {

-			fVM = connector.virtualMachine();

-			fInStream = connector.getInputStream();

-			fCommandPackets = new LinkedList();

-			fReplyPackets = new LinkedList();

-		} catch (IOException e) {

-			disconnectVM();

-		}

-	}

-

-	/** 

-	 * Thread's run method.

-	 */

-	public void run() {

-		try {

-			while (true) {

-				// Read a packet from the input stream.

-				readAvailablePacket();

-			}

-		} catch (InterruptedIOException e) {

-			// Stop running.

-		} catch (IOException e) {

-			disconnectVM();

-		}

-	}

-	

-	/** 

-	 * @return Returns a specified Command Packet from the Virtual Machine.

-	 */

-	public synchronized JdwpCommandPacket getCommand(int  command, long timeToWait) throws InterruptedException {

-		JdwpCommandPacket packet = null;

-		long remainingTime = timeToWait;

-		long timeBeforeWait;

-		long waitedTime;

-		

-		// Wait until command is available.

-		while (!VMIsDisconnected()

-					&& (packet = removeCommandPacket(command)) == null

-					&& (timeToWait < 0 || remainingTime > 0)) {

-			timeBeforeWait = System.currentTimeMillis();

-			waitForPacketAvailable(timeToWait);

-			waitedTime = System.currentTimeMillis() - timeBeforeWait;

-			remainingTime -= waitedTime;

-		}

-		

-		// Check for an IO Exception.

-		if (VMIsDisconnected())

-			throw new VMDisconnectedException(ConnectMessages.getString("PacketReceiveManager.Got_IOException_from_Virtual_Machine_1")); //$NON-NLS-1$

-			

-		// Check for a timeout.

-		if (packet == null)

-			throw new TimeoutException();

-			

-		return packet;

-	}

-	

-	/** 

-	 * @return Returns a specified Reply Packet from the Virtual Machine.

-	 */

-	public synchronized JdwpReplyPacket getReply(int id, long timeToWait) throws InterruptedException {

-		JdwpReplyPacket packet = null;

-		long remainingTime = timeToWait;

-		long timeBeforeWait;

-		long waitedTime;

-		

-		// Wait until reply is available.

-		while (!VMIsDisconnected()

-					&& (packet = removeReplyPacket(id)) == null

-					&& (timeToWait < 0 || remainingTime > 0)) {

-			timeBeforeWait = System.currentTimeMillis();

-			waitForPacketAvailable(timeToWait);

-			waitedTime = System.currentTimeMillis() - timeBeforeWait;

-			remainingTime -= waitedTime;

-		}

-		

-		// Check for an IO Exception.

-		if (VMIsDisconnected())

-			throw new VMDisconnectedException(ConnectMessages.getString("PacketReceiveManager.Got_IOException_from_Virtual_Machine_2")); //$NON-NLS-1$

-			

-		// Check for a timeout.

-		if (packet == null)

-			throw new TimeoutException();

-

-		return packet;

-	}

-	

-	/** 

-	 * @return Returns a specified Reply Packet from the Virtual Machine.

-	 */

-	public JdwpReplyPacket getReply(JdwpCommandPacket commandPacket) {

-		try {

-			return getReply(commandPacket.getId(), fVM.getRequestTimeout());

-		} catch (InterruptedException e) {

-			Thread.currentThread().interrupt();

-		}

-		return null;

-	}

-

-	/** 

-	 * Wait for an available packet from the Virtual Machine.

-	 */

-	private void waitForPacketAvailable(long timeToWait) throws InterruptedException {

-		if (timeToWait == 0)

-			return;

-		else if (timeToWait < 0)

-			wait();

-		else

-			wait(timeToWait);

-	}

-	

-	/** 

-	 * @return Returns and removes a specified command packet from the command packet list.

-	 */

-	private JdwpCommandPacket removeCommandPacket(int command) {

-		ListIterator iter = fCommandPackets.listIterator();

-		while (iter.hasNext()) {

-			JdwpCommandPacket packet = (JdwpCommandPacket)iter.next();

-			if (packet.getCommand() == command) {

-				iter.remove();

-				return packet;

-			}

-		}

-		return null;

-	}

-	

-	/** 

-	 * @return Returns a specified reply packet from the reply packet list.

-	 */

-	private JdwpReplyPacket removeReplyPacket(int id) {

-		ListIterator iter = fReplyPackets.listIterator();

-		while (iter.hasNext()) {

-			JdwpReplyPacket packet = (JdwpReplyPacket)iter.next();

-			if (packet.getId() == id) {

-				iter.remove();

-				return packet;

-			}

-		}

-		return null;

-	}

-

-	/** 

-	 * Add a command packet to the command packet list.

-	 */

-	private synchronized void addCommandPacket(JdwpCommandPacket packet) {

-		fCommandPackets.add(packet);

-		notifyAll();

-	}

-

-	/** 

-	 * Add a reply packet to the reply packet list.

-	 */

-	private synchronized void addReplyPacket(JdwpReplyPacket packet) {

-		fReplyPackets.add(packet);

-		notifyAll();

-	}

-	

-	/** 

-	 * Read a packet from the input stream and add it to the appropriate packet list.

-	 */

-	private void readAvailablePacket() throws IOException {

-		// Read a packet from the Input Stream.

-		JdwpPacket packet = JdwpPacket.read(fInStream);

-		

-		// Add packet to command or reply queue.

-		if (packet instanceof JdwpCommandPacket)

-			addCommandPacket((JdwpCommandPacket)packet);

-		else

-			addReplyPacket((JdwpReplyPacket)packet);

-	}

-}

+package org.eclipse.jdi.internal.connect;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.util.LinkedList;
+import java.util.ListIterator;
+
+import org.eclipse.jdi.TimeoutException;
+import org.eclipse.jdi.internal.VirtualMachineImpl;
+import org.eclipse.jdi.internal.jdwp.JdwpCommandPacket;
+import org.eclipse.jdi.internal.jdwp.JdwpPacket;
+import org.eclipse.jdi.internal.jdwp.JdwpReplyPacket;
+
+import com.sun.jdi.VMDisconnectedException;
+
+/**
+ * This class implements a thread that receives packets from the Virtual Machine.
+ *
+ */
+public class PacketReceiveManager extends PacketManager {
+	/** Generic timeout value for not blocking. */
+	public static final int TIMEOUT_NOT_BLOCKING = 0;
+	/** Generic timeout value for infinite timeout. */
+	public static final int TIMEOUT_INFINITE = -1;
+
+	/** Virtual Machine. */
+	private VirtualMachineImpl fVM;
+	/** Input Stream from Virtual Machine. */
+	private InputStream fInStream;
+	/** List of Command packets received from Virtual Machine. */
+	private LinkedList fCommandPackets;
+	/** List of Reply packets received from Virtual Machine. */
+	private LinkedList fReplyPackets;
+
+	/** 
+	 * Create a new thread that receives packets from the Virtual Machine.
+	 */
+	public PacketReceiveManager(ConnectorImpl connector) {
+		super(connector);
+		try {
+			fVM = connector.virtualMachine();
+			fInStream = connector.getInputStream();
+			fCommandPackets = new LinkedList();
+			fReplyPackets = new LinkedList();
+		} catch (IOException e) {
+			disconnectVM();
+		}
+	}
+
+	/** 
+	 * Thread's run method.
+	 */
+	public void run() {
+		try {
+			while (true) {
+				// Read a packet from the input stream.
+				readAvailablePacket();
+			}
+		} catch (InterruptedIOException e) {
+			// Stop running.
+		} catch (IOException e) {
+			disconnectVM();
+		}
+	}
+	
+	/** 
+	 * @return Returns a specified Command Packet from the Virtual Machine.
+	 */
+	public synchronized JdwpCommandPacket getCommand(int  command, long timeToWait) throws InterruptedException {
+		JdwpCommandPacket packet = null;
+		long remainingTime = timeToWait;
+		long timeBeforeWait;
+		long waitedTime;
+		
+		// Wait until command is available.
+		while (!VMIsDisconnected()
+					&& (packet = removeCommandPacket(command)) == null
+					&& (timeToWait < 0 || remainingTime > 0)) {
+			timeBeforeWait = System.currentTimeMillis();
+			waitForPacketAvailable(timeToWait);
+			waitedTime = System.currentTimeMillis() - timeBeforeWait;
+			remainingTime -= waitedTime;
+		}
+		
+		// Check for an IO Exception.
+		if (VMIsDisconnected())
+			throw new VMDisconnectedException(ConnectMessages.getString("PacketReceiveManager.Got_IOException_from_Virtual_Machine_1")); //$NON-NLS-1$
+			
+		// Check for a timeout.
+		if (packet == null)
+			throw new TimeoutException();
+			
+		return packet;
+	}
+	
+	/** 
+	 * @return Returns a specified Reply Packet from the Virtual Machine.
+	 */
+	public synchronized JdwpReplyPacket getReply(int id, long timeToWait) {
+		JdwpReplyPacket packet = null;
+		long remainingTime = timeToWait;
+		long timeBeforeWait;
+		long waitedTime;
+		
+		// Wait until reply is available.
+		while (!VMIsDisconnected()
+					&& (packet = removeReplyPacket(id)) == null
+					&& (timeToWait < 0 || remainingTime > 0)) {
+			timeBeforeWait = System.currentTimeMillis();
+			try {
+				waitForPacketAvailable(remainingTime);
+			} catch (InterruptedException e) {
+			}
+			waitedTime = System.currentTimeMillis() - timeBeforeWait;
+			remainingTime -= waitedTime;
+		}
+		
+		// Check for an IO Exception.
+		if (VMIsDisconnected())
+			throw new VMDisconnectedException(ConnectMessages.getString("PacketReceiveManager.Got_IOException_from_Virtual_Machine_2")); //$NON-NLS-1$
+			
+		// Check for a timeout.
+		if (packet == null)
+			throw new TimeoutException();
+
+		return packet;
+	}
+	
+	/** 
+	 * @return Returns a specified Reply Packet from the Virtual Machine.
+	 */
+	public JdwpReplyPacket getReply(JdwpCommandPacket commandPacket) {
+		return getReply(commandPacket.getId(), fVM.getRequestTimeout());
+	}
+
+	/** 
+	 * Wait for an available packet from the Virtual Machine.
+	 */
+	private void waitForPacketAvailable(long timeToWait) throws InterruptedException {
+		if (timeToWait == 0)
+			return;
+		else if (timeToWait < 0)
+			wait();
+		else
+			wait(timeToWait);
+	}
+	
+	/** 
+	 * @return Returns and removes a specified command packet from the command packet list.
+	 */
+	private JdwpCommandPacket removeCommandPacket(int command) {
+		ListIterator iter = fCommandPackets.listIterator();
+		while (iter.hasNext()) {
+			JdwpCommandPacket packet = (JdwpCommandPacket)iter.next();
+			if (packet.getCommand() == command) {
+				iter.remove();
+				return packet;
+			}
+		}
+		return null;
+	}
+	
+	/** 
+	 * @return Returns a specified reply packet from the reply packet list.
+	 */
+	private JdwpReplyPacket removeReplyPacket(int id) {
+		ListIterator iter = fReplyPackets.listIterator();
+		while (iter.hasNext()) {
+			JdwpReplyPacket packet = (JdwpReplyPacket)iter.next();
+			if (packet.getId() == id) {
+				iter.remove();
+				return packet;
+			}
+		}
+		return null;
+	}
+
+	/** 
+	 * Add a command packet to the command packet list.
+	 */
+	private synchronized void addCommandPacket(JdwpCommandPacket packet) {
+		fCommandPackets.add(packet);
+		notifyAll();
+	}
+
+	/** 
+	 * Add a reply packet to the reply packet list.
+	 */
+	private synchronized void addReplyPacket(JdwpReplyPacket packet) {
+		fReplyPackets.add(packet);
+		notifyAll();
+	}
+	
+	/** 
+	 * Read a packet from the input stream and add it to the appropriate packet list.
+	 */
+	private void readAvailablePacket() throws IOException {
+		// Read a packet from the Input Stream.
+		JdwpPacket packet = JdwpPacket.read(fInStream);
+		
+		// Add packet to command or reply queue.
+		if (packet instanceof JdwpCommandPacket)
+			addCommandPacket((JdwpCommandPacket)packet);
+		else
+			addReplyPacket((JdwpReplyPacket)packet);
+	}
+}
diff --git a/org.eclipse.jdt.launching.macosx/.classpath b/org.eclipse.jdt.launching.macosx/.classpath
deleted file mode 100644
index ce25a08..0000000
--- a/org.eclipse.jdt.launching.macosx/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="macosx"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.launching"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <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 98ca1ce..0000000
--- a/org.eclipse.jdt.launching.macosx/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jdt.launching.macosx</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</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>
-	</projects>
-	<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.launching.macosx/about.html b/org.eclipse.jdt.launching.macosx/about.html
deleted file mode 100644
index 441774f..0000000
--- a/org.eclipse.jdt.launching.macosx/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>
-<head>
-<title>About</title>
-<style type="text/css">
-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}
-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
-code { font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup { font-family: arial,helvetica,geneva; font-size: 10px}
-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li { font-family: arial, helvetica, geneva; font-size: 10pt}
-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}
-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}
-</style>
-</head>
-<body lang="EN-US" link="blue" vlink="purple">
-<table border="0" cellspacing="5" cellpadding="2" width="100%" >
-  <tr> 
-    <td align="LEFT" valign="TOP" colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF">About This Content</font></b></td>
-  </tr>
-  <tr> 
-    <td> 
-<p>11th December, 2001</p>	
-<h3>License</h3>
-<p>Eclipse.org 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
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> &quot;CPL&quot;.  For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL &quot;Other License&quot;, any modifications, enhancements and/or
-other code and/or documentation &quot;Modifications&quot; uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-</td></tr></table>
-</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 7924131..0000000
--- a/org.eclipse.jdt.launching.macosx/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               *.jar
-source.macosxlaunching.jar = macosx/
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java
deleted file mode 100644
index aea255f..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/JavaVMRunner.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.util.Date;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-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 abstract class JavaVMRunner extends AbstractVMRunner {
-
-	protected IVMInstall fVMInstance;
-
-	public JavaVMRunner(IVMInstall vmInstance) {
-		fVMInstance= vmInstance;
-	}
-	
-	protected String renderDebugTarget(String classToRun, int host) {
-		String format= MacOSXLauncherMessages.getString("javaVMRunner.format.dbgTarget"); //$NON-NLS-1$
-		return MessageFormat.format(format, new String[] { classToRun, String.valueOf(host) });
-	}
-
-	public static String renderProcessLabel(String[] commandLine) {
-		String format= MacOSXLauncherMessages.getString("javaVMRunner.format.processLabel"); //$NON-NLS-1$
-		String timestamp= DateFormat.getInstance().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(commandLine[0]);
-		for (int i= 1; i < commandLine.length; i++) {
-			buf.append(' ');
-			buf.append(commandLine[i]);
-		}	
-		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]);
-	}
-	
-	protected String getJDKLocation() {
-		File location= fVMInstance.getInstallLocation();
-		return location.getAbsolutePath();
-	}
-	
-	/**
-	 * 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(MacOSXLauncherMessages.getString("JavaVMRunner.Specified_working_directory_does_not_exist_or_is_not_a_directory__{0}_1"), new String[] {path}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); //$NON-NLS-1$
-		}
-		return dir;
-	}	
-	
-	/**
-	 * @see VMRunner#getPluginIdentifier()
-	 */
-	protected String getPluginIdentifier() {
-		return MacOSXLaunchingPlugin.getUniqueIdentifier();
-	}
-}
\ No newline at end of file
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 6486ea5..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXDebugVMRunner.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 {
-		
-		String[] cmdLine2= new String[cmdLine.length + 2];
-		
-		String wrapper= MacOSXLaunchingPlugin.createWrapper(getClass(), "start_carbon.sh");
-		
-		int j= 0;
-		cmdLine2[j++]= "/bin/sh";
-		cmdLine2[j++]= wrapper;
-		for (int i= 0; i < cmdLine.length; i++)
-			cmdLine2[j++]= cmdLine[i];
-		
-		return super.exec(cmdLine2, workingDirectory);
-	}
-}
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java
deleted file mode 100644
index 875b693..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class MacOSXLauncherMessages {
-
-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.launching.macosx.MacOSXLauncherMessages";//$NON-NLS-1$
-
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-	private MacOSXLauncherMessages() {
-	}
-
-	public 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/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 cd7c9d8..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLauncherMessages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
-# Contributors:
-#    Andre Weinand - Initial implementation
-######################################################################
-
-MacOSXDebugVMRunner.Could_not_find_a_free_socket_for_the_debugger_1=Could not find a free socket for the debugger
-MacOSXDebugVMRunner.Couldn__t_connect_to_VM_5=Could not connect to VM
-MacOSXDebugVMRunner.Couldn__t_find_an_appropriate_debug_connector_2=Could not find an appropriate debug connector
-
-MacOSXVMType.error.notRoot=Not a JDK Root; MacOS X executable was not found
-MacOSXVMType.name=MacOS X VM
-
-javaVMRunner.format.dbgTarget={0} at localhost:{1}
-javaVMRunner.format.processLabel={0} ({1})
-JavaVMRunner.Specified_working_directory_does_not_exist_or_is_not_a_directory__{0}_1=Specified working directory does not exist or is not a directory: {0}
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 b9436c9..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java
+++ /dev/null
Binary files differ
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 e2a7614..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstall.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-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 {
-
-	/**
-	 * Constructor for MacOSXVM
-	 */
-	MacOSXVMInstall(IVMInstallType type, String id) {
-		super(type, id);
-	}
-
-	/**
-	 * @see IVMInstall#getVMRunner(String)
-	 */
-	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 032dd4b..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMInstallType.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.File;
-
-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.launching.AbstractVMInstallType;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- * This plugins into the org.eclipse.jdt.launching.vmInstallTypes extension point
- */
-public class MacOSXVMInstallType extends AbstractVMInstallType {
-
-	public IVMInstall doCreateVMInstall(String id) {
-		return new MacOSXVMInstall(this, id);
-	}
-	
-	public String getName() {
-		return MacOSXLauncherMessages.getString("MacOSXVMType.name"); //$NON-NLS-1$
-	}
-	
-	public IStatus validateInstallLocation(File installLocation) {
-		File java= new File(installLocation, "bin"+File.separator+"java"); //$NON-NLS-2$ //$NON-NLS-1$
-		if (!java.isFile()) {
-			return new Status(IStatus.ERROR, MacOSXLaunchingPlugin.getUniqueIdentifier(), 0, MacOSXLauncherMessages.getString("MacOSXVMType.error.notRoot"), null); //$NON-NLS-1$
-		}
-		return new Status(IStatus.OK, MacOSXLaunchingPlugin.getUniqueIdentifier(), 0, "ok", null); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see IVMInstallType#detectInstallLocation()
-	 */
-	public File detectInstallLocation() {
-		if (!"Java HotSpot(TM) Client VM".equals(System.getProperty("java.vm.name"))) //$NON-NLS-2$ //$NON-NLS-1$
-			return null;
-			
-		String javaHome= System.getProperty("java.home");	//$NON-NLS-1$
-		if (javaHome != null) {
-			File home = new File(javaHome); 
-			if (home.exists())
-				return home;
-		}
-		return null;
-	}
-
-	/**
-	 * @see IVMInstallType#getDefaultSystemLibraryDescription(File)
-	 */
-	public LibraryLocation[] getDefaultLibraryLocations(File installLocation) {
-		IPath libHome= new Path(installLocation.toString()); //$NON-NLS-1$
-		libHome= libHome.append(".."); //$NON-NLS-1$
-		libHome= libHome.append("Classes"); //$NON-NLS-1$
-		IPath lib= libHome.append("classes.jar"); //$NON-NLS-1$
-		IPath uilib= libHome.append("ui.jar"); //$NON-NLS-1$
-		
-		IPath source= new Path(installLocation.toString());
-		source= source.append("src.jar"); //$NON-NLS-1$
-		
-		IPath srcPkgRoot= new Path("src"); //$NON-NLS-1$
-		
-		return new LibraryLocation[] {
-				new LibraryLocation(lib, source, srcPkgRoot),
-				new LibraryLocation(uilib, source, srcPkgRoot)
-		};
-	}
-
-}
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 417ad7c..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXVMRunner.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-package org.eclipse.jdt.internal.launching.macosx;
-
-import java.io.*;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.internal.launching.StandardVMRunner;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-public class MacOSXVMRunner extends StandardVMRunner {
-	
-	public MacOSXVMRunner(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-
-	protected String constructProgramString(VMRunnerConfiguration config) {
-		String command= null;
-		Map map= config.getVMSpecificAttributesMap();
-		if (map != null) {
-			command = (String)map.get(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND);
-		}
-		StringBuffer buff= new StringBuffer(getJDKLocation());
-		buff.append(File.separator);
-		buff.append("bin"); //$NON-NLS-1$
-		buff.append(File.separator);
-		String jdkLocation= buff.toString();
-		if (command == null) {
-			buff.append("java"); //$NON-NLS-1$
-			return adjustProgramString(buff.toString());
-		} 
-		
-		buff.append(command);
-		String program= buff.toString();
-		File exe= new File(program + ".exe"); //$NON-NLS-1$
-		File javaCommand= new File(program); 
-		
-		if (!exe.isFile() && !javaCommand.isFile()) {
-			File java= new File(jdkLocation + "java.exe"); //$NON-NLS-1$
-			if (java.isFile()) {
-				program= java.getAbsolutePath();
-			} else {
-				java= new File(jdkLocation + "java"); //$NON-NLS-1$
-				if (java.isFile()) {
-					program= java.getAbsolutePath();
-				}
-			}
-		}
-		return program;
-	}	
-	
-	protected boolean shouldIncludeInPath(String path) {
-		return true;
-	}
-	
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		
-		String[] cmdLine2= new String[cmdLine.length + 2];
-		
-		String wrapper= MacOSXLaunchingPlugin.createWrapper(getClass(), "start_carbon.sh");
-		
-		int j= 0;
-		cmdLine2[j++]= "/bin/sh";
-		cmdLine2[j++]= wrapper;
-		for (int i= 0; i < cmdLine.length; i++)
-			cmdLine2[j++]= cmdLine[i];
-		
-		return super.exec(cmdLine2, workingDirectory);
-	}
-}
diff --git a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh b/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh
deleted file mode 100644
index 72f1e27..0000000
--- a/org.eclipse.jdt.launching.macosx/macosx/org/eclipse/jdt/internal/launching/macosx/start_carbon.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh
-
-#********************************************************************** 
-# Copyright (c) 2000, 2002 IBM Corp.  All rights reserved.
-# This file is made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Andre Weinand, OTI - Initial version
-#********************************************************************** 
-
-# 
-# This script wrappers a SWT based Java application on the fly as an
-# application bundle and launches it.
-#
-# Why is it necessary?
-# When using Carbon via JNI some magic is necessary to make MacOS X
-# recognize the Java program as a 'real Mac application' with its own menu bar 
-# and an entry in the Dock. Since this 'magic' does not seem to be public and
-# documented API I don't know how to call it from the SWT startup code.
-# As a workaround I've tried to simulate what ProjectBuilder or MRJAppBuilder
-# do if they launch a SWT based Java application.
-#
-# How is it used?
-# Basically by replacing the standard Java VM ('/usr/bin/java') with this script.
-# Since this script is a replacement for the VM it takes roughly the same arguments.
-
-#
-# In order to build an application bundle under MacOS X we need
-# a small stub that reads the various artefacts of a bundle and
-# starts the Java VM. We copy the stub from the JavaVM framework.
-#
-JAVASTUB="/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/JavaApplicationStub"
-
-#
-# Where to build the temporary application bundle
-#
-TMP_APP_DIR="/tmp/swt_stubs"
-
-#
-# We remember the current working directory
-# so that we can later define the property "WorkingDirectory"
-#
-CURRENT_DIR="$PWD"
-
-#echo $* > /dev/console
-
-VM_OPTIONS=""
-#
-# Ensure that we get our own JDI implementation
-# 
-#JDI="$JAVA_LIBRARY_PATH"/plugins/org.eclipse.jdt.debug/jdi.jar
-#if test -f "$JDI"
-#then
-#	VM_OPTIONS="$VM_OPTIONS<string>-Xbootclasspath/p:$JDI</string>"
-#	echo $VM_OPTIONS > /dev/console
-#else
-#	echo "$JDI not found" > /dev/console
-#fi
-
-# skip 1st argument
-shift
-
-#
-# Process command line arguments until we see the main class...
-#
-while [ $# -gt 0 ]; do
-	case "$1" in
-		-classpath | -cp )
-			CLASS_PATH="$2"
-			shift;
-			;;	
-		-* )
-			VM_OPTIONS="$VM_OPTIONS<string>$1</string>"
-			;;
-		* )
-			MAIN_CLASS="$1"
-			shift;
-			break;
-			;;
-	esac
-	shift
-done
-
-while [ $# -gt 0 ]; do
-	PARAMETERS="$PARAMETERS<string>$1</string>"
-	shift
-done
-
-#
-# Application name is name of main class without package prefix 
-#
-APP_NAME=`echo $MAIN_CLASS | awk -F. '{ print $(NF) }' `
-LAUNCHER="$APP_NAME"
-
-#
-# Create the parent directory for the application bundle 
-#
-mkdir -p $TMP_APP_DIR
-cd $TMP_APP_DIR
-
-#
-# Create the application bundle 
-#
-rm -rf $APP_NAME.app
-mkdir -p $APP_NAME.app/Contents/MacOS
-
-cd $APP_NAME.app/Contents
-
-#
-# Copy the JavaAppLauncher into the bundle 
-#
-cp $JAVASTUB MacOS/$APP_NAME
-
-#
-# Create the Info.plist file.
-#
-cat > Info.plist <<End_Of_Input
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-	<key>CFBundleGetInfoString</key>
-		<string>$APP_NAME</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-	<key>CFBundleName</key>
-		<string>$APP_NAME</string>
-	<key>CFBundlePackageType</key>
-		<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-		<string>2.0.1</string>
-	<key>CFBundleSignature</key>
-		<string>????</string>
-	<key>CFBundleVersion</key>
-		<string>1.0.1</string>
-	<key>Java</key>
-	<dict>
-		<key>VMOptions</key>
-			<array>$VM_OPTIONS</array>
-		<key>ClassPath</key>
-			<string>$CLASS_PATH</string>
-		<key>MainClass</key>
-			<string>$MAIN_CLASS</string>
-		<key>WorkingDirectory</key>
-			<string>$CURRENT_DIR</string>
-		<key>Arguments</key>
-			<array>$PARAMETERS</array>
-	</dict>
-</dict>
-</plist>
-End_Of_Input
-
-#
-# Start the JavaAppLauncher by replacing this shell script
-# to ensure that the process id is preserved.
-#
-exec $TMP_APP_DIR/$APP_NAME.app/Contents/MacOS/$APP_NAME
-
-#
-# not reached (as long as the exec from above succeeds).
-#
diff --git a/org.eclipse.jdt.launching.macosx/plugin.properties b/org.eclipse.jdt.launching.macosx/plugin.properties
deleted file mode 100644
index a94d903..0000000
--- a/org.eclipse.jdt.launching.macosx/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Copyright (c) 2000, 2002 IBM Corp. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v0.5
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v05.html
-#
-# Contributors:
-#    IBM Corporation - Initial implementation
-######################################################################
-
-pluginName = Mac OS X Launcher
-providerName=Eclipse.org
diff --git a/org.eclipse.jdt.launching.macosx/plugin.xml b/org.eclipse.jdt.launching.macosx/plugin.xml
deleted file mode 100644
index 07d28f9..0000000
--- a/org.eclipse.jdt.launching.macosx/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- File written by PDE 1.0 -->
-<plugin
-   id="org.eclipse.jdt.launching.macosx"
-   name="%pluginName"
-   version="2.0.2"
-   provider-name="%providerName"
-   class="org.eclipse.jdt.internal.launching.macosx.MacOSXLaunchingPlugin">
-
-<!-- Required plugins -->
-
-<requires>
-   <import plugin="org.eclipse.jdt.debug"/>
-   <import plugin="org.eclipse.debug.core"/>
-   <import plugin="org.eclipse.core.resources"/>
-   <import plugin="org.eclipse.jdt.core"/>
-   <import plugin="org.eclipse.jdt.launching"/>
-</requires>
-
-<!-- Runtime -->
-
-<runtime>
-   <library name="macosxlaunching.jar"/>
-</runtime>
-
-<!-- Extension points -->
-
-<!-- Extensions -->
-
-<extension point="org.eclipse.jdt.launching.vmInstallTypes">
-	<vmInstallType
-		id="org.eclipse.jdt.internal.launching.macosx.MacOSXType"
-		class="org.eclipse.jdt.internal.launching.macosx.MacOSXVMInstallType"
-	/>
-</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 897947c..0000000
--- a/org.eclipse.jdt.launching.macosx/scripts/exportplugin.xml
+++ /dev/null
@@ -1,29 +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="plugin"  value="org.eclipse.jdt.launching.macosx_2.0.2" />
-		<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}" />
-		<jar 
-			jarfile="${dest}/macosxlaunching.jar"
-			basedir="bin"
-		/>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<zip zipfile="${dest}/macosxlaunchingsrc.zip">
-		    <fileset dir="macosx" />
-  		</zip>		
-	</target>
-</project>
diff --git a/org.eclipse.jdt.launching/.classpath b/org.eclipse.jdt.launching/.classpath
deleted file mode 100644
index 32b73e5..0000000
--- a/org.eclipse.jdt.launching/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="launching"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <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 092357e..0000000
--- a/org.eclipse.jdt.launching/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/org.eclipse.jdt.launching/.project b/org.eclipse.jdt.launching/.project
deleted file mode 100644
index 1b3c48c..0000000
--- a/org.eclipse.jdt.launching/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.jdt.launching</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.resources</project>

-		<project>org.eclipse.debug.core</project>

-		<project>org.eclipse.jdt.core</project>

-		<project>org.eclipse.jdt.debug</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-	</projects>

-	<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.launching/about.html b/org.eclipse.jdt.launching/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/org.eclipse.jdt.launching/about.html
+++ /dev/null
@@ -1,30 +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>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org 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
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</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 e4bc8c2..0000000
--- a/org.eclipse.jdt.launching/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\

-               about.html,\

-               plugin.properties,\

-               *.jar

-source.launching.jar = launching/

-

-src.includes=about.html

diff --git a/org.eclipse.jdt.launching/doc/hglegal.htm b/org.eclipse.jdt.launching/doc/hglegal.htm
deleted file mode 100644
index b071dbd..0000000
--- a/org.eclipse.jdt.launching/doc/hglegal.htm
+++ /dev/null
@@ -1,14 +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="GENERATOR" content="Mozilla/4.73 [en] (Win98; U) [Netscape]">

-   <title>Legal Notices</title>

-</head>

-<body>

-

-<h3>

-<a NAME="Notices"></a>Notices</h3>

-(c) Copyright IBM Corp. 2000, 2001. All Rights Reserved.

-</body>

-</html>

diff --git a/org.eclipse.jdt.launching/doc/ngibmcpy.gif b/org.eclipse.jdt.launching/doc/ngibmcpy.gif
deleted file mode 100644
index 360f8e9..0000000
--- a/org.eclipse.jdt.launching/doc/ngibmcpy.gif
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching.html b/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching.html
deleted file mode 100644
index 67755e3..0000000
--- a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching.html
+++ /dev/null
@@ -1,30 +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="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">

-   <title>Workbench Extension Points</title>

-</head>

-<body link="#0000FF" vlink="#800080">

-

-<center>

-<h1>

-Eclipse Java Launching</h1></center>

-This document lists the published extension points that the Java Launching

-plugin makes available to tool developers.

-<h1>

-Extension Points</h1>

-

-<ul>

-<li>

-<a href="org_eclipse_jdt_launching_vmConnectors.html">org.eclipse.jdt.launching.vmConnectors</a></li>

-<li>

-<a href="org_eclipse_jdt_launching_vmInstallTypes.html">org.eclipse.jdt.launching.vmInstallTypes</a></li>

-<li>

-<a href="org_eclipse_jdt_launching_runtimeClasspathEntryResolvers.html">org.eclipse.jdt.launching.runtimeClasspathEntryResolvers</a></li>

-<li>

-<a href="org_eclipse_jdt_launching_runtimeClasspathProviders.html">org.eclipse.jdt.launching.runtimeClasspathProviders</a></li>

-</ul>

-<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

-</body>

-</html>

diff --git a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathEntryResolvers.html b/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathEntryResolvers.html
deleted file mode 100644
index e68889c..0000000
--- a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathEntryResolvers.html
+++ /dev/null
@@ -1,54 +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="GENERATOR" content="Microsoft FrontPage 4.0">
-   <title>Workbench Extension Points</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-Java Runtime Classpath Entry Resolvers</h1></center>
-<b><i>Identifier: </i></b>org.eclipse.jdt.launching.runtimeClasspathEntryResolvers
-<p><b><i>Description: </i></b>
-	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.</p>
-<p><b><i>Configuration Markup:</i></b>
-<p><tt>&nbsp;&nbsp; &lt;!ELEMENT runtimeClasspathEntryResolver EMPTY&gt;</tt>
-<br><tt>&nbsp;&nbsp; &lt;!ATTLIST runtimeClasspathEntryResolver</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-CDATA #REQUIRED</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-CDATA #REQUIRED</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; variable&nbsp;&nbsp;&nbsp;
-CDATA #OPTIONAL</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; container&nbsp;&nbsp;
-CDATA #OPTIONAL</tt>
-<br><tt>&nbsp;&nbsp; ></tt>
-<ul>
-<li>
-<b>id</b> - a unique identifier that can be used to reference this resolver</li>
-<li>
-<b>class</b> - the class that implements this resolver. The class
-must implement IRuntimeClasspathEntryResolver.</li>
-<li>
-<b>variable</b> - the name of the classpath variable this resolver is registered for.</li>
-<li><b>container</b> - the identifier of the classpath container this resolver is registered for.</li>
-</ul>
-<p>At least one of variable or container must be specified, and at most one resolver can
-be registered for a variable or container.</p>
-<b><i>Examples:</i></b>
-<br>The following is an example of a resolver:
-<p>&lt;extension
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; point="org.eclipse.jdt.launching.runtimeClasspathEntryResolvers">
-<br>&nbsp;&nbsp; &lt;runtimeClasspathEntryResolver
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class="com.example.ResolverImplementation"
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id="com.example.ResolverId">
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; variable="CLASSPATH_VARIABLE">
-<br>&nbsp;&nbsp; &lt;/runtimeClasspathEntryResolver>
-<br>&lt;/extension>
-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathProviders.html b/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathProviders.html
deleted file mode 100644
index 8653d35..0000000
--- a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_runtimeClasspathProviders.html
+++ /dev/null
@@ -1,44 +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="GENERATOR" content="Microsoft FrontPage 4.0">
-   <title>Workbench Extension Points</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-Java Runtime Classpath Providers</h1></center>
-<b><i>Identifier: </i></b>org.eclipse.jdt.launching.classpathProviders
-<p><b><i>Description: </i></b>
-	This extension point allows clients to dynamically compute and resolve
-	classpaths and source lookup paths for Java launch configurations.</p>
-<p><b><i>Configuration Markup:</i></b>
-<p><tt>&nbsp;&nbsp; &lt;!ELEMENT classpathProviders EMPTY&gt;</tt>
-<br><tt>&nbsp;&nbsp; &lt;!ATTLIST classpathProvider</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-CDATA #REQUIRED</tt>
-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-CDATA #REQUIRED</tt>
-<br><tt>&nbsp;&nbsp; ></tt>
-<ul>
-<li>
-<b>id</b> - a unique identifier that can be used to reference this classpath
- provider</li>
-<li>
-<b>class</b> - the class that implements this classpath provider. The class
-must implement IRuntimeClasspathProvider.</li>
-</ul>
-<b><i>Examples:</i></b>
-<br>The following is an example of a classpath provider:
-<p>&lt;extension
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; point="org.eclipse.jdt.launching.classpathProvider">
-<br>&nbsp;&nbsp; &lt;classpathProvider
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class="com.example.ProviderImplementation"
-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id="com.example.ProviderId">
-<br>&nbsp;&nbsp; &lt;/classpathProvider>
-<br>&lt;/extension>
-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmConnectors.html b/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmConnectors.html
deleted file mode 100644
index 70ce7c4..0000000
--- a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmConnectors.html
+++ /dev/null
@@ -1,47 +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="GENERATOR" content="Microsoft FrontPage 4.0">

-   <title>Workbench Extension Points</title>

-</head>

-<body link="#0000FF" vlink="#800080">

-

-<center>

-<h1>

-Java VM Connectors</h1></center>

-<b><i>Identifier: </i></b>org.eclipse.jdt.launching.vmConnectors

-<p><b><i>Description: </i></b>This extension point represents different

-kinds of connections to remote VMs. Each extension

-must implement <code>org.eclipse.jdt.launching.IVMConnector</code>. An IVMConnector

-is responsible for establishing a connection with a remote VM.

-<p><b><i>Configuration Markup:</i></b>

-<p><tt>&nbsp;&nbsp; &lt;!ELEMENT vmConnector EMPTY&gt;</tt>

-<br><tt>&nbsp;&nbsp; &lt;!ATTLIST vmConnector</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp; ></tt>

-<ul>

-<li>

-<b>id</b> - a unique identifier that can be used to reference this IVMConnector</li>

-

-<li>

-<b>class</b> - the class that implements this connector. The class

-must implement IVMConnector.</li>

-</ul>

-<b><i>Examples:</i></b>

-<br>The following is an example of an IVMConnector:

-<p>&lt;extension

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; point="org.eclipse.jdt.launching.vmConnectors">

-<br>&nbsp;&nbsp; &lt;vmConnector

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class="com.example.ConnectorImplementation"

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id="com.example.ConnectorId">

-<br>&nbsp;&nbsp; &lt;/vmConnector>

-<br>&lt;/extension>

-<p><b><i>Supplied Implementation:</i></b>

-<br>An implementation of a standard socket attach connector is provided.

-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

-</body>

-</html>

diff --git a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmInstallTypes.html b/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmInstallTypes.html
deleted file mode 100644
index fa2c95b..0000000
--- a/org.eclipse.jdt.launching/doc/org_eclipse_jdt_launching_vmInstallTypes.html
+++ /dev/null
@@ -1,52 +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="GENERATOR" content="Microsoft FrontPage 4.0">

-   <title>Workbench Extension Points</title>

-</head>

-<body link="#0000FF" vlink="#800080">

-

-<center>

-<h1>

-Java VM Install Types</h1></center>

-<b><i>Identifier: </i></b>org.eclipse.jdt.launching.vmInstallTypes

-<p><b><i>Description: </i></b>This extension point represents different

-kinds of Java runtime environments and&nbsp; development kits. Each extension

-must implement <code>org.eclipse.jdt.launching.IVMInstallType</code>. An IVMInstallType

-is responsible for creating and managing a set of instances of its corresponding

-IVMInstall class. Through creating different IVMInstall objects, an IVMInstallType

-allows for specific behaviour for various Java VMs.

-<br>A UI for managing IVMInstalls is provided by the Java UI plugin.

-<p><b><i>Configuration Markup:</i></b>

-<p><tt>&nbsp;&nbsp; &lt;!ELEMENT vmInstallType EMPTY&gt;</tt>

-<br><tt>&nbsp;&nbsp; &lt;!ATTLIST vmInstallType</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

-CDATA #REQUIRED</tt>

-<br><tt>&nbsp;&nbsp; ></tt>

-<ul>

-<li>

-<b>id</b> - a unique identifier that can be used to reference this IVMInstallType</li>

-

-<li>

-<b>class</b> - the class that implements this VM install type. The class

-must implement IVMInstallType.</li>

-</ul>

-<b><i>Examples:</i></b>

-<br>The following is an example of an IVMInstallType for the J9 VM:

-<p>&lt;extension

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; point="org.eclipse.jdt.launching.vmInstallTypes">

-<br>&nbsp;&nbsp; &lt;vmInstallType

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class="org.eclipse.jdt.internal.launching.j9.J9VMInstallType"

-<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; id="org.eclipse.jdt.internal.launching.j9.J9Type">

-<br>&nbsp;&nbsp; &lt;/vmInstallType>

-<br>&lt;/extension>

-<p><b><i>Supplied Implementation:</i></b>

-<br>Abstract implementations of IVMInstall and IVMInstallType are provided.

-The Java UI plugin defines a VM install type for the standard 1.2/1.3 level

-<b>JRE</b>.

-<p><a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2001.  All Rights Reserved." BORDER=0 height=12 width=195></a>

-</body>

-</html>

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 65d9ce7..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/CompositeId.java
+++ /dev/null
Binary files differ
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 0057074..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-import org.eclipse.core.runtime.IPath;
-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.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-
-/**
- *  <b>IMPLEMENTATION IN PROGRESS</b>
- * 
- * 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;
-	
-	/**
-	 * Constructs a JRE classpath conatiner on the given VM install
-	 * 
-	 * @param vm vm install
-	 * @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() {
-		LibraryLocation[] libs = JavaRuntime.getLibraryLocations(fVMInstall);
-		IClasspathEntry[] entries = new IClasspathEntry[libs.length];
-		for (int i = 0; i < libs.length; i++) {
-			entries[i] = JavaCore.newLibraryEntry(libs[i].getSystemLibraryPath(), libs[i].getSystemLibrarySourcePath(), libs[i].getPackageRootPath());
-		}
-		return entries;
-	}
-
-	/**
-	 * @see IClasspathContainer#getDescription()
-	 */
-	public String getDescription() {
-		StringBuffer desc = new StringBuffer(LaunchingMessages.getString("JREContainer.JRE_System_Library_1")); //$NON-NLS-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 dc233b4..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JREContainerInitializer.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-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.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * 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);
-				if (vm == null) {
-					handleResolutionError(containerPath, project);
-					return;
-				}					
-				if (vm != null) {
-					JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {project}, new IClasspathContainer[] {new JREContainer(vm, containerPath)}, null);
-				}
-			}
-		}
-	}
-	
-	protected void handleResolutionError(IPath containerPath, IJavaProject project) throws CoreException {
-		IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), JavaRuntime.ERR_UNABLE_TO_RESOLVE_JRE, 
-			MessageFormat.format(LaunchingMessages.getString("JREContainerInitializer.Unable_to_locate_JRE_named_{0}_to_build_project_{1}._1"), new String[] {containerPath.segment(2), project.getElementName()}), null); //$NON-NLS-1$
-		IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
-		IVMInstall vm = null;
-		if (handler != null) {
-			vm = (IVMInstall)handler.handleStatus(status, project);
-		}
-		
-		if (vm == null) {
-			throw new CoreException(status);
-		} else {
-			String vmTypeId = vm.getVMInstallType().getId();
-			String vmName = vm.getName();
-			String prevId = containerPath.segment(1);
-			String prevName = containerPath.segment(2);
-			if (!(prevId.equals(vmTypeId) && prevName.equals(vmName))) {
-				// update classpath
-				IPath newPath = new Path(JavaRuntime.JRE_CONTAINER);
-				if (vmTypeId != null) {
-					newPath = newPath.append(vmTypeId).append(vmName);
-				}
-				IClasspathEntry[] classpath = project.getRawClasspath();
-				for (int i = 0; i < classpath.length; i++) {
-					switch (classpath[i].getEntryKind()) {
-						case IClasspathEntry.CPE_CONTAINER:
-							if (classpath[i].getPath().equals(containerPath)) {
-								classpath[i] = JavaCore.newContainerEntry(newPath, classpath[i].isExported());
-							}
-							break;
-						default:
-							break;
-					}
-				}
-				project.setRawClasspath(classpath, null);
-				containerPath = newPath;
-			}
-			JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {project}, new IClasspathContainer[] {new JREContainer(vm, containerPath)}, 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 = containerPath.segment(1);
-			String vmName = containerPath.segment(2);
-			IVMInstallType vmType = JavaRuntime.getVMInstallType(vmTypeId);
-			if (vmType != null) {
-				vm = vmType.findVMInstallByName(vmName);
-			}
-		} else {
-			// workspace default JRE
-			vm = JavaRuntime.getDefaultVMInstall();
-		}		
-		return vm;
-	}
-	
-	/**
-	 * Update containers that point to the default JRE, which has changed
-	 */
-	public void updateDefaultJREContainers(IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor= new NullProgressMonitor();
-		}		
-		IWorkspace ws = ResourcesPlugin.getWorkspace();
-		IJavaModel model = JavaCore.create(ws.getRoot());
-		boolean wasAutobuild= setAutobuild(ws, false);
-		try {
-			IJavaProject[] projects = model.getJavaProjects();
-			List affectedProjects = new ArrayList(projects.length);
-			for (int i = 0; i < projects.length; i++) {
-				IClasspathEntry[] classpath = projects[i].getRawClasspath();
-				for (int j = 0; j < classpath.length; j++) {
-					IClasspathEntry entry = classpath[j];
-					if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
-						IPath path = entry.getPath();
-						if (path.segmentCount() == 1 && path.segment(0).equals(JavaRuntime.JRE_CONTAINER)) {
-							// references default JRE
-							affectedProjects.add(projects[i]);
-						}
-					}
-				}
-			}
-			if (!affectedProjects.isEmpty()) {
-				IJavaProject[] projArray = (IJavaProject[])affectedProjects.toArray(new IJavaProject[affectedProjects.size()]);
-				IPath containerPath = new Path(JavaRuntime.JRE_CONTAINER);
-				IVMInstall vm = JREContainerInitializer.resolveVM(containerPath);
-				JREContainer container = new JREContainer(vm, containerPath);
-				IClasspathContainer[] containers = new IClasspathContainer[projArray.length];
-				Arrays.fill(containers, container);
-				JavaCore.setClasspathContainer(containerPath, projArray, containers, monitor);
-			}
-		} finally {
-			setAutobuild(ws, wasAutobuild);
-		}	
-	}
-	
-	/**
-	 * Update conatiners that point to removed JRE explicitly. The containers
-	 * are now unbound.
-	 */
-	public void updateRemovedVM(IVMInstall vm) throws CoreException {
-		IProgressMonitor monitor= new NullProgressMonitor();
-		IWorkspace ws = ResourcesPlugin.getWorkspace();
-		IJavaModel model = JavaCore.create(ws.getRoot());
-		boolean wasAutobuild= setAutobuild(ws, false);
-		try {
-			IJavaProject[] projects = model.getJavaProjects();
-			List affectedProjects = new ArrayList(projects.length);
-			for (int i = 0; i < projects.length; i++) {
-				IClasspathEntry[] classpath = projects[i].getRawClasspath();
-				for (int j = 0; j < classpath.length; j++) {
-					IClasspathEntry entry = classpath[j];
-					if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
-						IPath path = entry.getPath();
-						if (path.segmentCount() == 3 && path.segment(0).equals(JavaRuntime.JRE_CONTAINER)
-						&& path.segment(1).equals(vm.getVMInstallType().getId())
-						&& path.segment(2).equals(vm.getName())) {
-							// references removed JRE
-							affectedProjects.add(projects[i]);
-						}
-					}
-				}
-			}
-			if (!affectedProjects.isEmpty()) {
-				IJavaProject[] projArray = (IJavaProject[])affectedProjects.toArray(new IJavaProject[affectedProjects.size()]);
-				IPath containerPath = new Path(JavaRuntime.JRE_CONTAINER);
-				containerPath = containerPath.append(vm.getVMInstallType().getId());
-				containerPath = containerPath.append(vm.getName());
-				IClasspathContainer[] containers = new IClasspathContainer[projArray.length];
-				Arrays.fill(containers, null);
-				JavaCore.setClasspathContainer(containerPath, projArray, containers, monitor);
-			}
-		} finally {
-			setAutobuild(ws, wasAutobuild);
-		}	
-	}	
-	
-	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;
-	}	
-}
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 e6234f1..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JRERuntimeClasspathEntryResolver.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.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 configJRE = JavaRuntime.computeVMInstall(configuration);
-		return resolveLibraryLocations(configJRE, entry.getClasspathProperty());
-	}
-	
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, IJavaProject)
-	 */
-	public IRuntimeClasspathEntry[] resolveRuntimeClasspathEntry(IRuntimeClasspathEntry entry, IJavaProject project) throws CoreException {
-		IVMInstall projectJRE = JavaRuntime.getVMInstall(project);
-		return resolveLibraryLocations(projectJRE, entry.getClasspathProperty());
-	}
-
-	/**
-	 * Resolves libray locations for the given VM install
-	 */
-	protected IRuntimeClasspathEntry[] resolveLibraryLocations(IVMInstall vm, int kind) {
-		IRuntimeClasspathEntry[] resolved = null;
-		LibraryLocation[] libs = vm.getLibraryLocations();
-		if (libs == null) {
-			// default system libs
-			libs = vm.getVMInstallType().getDefaultLibraryLocations(vm.getInstallLocation());
-		} else {
-			// custom system libs - place on bootpath explicitly
-			kind = IRuntimeClasspathEntry.BOOTSTRAP_CLASSES;
-		}
-		resolved = new IRuntimeClasspathEntry[libs.length];
-		for (int i = 0; i < libs.length; i++) {
-			resolved[i] = JavaRuntime.newArchiveRuntimeClasspathEntry(libs[i].getSystemLibraryPath());
-			resolved[i].setSourceAttachmentPath(libs[i].getSystemLibrarySourcePath());
-			resolved[i].setSourceAttachmentRootPath(libs[i].getPackageRootPath());
-			resolved[i].setClasspathProperty(kind);
-		}
-		return resolved;
-	}
-		
-	/**
-	 * @see IRuntimeClasspathEntryResolver#resolveVMInstall(IClasspathEntry)
-	 */
-	public IVMInstall resolveVMInstall(IClasspathEntry entry) throws CoreException {
-		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;
-	}
-
-}
\ No newline at end of file
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 26363c6..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaClasspathVariablesInitializer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2002.
- * All Rights Reserved.
- */
- 
-import java.util.ArrayList;
-import java.util.List;
-
-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);
-			if (variable.equals(JavaRuntime.JRELIB_VARIABLE)) {
-				newPath= locations[0].getSystemLibraryPath();
-			} else if (variable.equals(JavaRuntime.JRESRC_VARIABLE)) {
-				newPath= locations[0].getSystemLibrarySourcePath();
-			} else if (variable.equals(JavaRuntime.JRESRCROOT_VARIABLE)){
-				newPath= locations[0].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);
-				}
-			}
-		}
-	}
-	
-	public void updateJREVariables(IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor= new NullProgressMonitor();
-		}
-		IVMInstall vmInstall= JavaRuntime.getDefaultVMInstall();
-		if (vmInstall != null) {
-			IWorkspace workspace= ResourcesPlugin.getWorkspace();
-			boolean wasAutobuild= setAutobuild(workspace, false);
-			try {
-				List changedVars= new ArrayList(3);
-				List changedPaths= new ArrayList(3);
-				LibraryLocation[] locations= JavaRuntime.getLibraryLocations(vmInstall);
-				IPath library= locations[0].getSystemLibraryPath();
-				if (changedJREVariable(library, JavaRuntime.JRELIB_VARIABLE)) {
-					changedVars.add(JavaRuntime.JRELIB_VARIABLE);
-					changedPaths.add(library);
-				}
-				IPath source= locations[0].getSystemLibrarySourcePath();
-				if (changedJREVariable(source, JavaRuntime.JRESRC_VARIABLE)) {
-					changedVars.add(JavaRuntime.JRESRC_VARIABLE);
-					changedPaths.add(source);
-				}
-				IPath pkgRoot= locations[0].getPackageRootPath();
-				if (changedJREVariable(pkgRoot, JavaRuntime.JRESRCROOT_VARIABLE)) {
-					changedVars.add(JavaRuntime.JRESRCROOT_VARIABLE);
-					changedPaths.add(pkgRoot);
-				}
-				JavaCore.setClasspathVariables((String[])changedVars.toArray(new String[changedVars.size()]), (IPath[])changedPaths.toArray(new IPath[changedPaths.size()]), monitor);
-			} finally {
-				setAutobuild(workspace, wasAutobuild);
-			}
-		}
-	}
-	
-	
-	private boolean changedJREVariable(IPath newPath, String var) throws CoreException {
-		IPath oldPath= JavaCore.getClasspathVariable(var);
-		return !newPath.equals(oldPath);
-	}
-	
-	private void setJREVariable(IPath newPath, String var) throws CoreException {
-		if (changedJREVariable(newPath, var)) {
-			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;
-	}
-
-	protected void setMonitor(IProgressMonitor monitor) {
-		fMonitor = monitor;
-	}
-}
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 a5c5a26..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLaunchConfigurationUtils.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-import org.apache.xml.serialize.Method;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.Serializer;
-import org.apache.xml.serialize.SerializerFactory;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-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.getString("JavaLaunchConfigurationUtils.Main_type_not_specified_3"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); //$NON-NLS-1$
-		}
-		IType mainType = null;
-		try {
-			mainType = findType(javaProject, mainTypeName);
-		} catch (JavaModelException jme) {
-		}
-		if (mainType == null) {
-			abort(LaunchingMessages.getString("JavaLaunchConfigurationUtils.Main_type_does_not_exist_4"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); //$NON-NLS-1$
-		}
-		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));
-	}
-	
-	/**
-	 * Convenience method to get the <code>ILaunchConfigurationType</code> this helper is concerned with.
-	 */
-	private static ILaunchConfigurationType getConfigurationType() {
-		return getLaunchManager().getLaunchConfigurationType("org.eclipse.jdt.debug.ui.localJavaApplication");	//$NON-NLS-1$	
-	}
-	
-	/**
-	 * Convenience method to get the launch mgr.
-	 */
-	private static ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Convenience method to get the java model.
-	 */
-	private static IJavaModel getJavaModel() {
-		return JavaCore.create(getWorkspaceRoot());
-	}
-
-	/**
-	 * Convenience method to get the workspace root.
-	 */
-	private static IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-
-	/**
-	 * 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 {
-		ByteArrayOutputStream s= new ByteArrayOutputStream();
-		OutputFormat format = new OutputFormat();
-		format.setIndenting(true);
-		format.setLineSeparator(System.getProperty("line.separator"));  //$NON-NLS-1$
-		
-		Serializer serializer =
-			SerializerFactory.getSerializerFactory(Method.XML).makeSerializer(
-				new OutputStreamWriter(s, "UTF8"), //$NON-NLS-1$
-				format);
-		serializer.asDOMSerializer().serialize(doc);
-		return s.toString("UTF8"); //$NON-NLS-1$		
-	}	
-}
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLocalApplicationLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLocalApplicationLaunchConfigurationDelegate.java
deleted file mode 100644
index 8afa28c..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaLocalApplicationLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.debug.core.ILaunchManager;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-/**
- * Launches a local VM.
- */
-public class JavaLocalApplicationLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
-	/**
-	 * @see ILaunchConfigurationDelegate#launch(ILaunchConfiguration, String, ILaunch, IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		monitor.beginTask(LaunchingMessages.getString("JavaLocalApplicationLaunchConfigurationDelegate.Launching..._1"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-								
-		String mainTypeName = verifyMainTypeName(configuration);
-
-		IVMInstall vm = verifyVMInstall(configuration);
-
-		IVMRunner runner = vm.getVMRunner(mode);
-		if (runner == null) {
-			if (mode == ILaunchManager.DEBUG_MODE) {
-				abort(MessageFormat.format(LaunchingMessages.getString("JavaLocalApplicationLaunchConfigurationDelegate.JRE_{0}_does_not_support_debug_mode._1"), new String[]{vm.getName()}), null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST);  //$NON-NLS-1$
-			} else {
-				abort(MessageFormat.format(LaunchingMessages.getString("JavaLocalApplicationLaunchConfigurationDelegate.JRE_{0}_does_not_support_run_mode._2"), new String[]{vm.getName()}), null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST);  //$NON-NLS-1$
-			}
-		}
-
-		File workingDir = verifyWorkingDirectory(configuration);
-		String workingDirName = null;
-		if (workingDir != null) {
-			workingDirName = workingDir.getAbsolutePath();
-		}
-		
-		// 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.setVMArguments(execArgs.getVMArgumentsArray());
-		runConfig.setWorkingDirectory(workingDirName);
-		runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
-		// Bootpath
-		String[] bootpath = getBootpath(configuration);
-		runConfig.setBootClassPath(bootpath);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-		
-		// Launch the configuration
-		runner.run(runConfig, launch, monitor);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}	
-		
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-		
-		monitor.done();
-	}	
-}
-
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 8f684d1..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/JavaRemoteApplicationLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.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 {
-
-	/**
-	 * @see ILaunchConfigurationDelegate#launch(ILaunchConfiguration, String, ILaunch, IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-
-		monitor.beginTask(LaunchingMessages.getString("JavaRemoteApplicationLaunchConfigurationDelegate.Connecting..._1"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}						
-						
-		String connectorId = getVMConnectorId(configuration);
-		IVMConnector connector = null;
-		if (connectorId == null) {
-			connector = JavaRuntime.getDefaultVMConnector();
-		} else {
-			connector = JavaRuntime.getVMConnector(connectorId);
-		}
-		if (connector == null) {
-			abort(LaunchingMessages.getString("JavaRemoteApplicationLaunchConfigurationDelegate.Connector_not_specified_2"), null, IJavaLaunchConfigurationConstants.ERR_CONNECTOR_NOT_AVAILABLE); //$NON-NLS-1$
-		}
-		
-		Map argMap = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, (Map)null);
-
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		// connect to remote VM
-		connector.connect(argMap, monitor, launch);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-		
-		monitor.done();
-	}
-	
-}
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 dace07c..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-package org.eclipse.jdt.internal.launching;

-

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-public class LaunchingMessages {

-

-	private static final String RESOURCE_BUNDLE= "org.eclipse.jdt.internal.launching.LaunchingMessages";//$NON-NLS-1$

-

-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);

-

-		public 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/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 ce98da0..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingMessages.properties
+++ /dev/null
@@ -1,124 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial 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}

-

-AbstractVMRunner.Eclipse_runtime_does_not_support_working_directory_2=Eclipse runtime does not support working directory

-AbstractVMRunner.Exception_starting_process_1=Exception starting process

-

-JavaLaunchConfigurationUtils.Invalid_project_specified_2=Invalid project specified

-JavaLaunchConfigurationUtils.Main_type_does_not_exist_4=Main type does not exist

-JavaLaunchConfigurationUtils.Main_type_not_specified_3=Main type not specified

-JavaLaunchConfigurationUtils.No_project_specified_1=No project specified

-

-JavaLocalApplicationLaunchConfigurationDelegate.JRE_{0}_does_not_support_debug_mode._1=JRE {0} does not support debug mode.

-JavaLocalApplicationLaunchConfigurationDelegate.JRE_{0}_does_not_support_run_mode._2=JRE {0} does not support run mode.

-

-JavaRemoteApplicationLaunchConfigurationDelegate.Connector_not_specified_2=Connector not specified

-

-JavaRuntime.badFormat=bad format

-JavaRuntime.detectedSuffix=Detected VM

-JavaRuntime.exceptionOccurred=Exceptions occurred

-JavaRuntime.ioExceptionOccurred=An IOException occurred while saving vm's

-JavaRuntime.Library_location_element_incorrectly_specified_3=Library location element incorrectly specified

-JavaRuntime.VM_element_specified_with_no_id_attribute_2=VM element specified with no id attribute

-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}.

-

-

-LaunchingPlugin.Exception_occurred_reading_vmConnectors_extensions_1=Exception occurred reading vmConnectors extensions

-

-libraryLocation.assert.libraryNotNull=library may not 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 as connection was refused

-

-StandardVMDebugger.Could_not_find_a_free_socket_for_the_debugger_1=Could not find a free socket for the debugger

-StandardVMDebugger.Couldn__t_connect_to_VM_4=Could not connect to VM

-StandardVMDebugger.Couldn__t_connect_to_VM_5=Could not connect to VM

-StandardVMDebugger.Couldn__t_find_an_appropriate_debug_connector_2=Could not find an appropriate debug connector

-

-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}

-

-StandardVMType.Not_a_JDK_Root;_Java_executable_was_not_found_1=Not a JDK Root; Java executable was not found

-StandardVMType.ok_2=ok

-StandardVMType.Standard_VM_3=Standard VM

-

-vmInstall.assert.idNotNull=id must not be null

-vmInstall.assert.typeNotNull=vm type must not be null

-

-vmInstallType.duplicateVM=Duplicate VM: {0}

-

-vmRunnerConfig.assert.bootClassPathNotNull=bootClassPath may not be null

-vmRunnerConfig.assert.classNotNull=classToLaunch may not be null

-vmRunnerConfig.assert.classPathNotNull=classPath may not be null

-vmRunnerConfig.assert.programArgsNotNull=args may not be null

-vmRunnerConfig.assert.vmArgsNotNull=args may not 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.Unable_to_recover_runtime_class_path_entry_-_parsing_error_8=Unable to recover runtime class path entry - parsing error

-RuntimeClasspathEntry.Illegal_classpath_entry_{0}_1=Illegal classpath entry {0}

-RuntimeClasspathEntry.Internal_archive_no_longer_exists___1=Unable to recover runtime class path entry - internal archive no longer exists: 

-

-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.Unable_to_locate_JRE_named_{0}_to_build_project_{1}._1=Unable to locate JRE named {0} to build project {1}.

-JREContainerInitializer.Updating_JRE_system_library_containers..._1=Updating JRE system library containers...

-

-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}

-

-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=Illegal to have a container resolved to a 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.

-

-JavaLocalApplicationLaunchConfigurationDelegate.Launching..._1=Launching...

-JavaRemoteApplicationLaunchConfigurationDelegate.Connecting..._1=Connecting...

-

-Standard11xVMType.Standard_1.1.x_VM_1=Standard 1.1.x VM

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 928c77e..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.eclipse.jdt.internal.launching;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-import java.util.HashMap;

-import java.util.Hashtable;

-

-import org.eclipse.core.internal.events.ResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-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.IPluginDescriptor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.MultiStatus;

-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.debug.core.ILaunchConfiguration;

-import org.eclipse.jdt.core.JavaCore;

-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.sourcelookup.ArchiveSourceLocation;

-

-public class LaunchingPlugin extends Plugin implements Preferences.IPropertyChangeListener, IVMInstallChangedListener, IResourceChangeListener {

-	

-	/**

-	 * Identifier for 'vmConnectors' extension point

-	 */

-	public static final String ID_EXTENSION_POINT_VM_CONNECTORS = getUniqueIdentifier() + ".vmConnectors"; //$NON-NLS-1$

-	

-	private static LaunchingPlugin fgLaunchingPlugin;

-	

-	private HashMap fVMConnectors = null;

-	

-	public LaunchingPlugin(IPluginDescriptor descriptor) {

-		super(descriptor);

-		fgLaunchingPlugin= this;

-	}

-	

-	/**

-	 * Convenience method which returns the unique identifier of this plugin.

-	 */

-	public 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"; //$NON-NLS-1$

-		}

-		return getDefault().getDescriptor().getUniqueIdentifier();

-	}

-

-	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#shutdown()

-	 */

-	public void shutdown() throws CoreException {

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);

-		ArchiveSourceLocation.closeArchives();

-		getPluginPreferences().removePropertyChangeListener(this);

-		JavaRuntime.removeVMInstallChangedListener(this);

-		savePluginPreferences();

-		super.shutdown();

-	}

-		

-	/**

-	 * @see Plugin#startup()

-	 */

-	public void startup() throws CoreException {

-		super.startup();

-		

-		// 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; //$NON-NLS-1$

-			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, ResourceChangeEvent.PRE_DELETE | ResourceChangeEvent.PRE_CLOSE);

-	}

-	

-	/**

-	 * 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.getPluginRegistry().getExtensionPoint(ID_EXTENSION_POINT_VM_CONNECTORS);

-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements(); 

-		MultiStatus status= new MultiStatus(getUniqueIdentifier(), IStatus.OK, LaunchingMessages.getString("LaunchingPlugin.Exception_occurred_reading_vmConnectors_extensions_1"), null); //$NON-NLS-1$

-		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);

-		}			

-	}

-	

-	/**

-	 * Save preferences whenever they change.

-	 * 

-	 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)

-	 */

-	public void propertyChange(PropertyChangeEvent event) {

-		if (event.getProperty().equals(JavaRuntime.PREF_CONNECT_TIMEOUT)) {

-			savePluginPreferences();

-		}

-	}

-

-	/**

-	 * @see IVMInstallChangedListener#defaultVMInstallChanged(IVMInstall, IVMInstall)

-	 */

-	public void defaultVMInstallChanged(

-		IVMInstall previous,

-		IVMInstall current) {

-	}

-

-	/**

-	 * @see IVMInstallChangedListener#vmAdded(IVMInstall)

-	 */

-	public void vmAdded(IVMInstall vm) {

-	}

-

-	/**

-	 * @see IVMInstallChangedListener#vmChanged(PropertyChangeEvent)

-	 */

-	public void vmChanged(

-		org.eclipse.jdt.launching.PropertyChangeEvent event) {

-	}

-

-	/**

-	 * @see IVMInstallChangedListener#vmRemoved(IVMInstall)

-	 */

-	public void vmRemoved(IVMInstall vm) {

-		JREContainerInitializer init = new JREContainerInitializer();

-		try {

-			init.updateRemovedVM(vm);

-		} 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();

-	}

-

-

-}

-

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 3a5c490..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/ListenerList.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-/**
- * 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/RuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
deleted file mode 100644
index 6f6be73..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntry.java
+++ /dev/null
@@ -1,557 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/**********************************************************************
-Copyright (c) 2002 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-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 org.apache.xerces.dom.DocumentImpl;
-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.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;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * 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;
-	
-	/**
-	 * 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.getString("RuntimeClasspathEntry.Illegal_classpath_entry_{0}_1"), new String[] {entry.toString()})); //$NON-NLS-1$
-		}
-		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
-	 * @exception CoreException if unable to resolve the given entry
-	 */
-	public RuntimeClasspathEntry(IClasspathEntry entry, int classpathProperty) throws CoreException {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_CONTAINER:
-				setType(CONTAINER);
-				break;
-			default:
-				throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.getString("RuntimeClasspathEntry.Illegal_classpath_entry_{0}_1"), new String[] {entry.toString()})); //$NON-NLS-1$
-		}
-		setClasspathEntry(entry);
-		setClasspathProperty(classpathProperty);
-	}
-	
-	/**
-	 * Reconstructs a runtime classpath entry from the given
-	 * memento.
-	 * 
-	 * @param memento a memento created by this class
-	 * @exception CoreException if unable to restore from the given memento
-	 */
-	public RuntimeClasspathEntry(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser =
-				DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-												
-			try {
-				setType(Integer.parseInt(root.getAttribute("type"))); //$NON-NLS-1$
-			} catch (NumberFormatException e) {
-				abort(LaunchingMessages.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_type_2"), e); //$NON-NLS-1$
-			}
-			try {
-				setClasspathProperty(Integer.parseInt(root.getAttribute("path"))); //$NON-NLS-1$
-			} catch (NumberFormatException e) {
-				abort(LaunchingMessages.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_location_3"), e); //$NON-NLS-1$
-			}			
-
-			// 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.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_-_missing_project_name_4"), null); //$NON-NLS-1$
-					} 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.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_-_missing_archive_path_5"), null); //$NON-NLS-1$
-						} else {
-							IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
-							if (res == null) {
-								abort(LaunchingMessages.getString("RuntimeClasspathEntry.Internal_archive_no_longer_exists___1") + path, null); //$NON-NLS-1$
-							}
-							setClasspathEntry(JavaCore.newLibraryEntry(res.getFullPath(), sourcePath, rootPath));
-						}
-					} else {
-						// external
-						setClasspathEntry(JavaCore.newLibraryEntry(new Path(path), sourcePath, rootPath));
-					}
-					break;
-				case VARIABLE :
-					String var = root.getAttribute("containerPath"); //$NON-NLS-1$
-					if (isEmpty(var)) {
-						abort(LaunchingMessages.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_-_missing_variable_name_6"), null); //$NON-NLS-1$
-					} else {
-						setClasspathEntry(JavaCore.newVariableEntry(new Path(var), sourcePath, rootPath));
-					}
-					break;
-				case CONTAINER :
-					var = root.getAttribute("containerPath"); //$NON-NLS-1$
-					if (isEmpty(var)) {
-						abort(LaunchingMessages.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_-_missing_variable_name_6"), null); //$NON-NLS-1$
-					} else {
-						setClasspathEntry(JavaCore.newContainerEntry(new Path(var)));
-					}
-					break;
-			}	
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;			
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(LaunchingMessages.getString("RuntimeClasspathEntry.Unable_to_recover_runtime_class_path_entry_-_parsing_error_8"), ex);	 //$NON-NLS-1$
-	}
-	
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Returns the classpath entry associated with this runtime classpath entry,
-	 * or <code>null</code> if none.
-	 *
-	 * @return classpath entry associated with this runtime classpath entry,
-	 *  or <code>null</code> if none
-	 */
-	protected IClasspathEntry getClasspathEntry() {
-		return fClasspathEntry;
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		
-		Document doc = new DocumentImpl();
-		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$
-		}
-		
-		try {
-			return JavaLaunchConfigurationUtils.serializeDocument(doc);
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, LaunchingMessages.getString("RuntimeClasspathEntry.An_exception_occurred_generating_runtime_classpath_memento_8"), e); //$NON-NLS-1$
-			throw new CoreException(status);
-		}
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getPath()
-	 */
-	public IPath getPath() {
-		return getClasspathEntry().getPath();
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getResource()
-	 */
-	public IResource getResource() {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		switch (getType()) {
-			case CONTAINER:
-			case VARIABLE:
-				return null;
-			default:
-				return root.findMember(getPath());
-		}
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getSourceAttachmentPath()
-	 */
-	public IPath getSourceAttachmentPath() {
-		return getClasspathEntry().getSourceAttachmentPath();
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#setSourceAttachmentPath(IPath)
-	 */
-	public void setSourceAttachmentPath(IPath path) {
-		updateClasspathEntry(getPath(), path, getSourceAttachmentRootPath());
-	}
-	
-	/**
-	 * @see IRuntimeClasspathEntry#getSourceAttachmentRootPath()
-	 */
-	public IPath getSourceAttachmentRootPath() {
-		return getClasspathEntry().getSourceAttachmentRootPath();
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#setSourceAttachmentPath(IPath)
-	 */
-	public void setSourceAttachmentRootPath(IPath path) {
-		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());
-				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) {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IResource res = root.findMember(path);
-			if (res == null) {
-				return path.toOSString();
-			} else {
-				return res.getLocation().toOSString();
-			}
-		}
-		return null;		
-	}
-
-	/**
-	 * @see IRuntimeClasspathEntry#getVariableName()
-	 */
-	public String getVariableName() {
-		if (getType() == IRuntimeClasspathEntry.VARIABLE || getType() == IRuntimeClasspathEntry.CONTAINER) {
-			return getPath().segment(0);
-		} else {
-			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) {
-					// containers are equal if their ID is equal
-					return getPath().equals(r.getPath());
-				} else if (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;
-		} else {
-			return one.equals(two);
-		}
-	}
-	
-	/**
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		if (getType() == CONTAINER) {
-			return getPath().segment(0).hashCode() + getType();
-		} else {
-			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;
-	}
-}
\ No newline at end of file
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 d12d9b1..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryListComparator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * 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);
-				try {
-					IRuntimeClasspathEntry entry1 = JavaRuntime.newRuntimeClasspathEntry(memento1);
-					IRuntimeClasspathEntry entry2 = JavaRuntime.newRuntimeClasspathEntry(memento2);
-					if (!entry1.equals(entry2)) {
-						return -1;
-					}
-				} catch (CoreException e) {
-					LaunchingPlugin.log(e);
-					return -1;
-				}
-			}
-			return 0;
-		}
-		return -1;
-	}
-
-}
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 bc800fa..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathEntryResolver.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-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$
-	}	
-
-	/**
-	 * @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 e102988..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/RuntimeClasspathProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-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 aa7d227..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/SocketAttachConnector.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.Status;
-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.getString("SocketAttachConnector.Socket_attaching_connector_not_available_3"), null, IJavaLaunchConfigurationConstants.ERR_SHARED_MEMORY_CONNECTOR_UNAVAILABLE); //$NON-NLS-1$
-		}
-		return connector;
-	}
-
-	/**
-	 * @see IVMConnector#getIdentifier()
-	 */
-	public String getIdentifier() {
-		return IJavaLaunchConfigurationConstants.ID_SOCKET_ATTACH_VM_CONNECTOR;
-	}
-
-	/**
-	 * @see IVMConnector#getName()
-	 */
-	public String getName() {
-		return LaunchingMessages.getString("SocketAttachConnector.Standard_(Socket_Attach)_4"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * 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));
-	}		
-
-	/**
-	 * @see IVMConnector#connect(Map, IProgressMonitor)
-	 */
-	public void connect(Map arguments, IProgressMonitor monitor, ILaunch launch) throws CoreException {
-		AttachingConnector connector= getAttachingConnector();
-		String portNumberString = (String)arguments.get("port"); //$NON-NLS-1$
-		if (portNumberString == null) {
-			abort(LaunchingMessages.getString("SocketAttachConnector.Port_unspecified_for_remote_connection._2"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_PORT); //$NON-NLS-1$
-		}
-		String host = (String)arguments.get("hostname"); //$NON-NLS-1$
-		if (host == null) {
-			abort(LaunchingMessages.getString("SocketAttachConnector.Hostname_unspecified_for_remote_connection._4"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_HOSTNAME); //$NON-NLS-1$
-		}
-		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);
-		ILaunchConfiguration configuration = launch.getLaunchConfiguration();
-		boolean allowTerminate = false;
-		if (configuration != null) {
-			allowTerminate = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_ALLOW_TERMINATE, false);
-		}
-		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);
-		} catch (UnknownHostException e) {
-			abort(MessageFormat.format(LaunchingMessages.getString("SocketAttachConnector.Failed_to_connect_to_remote_VM_because_of_unknown_host___{0}__1"), new String[]{host}), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); //$NON-NLS-1$
-		} catch (ConnectException e) {
-			abort(LaunchingMessages.getString("SocketAttachConnector.Failed_to_connect_to_remote_VM_as_connection_was_refused_2"), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); //$NON-NLS-1$
-		} catch (IOException e) {
-			abort(LaunchingMessages.getString("SocketAttachConnector.Failed_to_connect_to_remote_VM_1"), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); //$NON-NLS-1$
-		} catch (IllegalConnectorArgumentsException e) {
-			abort(LaunchingMessages.getString("SocketAttachConnector.Failed_to_connect_to_remote_VM_1"), e, IJavaLaunchConfigurationConstants.ERR_REMOTE_VM_CONNECTION_FAILED); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * 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('['); //$NON-NLS-1$
-		buffer.append(host);
-		buffer.append(':'); //$NON-NLS-1$
-		buffer.append(port);
-		buffer.append(']'); //$NON-NLS-1$
-		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 d00a8ac..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVM.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-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 ddd4cbd..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMRunner.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-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.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);
-	}
-
-	/**
-	 * @see IVMRunner#run(VMRunnerConfiguration, ILaunch, IProgressMonitor)
-	 */
-	public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		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= config.getVMArguments();
-		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;
-		}
-		
-		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.getDefault().newProcess(launch, p, renderProcessLabel(cmdLine));
-		process.setAttribute(JavaRuntime.ATTR_CMDLINE, renderCommandLine(cmdLine));
-	}
-}
-
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 428edaf..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/Standard11xVMType.java
+++ /dev/null
Binary files differ
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 99ebeed..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVM.java
+++ /dev/null
Binary files differ
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 bad25ae..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMDebugger.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.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.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 {
-
-	/**
-	 * Creates a new launcher
-	 */
-	public StandardVMDebugger(IVMInstall vmInstance) {
-		super(vmInstance);
-	}
-
-	/**
-	 * @see IVMRunner#run(VMRunnerConfiguration, ILaunch, IProgressMonitor)
-	 */
-	public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-
-		int port= SocketUtil.findUnusedLocalPort("", 5000, 15000); //$NON-NLS-1$
-		if (port == -1) {
-			abort(LaunchingMessages.getString("StandardVMDebugger.Could_not_find_a_free_socket_for_the_debugger_1"), null, IJavaLaunchConfigurationConstants.ERR_NO_SOCKET_AVAILABLE); //$NON-NLS-1$
-		}
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-		
-		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
-		addArguments(config.getVMArguments(), arguments);
-
-		String[] bootCP= config.getBootClassPath();
-		if (bootCP != null) {
-			if (bootCP.length > 0) {
-				arguments.add("-Xbootclasspath:" + convertClassPath(bootCP)); //$NON-NLS-1$
-			} else {
-				// empty
-				arguments.add("-Xbootclasspath:"); //$NON-NLS-1$
-			}
-		}
-		
-		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$
-		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);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-
-		ListeningConnector connector= getConnector();
-		if (connector == null) {
-			abort(LaunchingMessages.getString("StandardVMDebugger.Couldn__t_find_an_appropriate_debug_connector_2"), null, IJavaLaunchConfigurationConstants.ERR_CONNECTOR_NOT_AVAILABLE); //$NON-NLS-1$
-		}
-		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);				
-				if (p == null) {
-					return;
-				}
-				
-				// check for cancellation
-				if (monitor.isCanceled()) {
-					p.destroy();
-					return;
-				}				
-				
-				IProcess process= DebugPlugin.getDefault().newProcess(launch, p, renderProcessLabel(cmdLine));
-				process.setAttribute(JavaRuntime.ATTR_CMDLINE, renderCommandLine(cmdLine));
-				
-				boolean retry= false;
-				do  {
-					try {
-						VirtualMachine vm= connector.accept(map);
-						JDIDebugModel.newDebugTarget(launch, vm, renderDebugTarget(config.getClassToLaunch(), port), process, true, false);
-						return;
-					} catch (InterruptedIOException e) {
-						String errorMessage= process.getStreamsProxy().getErrorStreamMonitor().getContents();
-						if (errorMessage.length() == 0) {
-							errorMessage= process.getStreamsProxy().getOutputStreamMonitor().getContents();
-						}
-						if (errorMessage.length() != 0) {
-							abort(errorMessage, e, IJavaLaunchConfigurationConstants.ERR_VM_LAUNCH_ERROR);
-						} else {
-							// 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);
-							} else {
-								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.getString("StandardVMDebugger.Couldn__t_connect_to_VM_4"), e, IJavaLaunchConfigurationConstants.ERR_CONNECTION_FAILED);  //$NON-NLS-1$
-		} catch (IllegalConnectorArgumentsException e) {
-			abort(LaunchingMessages.getString("StandardVMDebugger.Couldn__t_connect_to_VM_5"), e, IJavaLaunchConfigurationConstants.ERR_CONNECTION_FAILED);  //$NON-NLS-1$
-		}
-		if (p != null) {
-			p.destroy();
-		}
-	}
-		
-	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 26c07cb..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMRunner.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.eclipse.jdt.internal.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-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.JavaRuntime;
-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.getString("StandardVMRunner.{0}_at_localhost_{1}_1"); //$NON-NLS-1$
-		return MessageFormat.format(format, new String[] { classToRun, String.valueOf(host) });
-	}
-
-	public static String renderProcessLabel(String[] commandLine) {
-		String format= LaunchingMessages.getString("StandardVMRunner.{0}_({1})_2"); //$NON-NLS-1$
-		String timestamp= DateFormat.getInstance().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(commandLine[0]);
-		for (int i= 1; i < commandLine.length; i++) {
-			buf.append(' ');
-			buf.append(commandLine[i]);
-		}	
-		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]);
-		}
-	}
-	
-	protected String getJDKLocation() {
-		File location= fVMInstance.getInstallLocation();
-		return location.getAbsolutePath();
-	}
-	
-	/**
-	 * 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.getString("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); //$NON-NLS-1$
-		}
-		return dir;
-	}
-	
-	/**
-	 * @see VMRunner#getPluginIdentifier()
-	 */
-	protected String getPluginIdentifier() {
-		return LaunchingPlugin.getUniqueIdentifier();
-	}
-	
-	protected String constructProgramString(VMRunnerConfiguration config) {
-		String command= null;
-		Map map= config.getVMSpecificAttributesMap();
-		if (map != null) {
-			command = (String)map.get(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND);
-		}
-		StringBuffer buff= new StringBuffer(getJDKLocation());
-		buff.append(File.separator);
-		buff.append("bin"); //$NON-NLS-1$
-		buff.append(File.separator);
-		String jdkLocation= buff.toString();
-		if (command == null) {
-			buff.append("java"); //$NON-NLS-1$
-			return adjustProgramString(buff.toString());
-		} 
-		
-		buff.append(command);
-		String program= buff.toString();
-		File exe= new File(program + ".exe"); //$NON-NLS-1$
-		File javaCommand= new File(program); 
-		
-		if (!exe.isFile() && !javaCommand.isFile()) {
-			File java= new File(jdkLocation + "java.exe"); //$NON-NLS-1$
-			if (java.isFile()) {
-				program= java.getAbsolutePath();
-			} else {
-				java= new File(jdkLocation + "java"); //$NON-NLS-1$
-				if (java.isFile()) {
-					program= java.getAbsolutePath();
-				}
-			}
-		}
-		return program;
-	}	
-
-	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();
-	}
-
-
-	/**
-	 * @see IVMRunner#run(VMRunnerConfiguration, ILaunch, IProgressMonitor)
-	 */
-	public void run(VMRunnerConfiguration config, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		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= config.getVMArguments();
-		addArguments(vmArgs, arguments);
-				
-		String[] bootCP= config.getBootClassPath();
-		if (bootCP != null) {
-			if (bootCP.length > 0) {
-				arguments.add("-Xbootclasspath:" + convertClassPath(bootCP)); //$NON-NLS-1$
-			} else {
-				// empty
-				arguments.add("-Xbootclasspath:"); //$NON-NLS-1$	
-			}
-		}
-		
-		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);
-
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		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.getDefault().newProcess(launch, p, renderProcessLabel(cmdLine));
-		process.setAttribute(JavaRuntime.ATTR_CMDLINE, renderCommandLine(cmdLine));
-	}
-
-	protected String adjustProgramString(String program) {
-		
-		File javawexe= new File(program + "w.exe"); //$NON-NLS-1$
-		File javaw= new File(program + "w"); //$NON-NLS-1$
-		if (javawexe.isFile()) {
-			program= javawexe.getAbsolutePath();
-		} else if (javaw.isFile()) {
-			program= javaw.getAbsolutePath();
-		}
-		
-		return program;
-	}	
-
-}
\ No newline at end of file
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 f34cfe2..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
+++ /dev/null
Binary files differ
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 1b6ce71..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-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.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.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-import org.eclipse.jdt.launching.sourcelookup.JavaSourceLocator;
-
-/**
- * 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 implements ILaunchConfigurationDelegate {
-	
-	/**
-	 * 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
-	 */
-	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 - i.e. that its home location
-	 * is specified and 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.getString("AbstractJavaLaunchConfigurationDelegate.The_specified_JRE_installation_does_not_exist_4"), null, IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); //$NON-NLS-1$
-		}
-		File location = vm.getInstallLocation();
-		if (location == null) {
-			abort(MessageFormat.format(LaunchingMessages.getString("AbstractJavaLaunchConfigurationDelegate.JRE_home_directory_not_specified_for_{0}_5"), new String[]{vm.getName()}), null, IJavaLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST); //$NON-NLS-1$
-		}
-		if (!location.exists()) {
-			abort(MessageFormat.format(LaunchingMessages.getString("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); //$NON-NLS-1$
-		}
-				
-		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 {
-		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) {
-				empty = false;
-				bootEntries.add(entries[i].getLocation());
-				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 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) {
-				userEntries.add(entries[i].getLocation());
-			}
-		}
-		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 {
-		return configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-	}
-
-	/**
-	 * 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 {
-		return configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
-	}	
-
-	/**
-	 * 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 {
-		return configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
-	}	
-
-	/**
-	 * 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 {
-		return configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE_SPECIFIC_ATTRS_MAP, (Map)null);
-	}
-	
-	/**
-	 * 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) {
-			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.getString("AbstractJavaLaunchConfigurationDelegate.Java_project_not_specified_9"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT); //$NON-NLS-1$
-		}
-		IJavaProject project = getJavaProject(configuration);
-		if (project == null) {
-			abort(LaunchingMessages.getString("AbstractJavaLaunchConfigurationDelegate.Project_does_not_exist_or_is_not_a_Java_project_10"), null, IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT); //$NON-NLS-1$
-		}
-		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.getString("AbstractJavaLaunchConfigurationDelegate.Main_type_not_specified_11"), null, IJavaLaunchConfigurationConstants.ERR_UNSPECIFIED_MAIN_TYPE); //$NON-NLS-1$
-		}
-		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;
-				} else {
-					abort(MessageFormat.format(LaunchingMessages.getString("AbstractJavaLaunchConfigurationDelegate.Working_directory_does_not_exist__{0}_12"), new String[] {path.toString()}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); //$NON-NLS-1$
-				}
-			} else {
-				IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-				if (res instanceof IContainer && res.exists()) {
-					return res.getLocation().toFile();
-				} else {
-					abort(MessageFormat.format(LaunchingMessages.getString("AbstractJavaLaunchConfigurationDelegate.Working_directory_does_not_exist__{0}_12"), new String[] {path.toString()}), null, IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST); //$NON-NLS-1$
-				}
-			}
-		}
-		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);
-	}					
-	
-	/**
-	 * 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) {
-			String id = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, (String)null);
-			if (id == null) {
-				IJavaProject javaProject = JavaRuntime.getJavaProject(configuration);
-				if (javaProject != null) {
-					ISourceLocator sourceLocator = new JavaSourceLocator(javaProject);
-					launch.setSourceLocator(sourceLocator);					
-				}
-			}
-		}
-	}
-
-}
-
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 4f6b7d7..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstall.java
+++ /dev/null
Binary files differ
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 554af8e..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMInstallType.java
+++ /dev/null
Binary files differ
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 b0d2e5c..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractVMRunner.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.File;
-import java.io.IOException;
-
-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.IStatusHandler;
-import org.eclipse.jdt.internal.launching.LaunchingMessages;
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-
-/**
- * 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
-	 */
-	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();
-	
-	/**
-	 * Performs a runtime exec on the given command line in the context
-	 * of the specified working directory, and returns
-	 * the resulting process. If the current runtime does not support the
-	 * specification of a working directory, the status handler for error code
-	 * <code>ERR_WORKING_DIRECTORY_NOT_SUPPORTED</code> is queried to see if the
-	 * exec should be re-executed without specifying a working directory.
-	 * 
-	 * @param cmdLine the command line
-	 * @param workingDirectory the working directory, or <code>null</code>
-	 * @return the resulting process or <code>null</code> if the exec is
-	 *  cancelled
-	 * @see Runtime
-	 */
-	protected Process exec(String[] cmdLine, File workingDirectory) throws CoreException {
-		Process p= null;
-		try {
-			if (workingDirectory == null) {
-				p= Runtime.getRuntime().exec(cmdLine, null);
-			} else {
-				p= Runtime.getRuntime().exec(cmdLine, null, workingDirectory);
-			}
-		} catch (IOException e) {
-				if (p != null) {
-					p.destroy();
-				}
-				abort(LaunchingMessages.getString("AbstractVMRunner.Exception_starting_process_1"), e, IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$
-		} catch (NoSuchMethodError e) {
-			//attempting launches on 1.2.* - no ability to set working directory
-			
-			IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_NOT_SUPPORTED, LaunchingMessages.getString("AbstractVMRunner.Eclipse_runtime_does_not_support_working_directory_2"), e); //$NON-NLS-1$
-			IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
-			
-			if (handler != null) {
-				Object result = handler.handleStatus(status, this);
-				if (result instanceof Boolean && ((Boolean)result).booleanValue()) {
-					p= exec(cmdLine, null);
-				}
-			}
-		}
-		return p;
-	}			
-			
-}
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 585a466..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/ExecutionArguments.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.eclipse.jdt.launching;

-

-/**********************************************************************

-Copyright (c) 2000, 2002 IBM Corp. and others.

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Common Public License v0.5

-which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/cpl-v05.html

-

-Contributors:

-    IBM Corporation - Initial implementation

-*********************************************************************/

-

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * 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 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 parseArguments(fProgramArgs);

-	}	

-			

-	private static class ArgumentParser {

-		private String fArgs;

-		private int fIndex= 0;

-		private int ch= -1;

-		

-		public ArgumentParser(String args) {

-			fArgs= args;

-		}

-		

-		public String[] parseArguments() {

-			List v= new ArrayList();

-			

-			ch= getNext();

-			while (ch > 0) {

-				while (Character.isWhitespace((char)ch))

-					ch= getNext();	

-				

-				if (ch == '"') {

-					v.add(parseString());

-				} else {

-					v.add(parseToken());

-				}

-			}

-	

-			String[] result= new String[v.size()];

-			v.toArray(result);

-			return result;

-		}

-		

-		private int getNext() {

-			if (fIndex < fArgs.length())

-				return fArgs.charAt(fIndex++);

-			return -1;

-		}

-		

-		private String parseString() {

-			StringBuffer buf= new StringBuffer();

-			ch= getNext();

-			while (ch > 0 && ch != '"') {

-				if (ch == '\\') {

-					ch= getNext();

-					if (ch != '"') {           // Only escape double quotes

-						buf.append('\\'); 

-					}

-				}

-				if (ch > 0) {

-					buf.append((char)ch);

-					ch= getNext();

-				}

-			}

-	

-			ch= getNext();

-				

-			return buf.toString();

-		}

-		

-		private String parseToken() {

-			StringBuffer buf= new StringBuffer();

-			

-			while (ch > 0 && !Character.isWhitespace((char)ch)) {

-				if (ch == '\\') {

-					ch= getNext();

-					if (ch > 0) {

-						if (ch != '"') {        // Only escape double quotes

-							buf.append('\\'); 

-						}

-						buf.append((char)ch);

-						ch= getNext();

-					} else if (ch == -1) {     // Don't lose a trailing backslash

-						buf.append('\\');

-					}

-				} else if (ch == '"') {

-					buf.append(parseString());

-				} else {

-					buf.append((char)ch);

-					ch= getNext();

-				}

-			}

-			return buf.toString();

-		}

-	}

-	

-	private static String[] parseArguments(String args) {

-		if (args == null)

-			return new String[0];

-		ArgumentParser parser= new ArgumentParser(args);

-		String[] res= parser.parseArguments();

-		

-		return res;

-	}

-}
\ No newline at end of file
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 28bfbba..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IJavaLaunchConfigurationConstants.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package org.eclipse.jdt.launching;
-
-import org.eclipse.jdt.internal.launching.LaunchingPlugin;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-/**
- * 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 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$	
-			
-	/**
-	 * 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 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 lanuch 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$
-	
-	/**
-	 * Launch configuration attribute key. 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$
-	
-	/**
-	 * 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 an unexpected internal error.
-	 */
-	public static final int ERR_INTERNAL_ERROR = 150;			
-}
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 0780801..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * 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 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
- * 		conatiner variable which refers to a collection of archives derived
- * 		dynamically, on a per project basis.</li>
- * </ul>
- * <p>
- * Clients are not intended to implement this interface.
- * </p>
- * @since 2.0
- */
-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;
-	
-	/**
-	 * Tpye identifier for container entries.
-	 */
-	public static final int CONTAINER = 4;
-
-	/**
-	 * 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>
-	 * </ul>
-	 * 
-	 * @return this classpath entry's type
-	 */
-	public int getType();
-	
-	/**
-	 * Returns a memento for this classpath entry.
-	 * 
-	 * @return a memento for this classpath entry
-	 * @exception CoreException if an exception occurrs generating a memento
-	 */
-	public String getMemento() throws CoreException;
-	
-	/**
-	 * Returns the path associated with this entry. 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>VARIALBE</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>
-	 * </ul>
-	 * 
-	 * @return the path associated with this entry
-	 * @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>
-	 *
-	 * @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. An empty path indicates that packages are located at
-	 * the root of the source archive. Only valid if a source attachment
-	 * path is also specified.
-	 *
-	 * @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
-	 * 		conatining 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();
-}
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 068a0ad..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntryResolver.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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 12d125f..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-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 dd751bc..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeContainerComparator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-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
- */
-public interface IRuntimeContainerComparator {
-	
-	/**
-	 * Returns whether this container is a duplicate of the conatiner
-	 * identified by the given path.
-	 * 
-	 * @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 af8bab2..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMConnector.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2002
- * All Rights Reserved.
- */
- 
-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 e5e6ecd..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstall.java
+++ /dev/null
Binary files differ
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 56cc5e5..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallChangedListener.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-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 3738f27..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMInstallType.java
+++ /dev/null
Binary files differ
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 847dbb7..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IVMRunner.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-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;	

-	

-}
\ No newline at end of file
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 d2b4acb..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ /dev/null
@@ -1,1605 +0,0 @@
-package org.eclipse.jdt.launching;

-

-/*******************************************************************************

- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v0.5 

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v05.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- ******************************************************************************/

-

-import java.io.BufferedInputStream;

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-import java.io.Reader;

-import java.text.MessageFormat;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.HashMap;

-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.ParserConfigurationException;

-

-import org.apache.xerces.dom.DocumentImpl;

-import org.eclipse.core.resources.IResource;

-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.debug.core.ILaunchConfiguration;

-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.JREContainerInitializer;

-import org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer;

-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.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.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;

-

-/**

- * 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.

-	 */

-	public static final String JRELIB_VARIABLE= "JRE_LIB"; //$NON-NLS-1$

-

-	/**

-	 * Classpath variable name used for the default JRE's library source.

-	 */

-	public static final String JRESRC_VARIABLE= "JRE_SRC"; //$NON-NLS-1$

-	

-	/**

-	 * Classpath variable name used for the default JRE's library source root.

-	 */	

-	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. 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 millieseconds.

-	 * 

-	 * @since 2.0

-	 */

-	public static final String PREF_CONNECT_TIMEOUT = LaunchingPlugin.getUniqueIdentifier() + ".PREF_CONNECT_TIMEOUT"; //$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.

-	 */

-	public final static String ATTR_CMDLINE= LaunchingPlugin.getUniqueIdentifier() + ".launcher.cmdLine"; //$NON-NLS-1$

-

-	private static IVMInstallType[] fgVMTypes= null;

-	private static String fgDefaultVMId= null;

-	private static String fgDefaultVMConnectorId = null;

-	

-	/**

-	 * Resolvers keyed by variable name and container id.

-	 */

-	private static Map fgVariableResolvers = null;

-	private static Map fgContainerResolvers = 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);

-	

-	/**

-	 * Not intended to be instantiated.

-	 */

-	private JavaRuntime() {

-	}

-

-	/**

-	 * 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 IVMInstallType[] getVMInstallTypes() {

-		if (fgVMTypes == null) {

-			initializeVMTypes();

-		}

-		return fgVMTypes; 

-	}

-	

-	private static synchronized void initializeVMTypes() {

-		IExtensionPoint extensionPoint= Platform.getPluginRegistry().getExtensionPoint(LaunchingPlugin.getUniqueIdentifier() + ".vmInstallTypes"); //$NON-NLS-1$

-		IConfigurationElement[] configs= extensionPoint.getConfigurationElements(); 

-		MultiStatus status= new MultiStatus(LaunchingPlugin.getUniqueIdentifier(), IStatus.OK, LaunchingMessages.getString("JavaRuntime.exceptionOccurred"), null); //$NON-NLS-1$

-		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);

-		}

-	}

-

-	/**

-	 * 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.

-	 * 

-	 * @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;

-	}

-	

-	private static IVMInstall getVMFromId(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 the VM install type with the given 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 {

-		IVMInstall previous = null;

-		if (fgDefaultVMId != null) {

-			previous = getVMFromId(fgDefaultVMId);

-		}

-		fgDefaultVMId= getIdFromVM(vm);

-		updateJREVariables(monitor);

-		saveVMConfiguration();

-		IVMInstall current = null;

-		if (fgDefaultVMId != null) {

-			current = getVMFromId(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 null to clear 

-	 * 				the default.

-	 * @since 2.0

-	 */

-	public static void setDefaultVMConnector(IVMConnector connector, IProgressMonitor monitor) throws CoreException {

-		fgDefaultVMConnectorId= connector.getIdentifier();

-		saveVMConfiguration();

-	}		

-	

-	private static void updateJREVariables(IProgressMonitor monitor) throws CoreException {

-		JavaClasspathVariablesInitializer updater= new JavaClasspathVariablesInitializer();

-		updater.updateJREVariables(monitor);

-		JREContainerInitializer conatinerUpdater = new JREContainerInitializer();

-		conatinerUpdater.updateDefaultJREContainers(monitor);

-	}

-	/**

-	 * 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= getVMFromId(getDefaultVMId());

-		if (install != null && install.getInstallLocation().exists()) {

-			return install;

-		} else {

-			// if the default JRE goes missing, re-detect

-			if (install != null) {

-				install.getVMInstallType().disposeVMInstall(install.getId());

-			}

-			fgDefaultVMId = null;

-			try {

-				//get rid of bad values on disk

-				saveVMConfiguration();

-			} catch(CoreException e) {

-				LaunchingPlugin.log(e);

-			}

-			detectVMConfiguration();

-			return getVMFromId(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;

-	}	

-	

-	private static String getDefaultVMId() {

-		if (fgVMTypes == null) {

-			initializeVMTypes();

-		}

-		return fgDefaultVMId;

-	}

-	

-	private static String getDefaultVMConnectorId() {

-		if (fgVMTypes == null) {

-			initializeVMTypes();

-		}

-		return fgDefaultVMConnectorId;

-	}	

-	

-	private static String getIdFromVM(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();

-	}

-	

-	/**

-	 * 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 {

-		IClasspathEntry cpe = JavaCore.newContainerEntry(path);

-		return new RuntimeClasspathEntry(cpe, classpathProperty);

-	}

-		

-	/**

-	 * Returns a runtime classpath entry constructed from the given memento.

-	 * 

-	 * @param memento a menento 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 {

-		return new RuntimeClasspathEntry(memento);

-	}

-	

-	/**

-	 * 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 entry = JavaCore.newProjectEntry(project.getProject().getFullPath());

-		List classpathEntries = new ArrayList(5);

-		expandProject(entry, classpathEntries);

-		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] = newRuntimeClasspathEntry(cpe);

-			} else {

-				runtimeEntries[i] = (IRuntimeClasspathEntry)e;				

-			}

-		}

-		// sort bootpath and standard entries first

-		IRuntimeClasspathEntry[] ordered = new IRuntimeClasspathEntry[runtimeEntries.length];

-		int index = 0;

-		for (int i = 0; i < runtimeEntries.length; i++) {

-			if (runtimeEntries[i].getClasspathProperty() != IRuntimeClasspathEntry.USER_CLASSES) {

-				ordered[index] = runtimeEntries[i];

-				index++;

-				runtimeEntries[i] = null;

-			} 

-		}

-		for (int i = 0; i < runtimeEntries.length; i++) {

-			if (runtimeEntries[i] != null) {

-				ordered[index] = runtimeEntries[i];

-				index++;

-			}

-		}

-		return ordered;

-	}

-	

-	/**

-	 * 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);	

-		}

-		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);

-		}

-		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>CONTAINTER</code>, variable and contanier

-	 * resolvers are consulted, otherwise, the returned entry is the same as the 

-	 * given entry.

-	 * <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.VARIABLE:

-				IRuntimeClasspathEntryResolver resolver = getVariableResolver(entry.getVariableName());

-				if (resolver == null) {

-					// no resolution by default

-					break;

-				} else {

-					return resolver.resolveRuntimeClasspathEntry(entry, configuration);

-				}				

-			case IRuntimeClasspathEntry.CONTAINER:

-				resolver = getContainerResolver(entry.getVariableName());

-				if (resolver == null) {

-					return computeDefaultContainerEntries(entry, configuration);

-				} else {

-					return resolver.resolveRuntimeClasspathEntry(entry, configuration);

-				}

-			default:

-				break;

-		}

-		return new IRuntimeClasspathEntry[] {entry};

-	}

-	

-	/**

-	 * 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>CONTAINTER</code>, variable and contanier

-	 * resolvers are consulted, otherwise, the returned entry is the same as the given

-	 * entry.

-	 * <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.VARIABLE:

-				IRuntimeClasspathEntryResolver resolver = getVariableResolver(entry.getVariableName());

-				if (resolver == null) {

-					// no resolution by default

-					break;

-				} else {

-					return resolver.resolveRuntimeClasspathEntry(entry, project);

-				}				

-			case IRuntimeClasspathEntry.CONTAINER:

-				resolver = getContainerResolver(entry.getVariableName());

-				if (resolver == null) {

-					return computeDefaultContainerEntries(entry, project);

-				} else {

-					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 {

-		return computeDefaultContainerEntries(entry, getJavaProject(config));

-	}

-	

-	/**

-	 * 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) {

-			// cannot resolve without project context

-			return new IRuntimeClasspathEntry[0];

-		} else {							

-			IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);

-			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;

-			}			

-			IRuntimeClasspathEntry[] resolved = new IRuntimeClasspathEntry[cpes.length];

-			for (int i = 0; i < resolved.length; i++) {

-				resolved[i] = newRuntimeClasspathEntry(cpes[i]);

-				resolved[i].setClasspathProperty(property);

-			}

-			return resolved;

-		}

-	}

-			

-	/**

-	 * 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.exists()) {

-			abort(MessageFormat.format(LaunchingMessages.getString("JavaRuntime.Launch_configuration_{0}_references_non-existing_project_{1}._1"), new String[] {configuration.getName(), projectName}), IJavaLaunchConfigurationConstants.ERR_NOT_A_JAVA_PROJECT, null); //$NON-NLS-1$

-		}

-		return javaProject;

-	}

-				

-	/**

-	 * Convenience method to get the java model.

-	 */

-	private static IJavaModel getJavaModel() {

-		return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());

-	}

-	

-	

-	/**

-	 * Returns a collection of runtime classpath entries that are defined in the

-	 * specified attribute of the given launch configuration.

-	 * 

-	 * @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

-	 */

-	private static IRuntimeClasspathEntry[] recoverRuntimePath(ILaunchConfiguration configuration, String attribute) throws CoreException {

-		List entries = (List)configuration.getAttribute(attribute, Collections.EMPTY_LIST);

-		IRuntimeClasspathEntry[] rtes = new IRuntimeClasspathEntry[entries.size()];

-		Iterator iter = entries.iterator();

-		int i = 0;

-		while (iter.hasNext()) {

-			rtes[i] = newRuntimeClasspathEntry((String)iter.next());

-			i++;

-		}

-		return rtes;		

-	}

-	

-	/**

-	 * 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.getString("JavaRuntime.Specified_VM_install_type_does_not_exist__{0}_2"), new String[] {type}), null); //$NON-NLS-1$

-			}

-			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.getString("JavaRuntime.VM_not_fully_specified_in_launch_configuration_{0}_-_missing_VM_name._Reverting_to_default_VM._1"), new String[] {configuration.getName()}), null); //$NON-NLS-1$

-				LaunchingPlugin.log(status);

-				return getDefaultVMInstall();

-			} else {

-				vm = vt.findVMInstallByName(name);

-				if (vm == null) {

-					// error - install not found

-					abort(MessageFormat.format(LaunchingMessages.getString("JavaRuntime.Specified_VM_install_not_found__type_{0},_name_{1}_2"), new String[] {type, name}), null);					 //$NON-NLS-1$

-				} 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));

-	}	

-					

-	/**

-	 * Returns the transitive closure of classpath entries for the

-	 * given project entry.

-	 * 

-	 * @param projectEntry project classpath entry

-	 * @param a list of entries already expanded, should be empty to begin,

-	 *  and contains the result

-	 * @exception CoreException if unable to expand the classpath

-	 */

-	private static void expandProject(IClasspathEntry projectEntry, List expandedPath) throws CoreException {

-		// 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) {

-			return;

-		}

-		IJavaProject project = (IJavaProject)JavaCore.create(res);

-		if (project == null) {

-			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 (!expandedPath.contains(entry)) {

-							expandProject(entry, expandedPath);

-						}

-						break;

-					case IClasspathEntry.CPE_CONTAINER:

-						IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);

-						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;

-						}

-						IRuntimeClasspathEntry r = newRuntimeContainerClasspathEntry(entry.getPath(), property);

-						// check for duplicate/redundant entries 

-						boolean duplicate = false;

-						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());

-										if (duplicate) {

-											break;

-										}

-									} else if (re.getVariableName().equals(r.getVariableName())) {

-										duplicate = true;

-										break;

-									}

-								}

-							}

-						}

-						if (!duplicate) {

-							expandedPath.add(r);

-						}	

-						break;

-					case IClasspathEntry.CPE_VARIABLE:

-						if (entry.getPath().segment(0).equals(JRELIB_VARIABLE)) {

-							r = 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;

-	}

-		

-	/**

-	 * 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 (unresolved[i].getClasspathProperty() == IRuntimeClasspathEntry.USER_CLASSES) {

-				switch (entry.getType()) {

-					case IRuntimeClasspathEntry.CONTAINER:

-						IRuntimeClasspathEntry[] contained = computeDefaultContainerEntries(entry, jproject);

-						for (int j = 0; j < contained.length; j++) {

-							resolved.add(contained[j].getLocation());

-						}

-						break;

-					default:

-						resolved.add(entry.getLocation());

-						break;

-				}

-			}

-		}

-		return (String[])resolved.toArray(new String[resolved.size()]);

-	}	

-		

-	/**

-	 * Saves the VM configuration information to disk. 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 {

-		IPath stateLocation= LaunchingPlugin.getDefault().getStateLocation();

-		IPath stateFile= stateLocation.append("vmConfiguration.xml"); //$NON-NLS-1$

-		File f= new File(stateFile.toOSString());

-		try {

-			String xml = getVMsAsXML();

-			FileOutputStream stream = new FileOutputStream(f);

-			stream.write(xml.getBytes("UTF8")); //$NON-NLS-1$

-			stream.close();			

-		} catch (IOException e) {

-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IStatus.ERROR, LaunchingMessages.getString("JavaRuntime.ioExceptionOccurred"), e)); //$NON-NLS-1$

-		}

-		

-	}

-	

-	private static String getVMsAsXML() throws IOException {

-		Document doc = new DocumentImpl();

-		Element config = doc.createElement("vmSettings"); //$NON-NLS-1$

-		if (fgDefaultVMId != null) {

-			config.setAttribute("defaultVM", fgDefaultVMId); //$NON-NLS-1$

-		}

-		if (fgDefaultVMConnectorId != null) {

-			config.setAttribute("defaultVMConnector", fgDefaultVMConnectorId); //$NON-NLS-1$

-		}

-		doc.appendChild(config);

-		

-		IVMInstallType[] vmTypes= getVMInstallTypes();

-

-		for (int i = 0; i < vmTypes.length; ++i) {

-			Element vmTypeElement = vmTypeAsElement(doc, vmTypes[i]);

-			config.appendChild(vmTypeElement);

-		}

-

-		return JavaLaunchConfigurationUtils.serializeDocument(doc);

-	}

-	

-	private static Element vmTypeAsElement(Document doc, IVMInstallType vmType) {

-		Element element= doc.createElement("vmType"); //$NON-NLS-1$

-		element.setAttribute("id", vmType.getId()); //$NON-NLS-1$

-		IVMInstall[] vms= vmType.getVMInstalls();

-		for (int i= 0; i < vms.length; i++) {

-			Element vmElement= vmAsElement(doc, vms[i]);

-			element.appendChild(vmElement);

-		}

-		return element;

-	}

-	

-	private static Element vmAsElement(Document doc, IVMInstall vm) {

-		Element element= doc.createElement("vm"); //$NON-NLS-1$

-		element.setAttribute("id", vm.getId());	 //$NON-NLS-1$

-		element.setAttribute("name", vm.getName()); //$NON-NLS-1$

-		String installPath= ""; //$NON-NLS-1$

-		File installLocation= vm.getInstallLocation();

-		if (installLocation != null) {

-			installPath= installLocation.getAbsolutePath();

-		}

-		element.setAttribute("path", installPath); //$NON-NLS-1$

-		LibraryLocation[] libraryLocations= vm.getLibraryLocations();

-		if (libraryLocations != null) {

-			Element libLocationElement=  libraryLocationsAsElement(doc, libraryLocations);

-			element.appendChild(libLocationElement);

-		}

-		return element;

-	}

-	

-	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$

-			element.setAttribute("pkgRoot", locations[i].getPackageRootPath().toString()); //$NON-NLS-1$

-			root.appendChild(element);

-		}

-		return root;

-	}

-	

-	private static void initializeVMConfiguration() throws IOException {

-		IPath stateLocation= LaunchingPlugin.getDefault().getStateLocation();

-		IPath stateFile= stateLocation.append("vmConfiguration.xml"); //$NON-NLS-1$

-		File f= new File(stateFile.toOSString());

-		if (f.isFile()) {

-			loadVMConfiguration(f);

-		} else {

-			detectVMConfiguration();

-		}

-	}

-	

-	private static void loadVMConfiguration(File f) throws IOException {

-		InputStream stream= new BufferedInputStream(new FileInputStream(f));

-		Reader reader= new InputStreamReader(stream, "UTF-8"); //$NON-NLS-1$

-		Element config= null;

-		try {

-			DocumentBuilder parser= DocumentBuilderFactory.newInstance().newDocumentBuilder();

-			config = parser.parse(new InputSource(reader)).getDocumentElement();

-		} catch (SAXException e) {

-			throw new IOException(LaunchingMessages.getString("JavaRuntime.badFormat")); //$NON-NLS-1$

-		} catch (ParserConfigurationException e) {

-			reader.close();

-			throw new IOException(LaunchingMessages.getString("JavaRuntime.badFormat")); //$NON-NLS-1$

-		} finally {

-			reader.close();

-		}

-		if (!config.getNodeName().equalsIgnoreCase("vmSettings")) { //$NON-NLS-1$

-			throw new IOException(LaunchingMessages.getString("JavaRuntime.badFormat")); //$NON-NLS-1$

-		}

-		fgDefaultVMId= config.getAttribute("defaultVM"); //$NON-NLS-1$

-		fgDefaultVMConnectorId = config.getAttribute("defaultVMConnector"); //$NON-NLS-1$

-		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$

-					createFromVMType(vmTypeElement);

-				}

-			}

-		}

-	}

-	

-	private static void detectVMConfiguration() {

-		IVMInstallType[] vmTypes= getVMInstallTypes();

-		boolean defaultSet= false;

-		for (int i= 0; i < vmTypes.length; i++) {

-			File detectedLocation= vmTypes[i].detectInstallLocation();

-			if (detectedLocation != null) {

-				int unique = i;

-				IVMInstallType vmType = vmTypes[i];

-				while (vmType.findVMInstall(String.valueOf(unique)) != null) {

-					unique++;

-				}

-				IVMInstall detected= vmTypes[i].createVMInstall(String.valueOf(unique));

-				detected.setName(LaunchingMessages.getString("JavaRuntime.detectedSuffix")); //$NON-NLS-1$

-				detected.setInstallLocation(detectedLocation);

-				if (detected != null && !defaultSet) {

-					try {

-						setDefaultVMInstall(detected, null);

-						defaultSet= true;

-					} catch (CoreException e) {

-						LaunchingPlugin.log(e);

-					}

-				}

-			}

-		}

-	}

-	

-	private static void createFromVMType(Element vmTypeElement) {

-		String id = vmTypeElement.getAttribute("id"); //$NON-NLS-1$

-		IVMInstallType vmType= getVMInstallType(id);

-		if (vmType != null) {

-			NodeList list = vmTypeElement.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 vmElement = (Element) node;

-					if (vmElement.getNodeName().equalsIgnoreCase("vm")) { //$NON-NLS-1$

-						createVM(vmType, vmElement);

-					}

-				}

-			}

-		} else {

-			LaunchingPlugin.log(LaunchingMessages.getString("JavaRuntime.VM_type_element_with_unknown_id_1")); //$NON-NLS-1$

-		}

-	}

-

-	private static void createVM(IVMInstallType vmType, Element vmElement) {

-		String id= vmElement.getAttribute("id"); //$NON-NLS-1$

-		if (id != null) {

-			String installPath= vmElement.getAttribute("path"); //$NON-NLS-1$

-			if (installPath == null) {

-				return;

-			}

-			File installLocation= new File(installPath);

-			if (!installLocation.exists()) {

-				return;

-			}

-			IVMInstall vm= vmType.createVMInstall(id);

-			vm.setName(vmElement.getAttribute("name")); //$NON-NLS-1$

-			vm.setInstallLocation(installLocation);

-			

-			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 libraryLocationElement= (Element)node;

-					if (libraryLocationElement.getNodeName().equals("libraryLocation")) { //$NON-NLS-1$

-						LibraryLocation loc = getLibraryLocation(vm, libraryLocationElement);

-						vm.setLibraryLocations(new LibraryLocation[]{loc});

-						break;

-					} else if (libraryLocationElement.getNodeName().equals("libraryLocations")) { //$NON-NLS-1$

-						setLibraryLocations(vm, libraryLocationElement);

-						break;

-					}

-				}

-			}

-

-		} else {

-			LaunchingPlugin.log(LaunchingMessages.getString("JavaRuntime.VM_element_specified_with_no_id_attribute_2")); //$NON-NLS-1$

-		}

-	}

-	

-	private static LibraryLocation getLibraryLocation(IVMInstall vm, 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$

-		if (jreJar != null && jreSrc != null && pkgRoot != null) {

-			return new LibraryLocation(new Path(jreJar), new Path(jreSrc), new Path(pkgRoot));

-		} else {

-			LaunchingPlugin.log(LaunchingMessages.getString("JavaRuntime.Library_location_element_incorrectly_specified_3")); //$NON-NLS-1$

-		}

-		return null;

-	}

-	

-	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(vm, libraryLocationElement));

-				}

-			}

-		}	

-		vm.setLibraryLocations((LibraryLocation[])locations.toArray(new LibraryLocation[locations.size()]));

-	}

-		

-	/**

-	 * 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;

-		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];

-			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];

-			for (int i = 0; i < locations.length; i++) {			

-				libraryPaths[i]= locations[i].getSystemLibraryPath();

-				sourcePaths[i]= locations[i].getSystemLibrarySourcePath();

-				sourceRootPaths[i]= locations[i].getPackageRootPath();

-			}

-		}

-		locations = new LibraryLocation[sourcePaths.length];

-		for (int i = 0; i < sourcePaths.length; i++) {

-			locations[i] = new LibraryLocation(libraryPaths[i], sourcePaths[i], sourceRootPaths[i]);

-		}

-		return locations;

-	}

-	

-	/**

-	 * 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 connetor 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;

-	}

-	

-	private static void initializeResolvers() {

-		IExtensionPoint point = LaunchingPlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_RUNTIME_CLASSPATH_ENTRY_RESOLVERS);

-		IConfigurationElement[] extensions = point.getConfigurationElements();

-		fgVariableResolvers = new HashMap(extensions.length);

-		fgContainerResolvers = 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();

-			if (variable != null) {

-				fgVariableResolvers.put(variable, res);

-			}

-			if (container != null) {

-				fgContainerResolvers.put(container, res);

-			}

-		}		

-	}

-

-	/**

-	 * Returns all registered classpath providers.

-	 */

-	private static Map getClasspathProviders() {

-		if (fgPathProviders == null) {

-			initializeProviders();

-		}

-		return fgPathProviders;

-	}

-		

-	private static void initializeProviders() {

-		IExtensionPoint point = LaunchingPlugin.getDefault().getDescriptor().getExtensionPoint(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 resovler registered for the give variable, or

-	 * <code>null</code> if none.

-	 * 

-	 * @return the resovler registered for the give variable, or

-	 * <code>null</code> if none

-	 */

-	private static IRuntimeClasspathEntryResolver getVariableResolver(String variableName) {

-		return (IRuntimeClasspathEntryResolver)getVariableResolvers().get(variableName);

-	}

-	

-	/**

-	 * Returns the resovler registered for the give container id, or

-	 * <code>null</code> if none.

-	 * 

-	 * @return the resovler registered for the give container id, or

-	 * <code>null</code> if none

-	 */	

-	private static IRuntimeClasspathEntryResolver getContainerResolver(String containerId) {

-		return (IRuntimeClasspathEntryResolver)getContainerResolvers().get(containerId);

-	}	

-	

-	/**

-	 * Returns the provider registered for the given identifier, or

-	 * <code>null</code> if none.

-	 * 

-	 * @return the provider registered for the given identifier, or

-	 * <code>null</code> if none

-	 */

-	private static IRuntimeClasspathProvider getClasspathProvider(String identifier) {

-		return (IRuntimeClasspathProvider)getClasspathProviders().get(identifier);

-	}

-	

-	/**

-	 * 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 vm the VM that has changed

-	 * @param event event desribing 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);

-		}		

-	}		

-}
\ No newline at end of file
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 c173a2b..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/LibraryLocation.java
+++ /dev/null
Binary files differ
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 11934b7..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/PropertyChangeEvent.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-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.
- * </p>
- * @since 2.0
- */
-public class PropertyChangeEvent extends EventObject {
-
-	/**
-	 * 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 ec68b66..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/SocketUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.Socket;
-import java.util.Random;
-
-/**
- * Utility class to find a port to debug on.
- */
-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
-	 */
-	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;
-	}
-}
\ No newline at end of file
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 863c358..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardClasspathProvider.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-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.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 {
-
-	/**
-	 * @see IRuntimeClasspathProvider#computeUnresolvedClasspath(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 libraries by default
-				IVMInstall vm = JavaRuntime.computeVMInstall(configuration);
-				LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
-				if (libs == null) {
-					return new IRuntimeClasspathEntry[0];
-				} else {
-					IRuntimeClasspathEntry[] rtes = new IRuntimeClasspathEntry[libs.length];
-					for (int i = 0; i < libs.length; i++) {
-						IRuntimeClasspathEntry r = JavaRuntime.newArchiveRuntimeClasspathEntry(libs[i].getSystemLibraryPath());
-						r.setSourceAttachmentPath(libs[i].getSystemLibrarySourcePath());
-						r.setSourceAttachmentRootPath(libs[i].getPackageRootPath());
-						r.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-						rtes[i] = r;
-					}
-					return rtes;
-				}				
-			} else {
-				return JavaRuntime.computeUnresolvedRuntimeClasspath(proj);						
-			}
-		} else {
-			// recover persisted classpath
-			return recoverRuntimePath(configuration, IJavaLaunchConfigurationConstants.ATTR_CLASSPATH);
-		}
-	}
-
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], 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 = (List)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 3735914..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/StandardSourcePathProvider.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.jdt.launching;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-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.IJavaProject;
-
-/**
- * Default implementation of source lookup path computation and resolution.
- * <p>
- * This class may be subclassed.
- * </p>
- * @since 2.0
- */
-public class StandardSourcePathProvider extends StandardClasspathProvider {
-	
-	/**
-	 * @see IRuntimeClasspathProvider#computeUnresolvedClasspath(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;
-
-	}
-	
-
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[], ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		boolean includeJRE = false;
-		IJavaProject pro = JavaRuntime.getJavaProject(configuration);
-		includeJRE = pro == null;
-		// omit JRE from source lookup path if the runtime JRE is the same as the build JRE
-		// (so we retrieve source from the workspace, and not an external jar)
-		if (!includeJRE) {
-			IVMInstall buildVM = JavaRuntime.getVMInstall(pro);
-			IVMInstall runVM = JavaRuntime.computeVMInstall(configuration);
-			if (buildVM != null) {
-				includeJRE = !buildVM.equals(runVM);
-			}
-		}
-		if (!includeJRE) {
-			// remove the JRE entry
-			List list = new ArrayList(entries.length);
-			for (int i = 0; i < entries.length; i++) {
-				switch (entries[i].getType()) {
-					case IRuntimeClasspathEntry.VARIABLE:
-						if (!entries[i].getVariableName().equals(JavaRuntime.JRELIB_VARIABLE)) {
-							list.add(entries[i]);
-						}
-						break;
-					case IRuntimeClasspathEntry.CONTAINER:
-						if (!entries[i].getVariableName().equals(JavaRuntime.JRE_CONTAINER)) {
-							list.add(entries[i]);
-						}
-						break;						
-					default:
-						list.add(entries[i]);
-						break;
-				}
-			}
-			entries = (IRuntimeClasspathEntry[]) list.toArray(new IRuntimeClasspathEntry[list.size()]);
-		}
-		return super.resolveClasspath(entries, configuration);
-	}
-
-}
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 d9a576d..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
+++ /dev/null
@@ -1,196 +0,0 @@
-

-package org.eclipse.jdt.launching;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

- 

-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[] fClassPath;

-	private String[] fBootClassPath;

-	private String fWorkingDirectory;

-	private Map fVMSpecificAttributesMap;

-	

-	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.getString("vmRunnerConfig.assert.classNotNull")); //$NON-NLS-1$

-		}

-		if (classPath == null) {

-			throw new IllegalArgumentException(LaunchingMessages.getString("vmRunnerConfig.assert.classPathNotNull")); //$NON-NLS-1$

-		}

-		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.getString("vmRunnerConfig.assert.vmArgsNotNull")); //$NON-NLS-1$

-		}

-		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.getString("vmRunnerConfig.assert.programArgsNotNull")); //$NON-NLS-1$

-		}

-		fProgramArgs= args;

-	}

-	

-	/**

-	 * 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.

-	 *

-	 * @param bootClassPath The boot classpath. An emptry array indicates an empty

-	 *  bootpath and <code>null</code> indicates a default bootpah.

-	 */

-	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 emptry array indicates an empty

-	 * bootpath and <code>null</code> indicates a default bootpah.

-	 *

-	 * @return The boot classpath. An emptry array indicates an empty

-	 *  bootpath and <code>null</code> indicates a default bootpah.

-	 * @see #setBootClassPath

-	 */

-	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

-	 */

-	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

-	 */

-	public String[] getProgramArguments() {

-		if (fProgramArgs == null) {

-			return fgEmpty;

-		}

-		return fProgramArgs;

-	}

-	

-	/**

-	 * 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;

-	}	

-	

-}
\ No newline at end of file
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 2d64cd4..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 0f10803..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ArchiveSourceLocation.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.IOException;

-import java.io.StringReader;

-import java.text.MessageFormat;

-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 org.apache.xerces.dom.DocumentImpl;

-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;

- 

-/**

- * Locates source elements in an acrhive (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

- */

-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

-	 * @exception IOException if unable to create the specified zip

-	 * 	file

-	 */

-	private static ZipFile getZipFile(String name) throws IOException {

-		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() {

-		Iterator iter = fZipFileCache.values().iterator();

-		while (iter.hasNext()) {

-			ZipFile file = (ZipFile)iter.next();

-			try {

-				file.close();

-			} catch (IOException e) {

-				LaunchingPlugin.log(e);

-			}

-		}

-		fZipFileCache.clear();

-	}

-	

-	/**

-	 * The root source folder in the archive

-	 */

-	private IPath fRootPath;

-	

-	/**

-	 * 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 archive 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);

-	}

-		

-	/**

-	 * @see IJavaSourceLocation#findSourceElement(String)

-	 */

-	public Object findSourceElement(String name) throws CoreException {

-		try {

-			if (getArchive() == null) {

-				return null;

-			}

-			

-			// guess at source name if an inner type

-			String pathStr= name.replace('.', '/');

-			int dotIndex= pathStr.lastIndexOf('/');

-			int dollarIndex= pathStr.indexOf('$', dotIndex + 1);

-			if (dollarIndex >= 0) {

-				pathStr = pathStr.substring(0, dollarIndex);

-			}		

-			pathStr += ".java"; //$NON-NLS-1$

-			IPath path = new Path(pathStr); 

-			if (getRootPath() != null) {

-				path = getRootPath().append(path);

-			}

-			ZipEntry entry = getArchive().getEntry(path.toString());

-			if (entry != null) {

-				return new ZipEntryStorage(getArchive(), entry);

-			}

-			return null;

-		} catch (IOException e) {

-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), IJavaLaunchConfigurationConstants.ERR_INTERNAL_ERROR, 

-				MessageFormat.format(LaunchingMessages.getString("ArchiveSourceLocation.Unable_to_locate_source_element_in_archive_{0}_1"), new String[] {getName()}), e)); //$NON-NLS-1$

-		}

-	}

-	

-	/**

-	 * Returns the archive associated with this source

-	 * location.

-	 * 

-	 * @return zip file

-	 */

-	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 arhcive

-	 * 

-	 * @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 arhcive

-	 */

-	private void setRootPath(String path) {

-		if (path == null || path.trim().length() == 0) {

-			fRootPath = null;

-		} else {

-			fRootPath = new Path(path);

-		}

-	}

-	

-	/**

-	 * 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;

-	}	

-	

-	/**

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object object) {		

-		return object instanceof ArchiveSourceLocation &&

-			 getName().equals(((ArchiveSourceLocation)object).getName());

-	}

-	

-	/**

-	 * @see java.lang.Object#hashCode()

-	 */

-	public int hashCode() {

-		return getName().hashCode();

-	}	

-	

-	/**

-	 * @see IJavaSourceLocation#getMemento()

-	 */

-	public String getMemento() throws CoreException {

-		Document doc = new DocumentImpl();

-		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$

-		}

-		

-		try {

-			return JavaLaunchConfigurationUtils.serializeDocument(doc);

-		} catch (IOException e) {

-			abort(MessageFormat.format(LaunchingMessages.getString("ArchiveSourceLocation.Unable_to_create_memento_for_archive_source_location_{0}_1"), new String[] {getName()}), e); //$NON-NLS-1$

-		}

-		// execution will not reach here

-		return null;

-	}

-

-	/**

-	 * @see IJavaSourceLocation#initializeFrom(String)

-	 */

-	public void initializeFrom(String memento) throws CoreException {

-		Exception ex = null;

-		try {

-			Element root = null;

-			DocumentBuilder parser =

-				DocumentBuilderFactory.newInstance().newDocumentBuilder();

-			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.getString("ArchiveSourceLocation.Unable_to_initialize_source_location_-_missing_archive_path._3"), null); //$NON-NLS-1$

-			}

-			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.getString("ArchiveSourceLocation.Exception_occurred_initializing_source_location._5"), ex);		 //$NON-NLS-1$

-	}

-

-	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 d9281c5..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/DirectorySourceLocation.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-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 org.apache.xerces.dom.DocumentImpl;

-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;

- 

-/**

- * 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

- */

-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);

-	}

-	

-	/**

-	 * @see IJavaSourceLocation#findSourceElement(String)

-	 */

-	public Object findSourceElement(String name) throws CoreException {

-		if (getDirectory() == null) {

-			return null;

-		}

-		

-		// guess at source name if an inner type

-		String pathStr= name.replace('.', '/');

-		int dotIndex= pathStr.lastIndexOf('/');

-		int dollarIndex= pathStr.indexOf('$', dotIndex + 1);

-		if (dollarIndex >= 0) {

-			pathStr = pathStr.substring(0, dollarIndex);

-		}		

-		pathStr += ".java"; //$NON-NLS-1$

-		try {

-			IPath root = new Path(getDirectory().getCanonicalPath());

-			root = root.append(new Path(pathStr));

-			File file = root.toFile();

-			if (file.exists()) {

-				return new LocalFileStorage(file);

-			}

-		} 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;

-	}

-	

-	/**

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object object) {		

-		return object instanceof DirectorySourceLocation &&

-			 getDirectory().equals(((DirectorySourceLocation)object).getDirectory());

-	}

-	

-	/**

-	 * @see java.lang.Object#hashCode()

-	 */

-	public int hashCode() {

-		return getDirectory().hashCode();

-	}	

-	

-	/**

-	 * @see IJavaSourceLocation#getMemento()

-	 */

-	public String getMemento() throws CoreException {

-		Document doc = new DocumentImpl();

-		Element node = doc.createElement("directorySourceLocation"); //$NON-NLS-1$

-		doc.appendChild(node);

-		node.setAttribute("path", getDirectory().getAbsolutePath()); //$NON-NLS-1$

-		

-		try {

-			return JavaLaunchConfigurationUtils.serializeDocument(doc);

-		} catch (IOException e) {

-			abort(MessageFormat.format(LaunchingMessages.getString("DirectorySourceLocation.Unable_to_create_memento_for_directory_source_location_{0}_1"), new String[] {getDirectory().getAbsolutePath()}), e); //$NON-NLS-1$

-		}

-		// execution will not reach here

-		return null;

-	}

-

-	/**

-	 * @see IJavaSourceLocation#initializeFrom(String)

-	 */

-	public void initializeFrom(String memento) throws CoreException {

-		Exception ex = null;

-		try {

-			Element root = null;

-			DocumentBuilder parser =

-				DocumentBuilderFactory.newInstance().newDocumentBuilder();

-			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.getString("DirectorySourceLocation.Unable_to_initialize_source_location_-_missing_directory_path_3"), null); //$NON-NLS-1$

-			} else {

-				File dir = new File(path);

-				if (dir.exists() && dir.isDirectory()) {

-					setDirectory(dir);

-				} else {

-					abort(MessageFormat.format(LaunchingMessages.getString("DirectorySourceLocation.Unable_to_initialize_source_location_-_directory_does_not_exist__{0}_4"), new String[] {path}), null); //$NON-NLS-1$

-				}

-			}

-			return;

-		} catch (ParserConfigurationException e) {

-			ex = e;			

-		} catch (SAXException e) {

-			ex = e;

-		} catch (IOException e) {

-			ex = e;

-		}

-		abort(LaunchingMessages.getString("DirectorySourceLocation.Exception_occurred_initializing_source_location._5"), ex);		 //$NON-NLS-1$

-	}

-

-	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 1cb4d92..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/IJavaSourceLocation.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IAdaptable;

- 

-/**

- * A source location defines the location of 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.

- * </p>

- * @since 2.0

- */

-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 6cad79d..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaProjectSourceLocation.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-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 org.apache.xerces.dom.DocumentImpl;

-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.Path;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IJavaProject;

-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;

- 

-/**

- * Locates source elements in a 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

- */

-public class JavaProjectSourceLocation extends PlatformObject implements IJavaSourceLocation {

-

-	/**

-	 * The project associated with this source location

-	 */

-	private IJavaProject fProject;

-	

-	/**

-	 * 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);

-	}	

-	

-	/**

-	 * @see IJavaSourceLocation#findSourceElement(String)

-	 */

-	public Object findSourceElement(String name) throws CoreException {

-		if (getJavaProject() != null) {

-			String pathStr= name.replace('.', '/') + ".java"; //$NON-NLS-1$

-			IJavaElement jelement= getJavaProject().findElement(new Path(pathStr));

-			if (jelement == null) {

-				// maybe an inner type

-				int dotIndex= pathStr.lastIndexOf('/');

-				int dollarIndex= pathStr.indexOf('$', dotIndex + 1);

-				if (dollarIndex != -1) {

-					jelement= getJavaProject().findElement(new Path(pathStr.substring(0, dollarIndex) + ".java")); //$NON-NLS-1$

-				}

-			}

-			return jelement;

-		} else {

-			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;

-	}

-	

-	/**

-	 * Returns the Java project associated with this source

-	 * location.

-	 * 

-	 * @return Java project

-	 */

-	public IJavaProject getJavaProject() {

-		return fProject;

-	}

-	

-	/**

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object object) {		

-		return object instanceof JavaProjectSourceLocation &&

-			 getJavaProject().equals(((JavaProjectSourceLocation)object).getJavaProject());

-	}

-	

-	/**

-	 * @see java.lang.Object#hashCode()

-	 */

-	public int hashCode() {

-		return getJavaProject().hashCode();

-	}		

-	/**

-	 * @see IJavaSourceLocation#getMemento()

-	 */

-	public String getMemento() throws CoreException {

-		Document doc = new DocumentImpl();

-		Element node = doc.createElement("javaProjectSourceLocation"); //$NON-NLS-1$

-		doc.appendChild(node);

-		node.setAttribute("name", getJavaProject().getElementName()); //$NON-NLS-1$

-		

-		try {

-			return JavaLaunchConfigurationUtils.serializeDocument(doc);

-		} catch (IOException e) {

-			abort(MessageFormat.format(LaunchingMessages.getString("JavaProjectSourceLocation.Unable_to_create_memento_for_Java_project_source_location_{0}_1"), new String[] {getJavaProject().getElementName()}), e); //$NON-NLS-1$

-		}

-		// execution will not reach here

-		return null;

-	}

-

-	/**

-	 * @see IJavaSourceLocation#initializeFrom(String)

-	 */

-	public void initializeFrom(String memento) throws CoreException {

-		Exception ex = null;

-		try {

-			Element root = null;

-			DocumentBuilder parser =

-				DocumentBuilderFactory.newInstance().newDocumentBuilder();

-			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.getString("JavaProjectSourceLocation.Unable_to_initialize_source_location_-_missing_project_name_3"), null); //$NON-NLS-1$

-			} 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.getString("JavaProjectSourceLocation.Exception_occurred_initializing_source_location._4"), ex); //$NON-NLS-1$

-	}

-

-	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 c0a7541..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/JavaSourceLocator.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.File;

-import java.io.IOException;

-import java.io.StringReader;

-import java.text.MessageFormat;

-import java.util.ArrayList;

-import java.util.List;

-

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.parsers.ParserConfigurationException;

-import org.apache.xerces.dom.DocumentImpl;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.debug.core.ILaunchConfiguration;

-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.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;

-

-

-/**

- * 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

- */

-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]);

-				}

-			}

-		}

-		IJavaSourceLocation[] locations = new IJavaSourceLocation[requiredProjects.size()];

-		for (int i = 0; i < requiredProjects.size(); i++) {

-			locations[i] = new JavaProjectSourceLocation((IJavaProject)requiredProjects.get(i));

-		}	

-		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;

-	}

-			

-	/**

-	 * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(IStackFrame)

-	 */

-	public Object getSourceElement(IStackFrame stackFrame) {

-		if (stackFrame instanceof IJavaStackFrame) {

-			IJavaStackFrame frame = (IJavaStackFrame)stackFrame;

-			String name = null;

-			try {

-				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) ;

-					}					

-				}

-				IJavaSourceLocation[] locations = getSourceLocations();

-				for (int i = 0; i < locations.length; i++) {

-					Object sourceElement = locations[i].findSourceElement(name);

-					if (sourceElement != null) {

-						return sourceElement;

-					}

-				}

-			} 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;

-	}

-	

-	/**

-	 * 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

-	 *  the classpath of the given or any required project

-	 */

-	public static IJavaSourceLocation[] getDefaultSourceLocations(IJavaProject project) throws CoreException {

-		ArrayList list = new ArrayList();

-		collectRequiredProjects(project, list);

-		IJavaSourceLocation[] locations = new IJavaSourceLocation[list.size()];

-		for (int i = 0; i < list.size(); i++) {

-			locations[i] = new JavaProjectSourceLocation((IJavaProject)list.get(i));

-		}	

-		return locations;

-	}

-	

-	/**

-	 * @see IPersistableSourceLocator#getMemento()

-	 */

-	public String getMemento() throws CoreException {

-		Document doc = new DocumentImpl();

-		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);

-		}

-		

-		try {

-			return JavaLaunchConfigurationUtils.serializeDocument(doc);

-		} catch (IOException e) {

-			abort(LaunchingMessages.getString("JavaSourceLocator.Unable_to_create_memento_for_Java_source_locator._4"), e); //$NON-NLS-1$

-		}

-		// execution will not reach here

-		return null;

-	}

-

-	/**

-	 * @see IPersistableSourceLocator#initializeDefaults(ILaunchConfiguration)

-	 */

-	public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {

-		IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(configuration);

-		IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, configuration);

-		setSourceLocations(getSourceLocations(resolved));

-	}

-

-	/**

-	 * @see IPersistableSourceLocator#initializeFromMemento(String)

-	 */

-	public void initializeFromMemento(String memento) throws CoreException {

-		Exception ex = null;

-		try {

-			Element root = null;

-			DocumentBuilder parser =

-				DocumentBuilderFactory.newInstance().newDocumentBuilder();

-			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.getString("JavaSourceLocator.Unable_to_restore_Java_source_locator_-_invalid_format._6"), null); //$NON-NLS-1$

-			}

-	

-			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.getString("JavaSourceLocator.Unable_to_restore_Java_source_locator_-_invalid_format._10"), null); //$NON-NLS-1$

-						}

-						Class clazz  = null;

-						try {

-							clazz = classLoader.loadClass(className);

-						} catch (ClassNotFoundException e) {

-							abort(MessageFormat.format(LaunchingMessages.getString("JavaSourceLocator.Unable_to_restore_source_location_-_class_not_found__{0}_11"), new String[] {className}), e); //$NON-NLS-1$

-						}

-						

-						IJavaSourceLocation location = null;

-						try {

-							location = (IJavaSourceLocation)clazz.newInstance();

-						} catch (IllegalAccessException e) {

-							abort(LaunchingMessages.getString("JavaSourceLocator.Unable_to_restore_source_location._12"), e); //$NON-NLS-1$

-						} catch (InstantiationException e) {

-							abort(LaunchingMessages.getString("JavaSourceLocator.Unable_to_restore_source_location._12"), e); //$NON-NLS-1$

-						}

-						location.initializeFrom(data);

-						sourceLocations.add(location);

-					} else {

-						abort(LaunchingMessages.getString("JavaSourceLocator.Unable_to_restore_Java_source_locator_-_invalid_format._14"), null); //$NON-NLS-1$

-					}

-				}

-			}

-			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.getString("JavaSourceLocator.Exception_occurred_initializing_source_locator._15"), ex); //$NON-NLS-1$

-	}

-	

-	/**

-	 * 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.exists() && project.isOpen()) {

-						location = new JavaProjectSourceLocation(JavaCore.create(project));

-					}

-					break;

-				case IRuntimeClasspathEntry.ARCHIVE:

-					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.getString("JavaSourceLocator.Illegal_to_have_a_container_resolved_to_a_container_1")); //$NON-NLS-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);		

-	}	

-}
\ No newline at end of file
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 641cd18..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/LocalFileStorage.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-import java.io.File;

-import java.io.FileInputStream;

-import java.io.IOException;

-import java.io.InputStream;

-

-import org.eclipse.core.resources.IStorage;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.jdt.core.IJavaModelStatusConstants;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.internal.launching.LaunchingPlugin;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- * 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 IStorage

- * @since 2.0

- */

-public class LocalFileStorage extends PlatformObject implements IStorage {

-	

-	/**

-	 * The file this storage refers to.

-	 */ 

-	private File fFile;

-		

-	/**

-	 * Constructs and returns storage for the given file.

-	 * 

-	 * @param file a local file

-	 */

-	public LocalFileStorage(File file){

-		setFile(file);

-	}

-	

-	/**

-	 * @see IStorage#getContents()

-	 */

-	public InputStream getContents() throws CoreException {

-	

-		try {

-			return new FileInputStream(getFile());

-		} catch (IOException e){

-			throw new JavaModelException(e, IJavaModelStatusConstants.IO_EXCEPTION);

-		}

-	}

-	

-	/**

-	 * @see IStorage#getFullPath

-	 */

-	public IPath getFullPath() {

-		try {

-			return new Path(getFile().getCanonicalPath());

-		} catch (IOException e) {

-			LaunchingPlugin.log(e);

-			return null;

-		}

-	}

-	/**

-	 * @see IStorage#getName

-	 */

-	public String getName() {

-		return getFile().getName();

-	}

-	/**

-	 * @see IStorage#isReadOnly()

-	 */

-	public boolean isReadOnly() {

-		return true;

-	}

-	

-	/**

-	 * Sets the file associated with this storage

-	 * 

-	 * @param file a local file

-	 */

-	private void setFile(File file) {

-		fFile = file;	

-	}

-	

-	/**

-	 * Returns the file asscoiated with this storage

-	 * 

-	 * @return file

-	 */

-	public File getFile() {

-		return fFile;

-	}

-	

-	/**

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object object) {		

-		return object instanceof LocalFileStorage &&

-			 getFile().equals(((LocalFileStorage)object).getFile());

-	}

-	

-	/**

-	 * @see java.lang.Object#hashCode()

-	 */

-	public int hashCode() {

-		return getFile().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 dee3b96..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/ZipEntryStorage.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.eclipse.jdt.launching.sourcelookup;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.zip.ZipEntry;

-import java.util.zip.ZipFile;

-

-import org.eclipse.core.resources.IStorage;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.PlatformObject;

-import org.eclipse.jdt.core.IJavaModelStatusConstants;

-import org.eclipse.jdt.core.JavaModelException;

- 

-/**

- * Storage implementation for zip entries.

- * <p>

- * This class may be instantiated; it is not intended to be subclassed.

- * </p>

- * @see ArchiveSourceLocation

- * @see IStorage

- * @since 2.0

- */

-public class ZipEntryStorage extends PlatformObject implements IStorage {

-	

-	/**

-	 * Zip file associated with zip entry

-	 */

-	private ZipFile fArchive;

-	

-	/**

-	 * Zip entry

-	 */

-	private ZipEntry fZipEntry;

-	

-	/**

-	 * 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) {

-		setArchive(archive);

-		setZipEntry(entry);

-	}

-

-	/**

-	 * @see IStorage#getContents()

-	 */

-	public InputStream getContents() throws CoreException {

-		try {

-			return getArchive().getInputStream(getZipEntry());

-		} catch (IOException e) {

-			throw new JavaModelException(e, IJavaModelStatusConstants.IO_EXCEPTION);

-		}

-	}

-

-	/**

-	 * @see IStorage#getFullPath()

-	 */

-	public IPath getFullPath() {

-		return new Path(getArchive().getName()).append(getZipEntry().getName());

-	}

-

-	/**

-	 * @see IStorage#getName()

-	 */

-	public String getName() {

-		int index = getZipEntry().getName().lastIndexOf('\\');

-		if (index == -1) {

-			index = getZipEntry().getName().lastIndexOf('/');

-		}

-		if (index == -1) {

-			return getZipEntry().getName();

-		} else {

-			return getZipEntry().getName().substring(index + 1);

-		}

-	}

-

-	/**

-	 * @see IStorage#isReadOnly()

-	 */

-	public boolean isReadOnly() {

-		return true;

-	}

-	

-	/**

-	 * Sets the archive containing the zip entry.

-	 * 

-	 * @param archive a zip file

-	 */

-	private void setArchive(ZipFile archive) {

-		fArchive = archive;

-	}

-	

-	/**

-	 * Returns the archive containing the zip entry.

-	 * 

-	 * @return zip file

-	 */

-	public ZipFile getArchive() {

-		return fArchive;

-	}	

-	

-	/**

-	 * Sets the entry that contains the source.

-	 * 

-	 * @param entry the entry that contains the source

-	 */

-	private void setZipEntry(ZipEntry entry) {

-		fZipEntry = entry;

-	}

-	

-	/**

-	 * Returns the entry that contains the source

-	 * 

-	 * @return zip entry

-	 */

-	public ZipEntry getZipEntry() {

-		return fZipEntry;

-	}		

-

-	/**

-	 * @see java.lang.Object#equals(java.lang.Object)

-	 */

-	public boolean equals(Object object) {		

-		return object instanceof ZipEntryStorage &&

-			 getArchive().equals(((ZipEntryStorage)object).getArchive()) &&

-			 getZipEntry().getName().equals(((ZipEntryStorage)object).getZipEntry().getName());

-	}

-	

-	/**

-	 * @see java.lang.Object#hashCode()

-	 */

-	public int hashCode() {

-		return getZipEntry().getName().hashCode();

-	}

-}

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 1cf11c0..0000000
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/sourcelookup/package.html
+++ /dev/null
@@ -1,15 +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 Eclipse Java source lookup.
-<h2>
-Package Specification</h2>
-Provide support for Java debug source lookup.
-</body>
-</html>
diff --git a/org.eclipse.jdt.launching/plugin.properties b/org.eclipse.jdt.launching/plugin.properties
deleted file mode 100644
index b0d501a..0000000
--- a/org.eclipse.jdt.launching/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-######################################################################

-# Copyright (c) 2000, 2002 IBM Corp. and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Common Public License v0.5

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v05.html

-#

-# Contributors:

-#    IBM Corporation - Initial 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

-classpathProviders = Runtime Classpath Providers

-javaSourceLocatorName = Basic Java Source Locator

-

-providerName=Eclipse.org

diff --git a/org.eclipse.jdt.launching/plugin.xml b/org.eclipse.jdt.launching/plugin.xml
deleted file mode 100644
index 62b9bfb..0000000
--- a/org.eclipse.jdt.launching/plugin.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- ======================================================================= -->

-<!-- Java Launching Plugin                                                   -->

-<!-- ======================================================================= -->

-<plugin

-	name= "%pluginName"

-	id= "org.eclipse.jdt.launching"

-	version= "2.0.1"

-	provider-name="%providerName"

-	class= "org.eclipse.jdt.internal.launching.LaunchingPlugin">

-

-<requires>

-  <import plugin="org.eclipse.core.resources"/>

-  <import plugin="org.eclipse.jdt.core"/>

-  <import plugin="org.eclipse.debug.core"/>

-  <import plugin="org.eclipse.jdt.debug"/>

-  <import plugin="org.apache.xerces"/>

-</requires>

-

-<runtime>

-	<library name="launching.jar" >

-		<export name = "*"/>

-	</library>

-</runtime>

-

-

-<!-- Search extension point definitions -->

-

-<extension-point name="%vmInstallTypes" id="vmInstallTypes"/>

-<extension-point name="%vmConnectors" id="vmConnectors"/>

-<extension-point name="%runtimeClasspathEntryResolvers" id="runtimeClasspathEntryResolvers"/>

-<extension-point name="%classpathProviders" id="classpathProviders"/>

-

-<!-- 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

-	   	class="org.eclipse.jdt.internal.launching.Standard11xVMType"

-	    id="org.eclipse.jdt.launching.Standard11xVMType"/>	    

-</extension>

-

-<extension point = "org.eclipse.debug.core.launchConfigurationTypes">

-   <launchConfigurationType

-   	   id="org.eclipse.jdt.launching.localJavaApplication"

-	   name="%localJavaApplication"

-	   delegate="org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate"

-	   modes= "run, debug">

-	   <fileExtension

-	   		extension="java"

-	   		default="true"/>

-	   <fileExtension

-	   		extension="class"

-	   		default="true"/>

-   </launchConfigurationType>

-   <launchConfigurationType

-   	   id="org.eclipse.jdt.launching.remoteJavaApplication"

-	   name="%remoteJavaApplication"

-	   delegate="org.eclipse.jdt.internal.launching.JavaRemoteApplicationLaunchConfigurationDelegate"

-	   modes= "debug">

-	   <fileExtension

-	   		extension="java"

-	   		default="false"/>

-	   <fileExtension

-	   		extension="class"

-	   		default="false"/>

-   </launchConfigurationType>

-</extension>

-

-<extension point = "org.eclipse.debug.core.sourceLocators">

-	<sourceLocator

-		id = "org.eclipse.jdt.launching.javaSourceLocator"

-	   	class="org.eclipse.jdt.launching.sourcelookup.JavaSourceLocator"

-	   	name="%javaSourceLocatorName"/>

-</extension>

-

-<extension point = "org.eclipse.jdt.launching.vmConnectors">

-	<vmConnector

-		id="org.eclipse.jdt.launching.socketAttachConnector"

-		class="org.eclipse.jdt.internal.launching.SocketAttachConnector"/>

-</extension>

-

-<extension point = "org.eclipse.jdt.core.classpathVariableInitializer">

-	<classpathVariableInitializer

-		variable="JRE_LIB"

-		class="org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer"/>

-	<classpathVariableInitializer

-		variable="JRE_SRC"

-		class="org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer"/>

-	<classpathVariableInitializer

-		variable="JRE_SRCROOT"

-		class="org.eclipse.jdt.internal.launching.JavaClasspathVariablesInitializer"/>

-</extension>		

-

-<extension point = "org.eclipse.jdt.core.classpathContainerInitializer">

-	<classpathContainerInitializer

-		id="org.eclipse.jdt.launching.JRE_CONTAINER"

-		class="org.eclipse.jdt.internal.launching.JREContainerInitializer"/>

-</extension>

-

-<extension point = "org.eclipse.jdt.launching.runtimeClasspathEntryResolvers">

-	<runtimeClasspathEntryResolver

-		id = "org.eclipse.jdt.launching.JRE_RESOLVER"

-		class = "org.eclipse.jdt.internal.launching.JRERuntimeClasspathEntryResolver"

-		variable = "JRE_LIB"

-		container = "org.eclipse.jdt.launching.JRE_CONTAINER"/>

-</extension>

-

-<extension point = "org.eclipse.debug.core.launchConfigurationComparators">

-	<launchConfigurationComparator

-		id = "org.eclipse.jdt.launching.classpathComparator"

-		class = "org.eclipse.jdt.internal.launching.RuntimeClasspathEntryListComparator"

-		attribute = "org.eclipse.jdt.launching.CLASSPATH"/>

-	<launchConfigurationComparator

-		id = "org.eclipse.jdt.launching.sourcepathComparator"

-		class = "org.eclipse.jdt.internal.launching.RuntimeClasspathEntryListComparator"

-		attribute = "org.eclipse.jdt.launching.SOURCE_PATH"/>		

-</extension>

-

-</plugin>
\ No newline at end of file
diff --git a/org.eclipse.jdt.launching/scripts/exportplugin.xml b/org.eclipse.jdt.launching/scripts/exportplugin.xml
deleted file mode 100644
index 3ce7682..0000000
--- a/org.eclipse.jdt.launching/scripts/exportplugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- build script to create a plugin from org.eclipse.jdt.launching -->

-<project name="org.eclipse.jdt.launching" default="export" basedir="..">

-	<target name="init">

-		<tstamp/>

-		<property name="destdir" value="../../plugin-export" />

-		<property name="plugin"  value="org.eclipse.jdt.launching_2.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}" />

-		<jar 

-			jarfile="${dest}/launching.jar"

-			basedir="bin"

-		/>

-		<copy file="plugin.xml" todir="${dest}"/>

-		<copy file="plugin.properties" todir="${dest}"/>

-		<zip zipfile="${dest}/launchingsrc.zip">

-		    <fileset dir="launching" />

-  		</zip>

-	</target>

-</project>